Tag libreoffice-3.6.0.4

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQEot6AAoJEPQ0oe+v7q6jLcUQAIAlPNKjugfMbkNXk7clUlsw
999NbYiNf0DgqOjeObaHl3QpaP8N+R6EPAt3TywXbgNs8kfLzHmFg+i9mGMoqRhY
4mTwSe6NU4YweD7FafM9+AeAs8wnv3ZfIIhbJGFuIyEbDC42AHjpuDzqLsx6qid0
kWLpb9owvSjL3tc4XiJW6xTD6ZzoFcq3m+AhRJlT89K1kBnixXzVAFrD23HyNbxs
3lmHYWaoCg7dds4ZQs6GW+AWJPa42ffW0kOfB62zIP+zEBDkIGurBIcBf2e2Z/nv
1P8y2PnGeGn151IBA9gP9XrFHEk2W2OfEuP/Ng04gEg1J2422GNUd4a84OqSfW9F
rs3dok07mNocKgRd1idSGbrHDRxcTYjH+2lgRTedkqrtKlzUdRYOIbIzV7JxyxV/
q6euw8QJBFakicljYNO3xpYptKWmjPIe8SyR/w66K95R+2hOyMzkgixDrL1f6Uzg
5b9beU13ZWYGBQW4nQs3BkITo29tnq/QSNAz+KuP51e2y6TOtNpqRbFvIkM9aJhi
dzqzXpDXWrNNXTFCF1t2oO93rgNNeZTKSH+NED1ooHgtMzSv79kO20ytUqFkZZfn
OI4lBq5MKRZ7k6e8LQh//NbxKwsvH1gMzMqWFomQmb5xAGm9FZERBctm0TN1mRNf
fA+0sXqWTsTjOY6FE+UH
=UNaw
-----END PGP SIGNATURE-----

1107 files changed, 50156 insertions, 50156 deletions

diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index e0176be4eff4..77fff3fe3456 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,8 +582,8 @@ void ShapeController::executeDispatch_ParagraphDialog()
                                     0 );
             aNewAttr.Put( aAttr );
             aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
-            aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
-            aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT)  );
+            aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+            aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT)  );
             aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
             aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3be79e68b9be..44724042527d 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
     if ( pHyperlinkItem->GetMacroEvents() )
     {
         // get macros from itemset
-        const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTbl();
+        const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTable();
         SvxMacroItem aItem ( GetWhich(SID_ATTR_MACROITEM) );
         if( pMacroTbl )
             aItem.SetMacroTable( *pMacroTbl );
@@ -381,7 +381,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
     const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
 
-    return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
+    return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTable());
 }
 
 // try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a5b4f6b0ae..9cb85a13414a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -61,8 +61,8 @@ public:
 
     void                        AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
 
-    const SvxMacroTableDtor&    GetMacroTbl() const;
-    void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
+    const SvxMacroTableDtor&    GetMacroTable() const;
+    void                        SetMacroTable( const SvxMacroTableDtor& rTbl );
 
     void                        ScriptChanged();
     virtual void                PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -77,12 +77,12 @@ public:
     bool                        IsReadOnly() const SAL_OVERRIDE;
 };
 
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const
 {
     return aTbl;
 }
 
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl )
 {
     aTbl = rTbl;
 }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 032ad4596818..21c975343d76 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -138,7 +138,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     bool                bPreset     : 1;
     sal_uInt16              nNumItemId;
 
-    OUString            sBulletCharFmtName;
+    OUString            sBulletCharFormatName;
 protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -156,7 +156,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    void                SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
+    void                SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;}
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 };
 
@@ -170,7 +170,7 @@ class SvxNumPickTabPage : public SfxTabPage
 
     VclPtr<SvxNumValueSet>     m_pExamplesVS;
     OUString            sNumCharFmtName;
-    OUString            sBulletCharFmtName;
+    OUString            sBulletCharFormatName;
 
     SvxNumSettingsArr_Impl  aNumSettingsArrays[NUM_VALUSET_COUNT];  // is initialized with the five formats
 
@@ -200,9 +200,9 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    void                SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
+    void                SetCharFormatNames(const OUString& rCharName, const OUString& rBulName)
                             {   sNumCharFmtName = rCharName;
-                                sBulletCharFmtName = rBulName;}
+                                sBulletCharFormatName = rBulName;}
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 };
 
@@ -298,7 +298,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     VclPtr<SvxNumberingPreview> m_pPreviewWIN;
 
     OUString        m_sNumCharFmtName;
-    OUString        m_sBulletCharFmtName;
+    OUString        m_sBulletCharFormatName;
 
     Timer           aInvalidateTimer;
 
@@ -365,7 +365,7 @@ public:
     void                SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
                         {
                             m_sNumCharFmtName = rNumName;
-                            m_sBulletCharFmtName = rBulletName;
+                            m_sBulletCharFormatName = rBulletName;
                         }
     void                SetMetric(FieldUnit eSet);
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7662a9d2ea9f..0c55af1988e2 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -183,8 +183,8 @@ public:
 
     [Items]
     <SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
-    <SvxFmtBreakItem><SID_ATTR_PARA_PAGEBREAK>
-    <SvxFmtSplitItem><SID_ATTR_PARA_SPLIT>
+    <SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
+    <SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
     <SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
     <SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
 */
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 09f62262fc76..c4a91772b2fe 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -97,7 +97,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
     {
         // remove smart tag tab page if no extensions are installed
         SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
         if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
             RemoveTabPage("smarttags");
 
@@ -521,7 +521,7 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
 {
     bool bModified = false;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     long nFlags = pAutoCorrect->GetFlags();
 
     bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
@@ -610,18 +610,18 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
                         m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
 
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
-    bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
-    pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
+    bModified |= pOpt->bAFormatDelSpacesAtSttEnd != bCheck;
+    pOpt->bAFormatDelSpacesAtSttEnd = bCheck;
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
-    bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
-    pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
+    bModified |= pOpt->bAFormatByInpDelSpacesAtSttEnd != bCheck;
+    pOpt->bAFormatByInpDelSpacesAtSttEnd = bCheck;
 
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
-    bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
-    pOpt->bAFmtDelSpacesBetweenLines = bCheck;
+    bModified |= pOpt->bAFormatDelSpacesBetweenLines != bCheck;
+    pOpt->bAFormatDelSpacesBetweenLines = bCheck;
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
-    bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
-    pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
+    bModified |= pOpt->bAFormatByInpDelSpacesBetweenLines != bCheck;
+    pOpt->bAFormatByInpDelSpacesBetweenLines = bCheck;
 
     if(bModified || nFlags != pAutoCorrect->GetFlags())
     {
@@ -641,7 +641,7 @@ void    OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
 void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     const long nFlags = pAutoCorrect->GetFlags();
 
     m_pCheckLB->SetUpdateMode(false);
@@ -683,10 +683,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
     m_pCheckLB->CheckEntryPos( DETECT_URL,         CBCOL_SECOND,   0 != (nFlags & SetINetAttr) );
     m_pCheckLB->CheckEntryPos( REPLACE_DASHES,     CBCOL_FIRST,    pOpt->bChgToEnEmDash );
     m_pCheckLB->CheckEntryPos( REPLACE_DASHES,     CBCOL_SECOND,   0 != (nFlags & ChgToEnEmDash) );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_FIRST,    pOpt->bAFmtDelSpacesAtSttEnd );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesAtSttEnd );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFmtDelSpacesBetweenLines );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesBetweenLines );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_FIRST,    pOpt->bAFormatDelSpacesAtSttEnd );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_SECOND,   pOpt->bAFormatByInpDelSpacesAtSttEnd );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFormatDelSpacesBetweenLines );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFormatByInpDelSpacesBetweenLines );
     m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE,     CBCOL_FIRST,    pOpt->bDelEmptyNode );
     m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL,  CBCOL_FIRST,    pOpt->bChgUserColl );
     m_pCheckLB->CheckEntryPos( REPLACE_BULLETS,    CBCOL_FIRST,    pOpt->bChgEnumNum );
@@ -1926,7 +1926,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
     bool bModified = false;
     if (m_pSwCheckLB->IsVisible())
     {
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
         bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
         bModified |= pOpt->bAddNonBrkSpace != bCheck;
@@ -1991,7 +1991,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
     // Initialize the Sw options
     if (m_pSwCheckLB->IsVisible())
     {
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
         m_pSwCheckLB->SetUpdateMode( false );
         m_pSwCheckLB->Clear();
@@ -2254,7 +2254,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
 {
     bool bModified = false, bCheck;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     sal_uInt16 nVal;
 
     bCheck = m_pCBActiv->IsChecked();
@@ -2306,7 +2306,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
 void OfaAutoCompleteTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
     m_pCBActiv->Check( pOpt->bAutoCompleteWords );
     m_pCBCollect->Check( pOpt->bAutoCmpltCollectWords );
@@ -2640,7 +2640,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
 bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
 
     // robust!
@@ -2683,7 +2683,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
 void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
 
     // robust, should not happen!
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 86930e231508..4d721afaffa0 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
                     aFmt.SetSuffix( aEmptyStr );
                 else
                     aFmt.SetSuffix(_pSet->sSuffix);
-                aFmt.SetCharFmtName(sNumCharFmtName);
+                aFmt.SetCharFormatName(sNumCharFmtName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(100);
                 pActNum->SetLevel(i, aFmt);
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetSuffix( OUString() );
                 aFmt.SetBulletFont(&rActBulletFont);
                 aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFmtName(sBulletCharFmtName);
+                aFmt.SetCharFormatName(sBulletCharFormatName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(45);
                 pActNum->SetLevel(i, aFmt);
@@ -548,7 +548,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
     SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
 
     if (pBulletCharFmt)
-        SetCharFmtName( pBulletCharFmt->GetValue());
+        SetCharFormatName( pBulletCharFmt->GetValue());
 
 
 }
@@ -773,14 +773,14 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
                                         ? pLevelSettings->sBulletChar[0]
                                         : 0 );
-                aFmt.SetCharFmtName( sBulletCharFmtName );
+                aFmt.SetCharFormatName( sBulletCharFormatName );
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(45);
             }
             else
             {
                 aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
-                aFmt.SetCharFmtName(sNumCharFmtName);
+                aFmt.SetCharFormatName(sNumCharFmtName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(100);
                 // #i93908#
@@ -808,7 +808,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
 
 
     if (pNumCharFmt &&pBulletCharFmt)
-        SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
+        SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
 }
 
 SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetNumberingType(nSetNumberingType);
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
-                aFmt.SetCharFmtName( sNumCharFmtName );
+                aFmt.SetCharFormatName( sNumCharFmtName );
 
                 Graphic aGraphic;
                 if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
@@ -1611,7 +1611,7 @@ void SvxNumOptionsTabPage::InitControls()
             if(SAL_MAX_UINT16 == nLvl)
             {
                 nLvl = i;
-                sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName();
+                sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
                 eFirstOrient = aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap)
                     aFirstSize = aNumFmtArr[i]->GetGraphicSize();
@@ -1624,7 +1624,7 @@ void SvxNumOptionsTabPage::InitControls()
                 bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
                 bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
                 bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
-                bSameCharFmt    &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+                bSameCharFmt    &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
                 bSameVOrient    &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap && bSameSize)
                     bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -1933,7 +1933,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
                 // allocation of the drawing pattern is automatic
                 if(bAutomaticCharStyles)
                 {
-                    sSelectStyle = m_sBulletCharFmtName;
+                    sSelectStyle = m_sBulletCharFormatName;
                 }
             }
             else
@@ -2118,7 +2118,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
             if(nActNumLvl & nMask)
             {
                 SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
-                aNumFmt.SetCharFmtName(m_sNumCharFmtName);
+                aNumFmt.SetCharFormatName(m_sNumCharFmtName);
                 aNumFmt.SetGraphic(aGrfName);
 
                 // set size for a later comparison
@@ -2355,11 +2355,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
         {
             SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
             if( 0 == nEntryPos )
-                aNumFmt.SetCharFmtName(aEmptyStr);
+                aNumFmt.SetCharFormatName(aEmptyStr);
             else
             {
                 if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
-                    aNumFmt.SetCharFmtName(sEntry);
+                    aNumFmt.SetCharFormatName(sEntry);
             }
             pActNum->SetLevel(i, aNumFmt);
         }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 94c007053d8c..d128a30060b4 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -319,10 +319,10 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
                 static_cast<const SvxLRSpaceItem&>(GetItemSet().GetParent()->Get( nWhich ));
 
             if ( m_pLeftIndent->IsRelative() )
-                aMargin.SetTxtLeft( rOldItem.GetTxtLeft(),
+                aMargin.SetTextLeft( rOldItem.GetTextLeft(),
                                     (sal_uInt16)m_pLeftIndent->GetValue() );
             else
-                aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+                aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
 
             if ( m_pRightIndent->IsRelative() )
                 aMargin.SetRight( rOldItem.GetRight(),
@@ -331,21 +331,21 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
                 aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
 
             if ( m_pFLineIndent->IsRelative() )
-                aMargin.SetTxtFirstLineOfst( rOldItem.GetTxtFirstLineOfst(),
+                aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(),
                                              (sal_uInt16)m_pFLineIndent->GetValue() );
             else
-                aMargin.SetTxtFirstLineOfst(
+                aMargin.SetTextFirstLineOfst(
                     (sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
         }
         else
         {
-            aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+            aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
             aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
-            aMargin.SetTxtFirstLineOfst(
+            aMargin.SetTextFirstLineOfst(
                 (sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
         }
         aMargin.SetAutoFirst(m_pAutoCB->IsChecked());
-        if ( aMargin.GetTxtFirstLineOfst() < 0 )
+        if ( aMargin.GetTextFirstLineOfst() < 0 )
             bNullTab = true;
         eState = GetItemSet().GetItemState( nWhich );
 
@@ -452,7 +452,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
             {
                 m_pLeftIndent->SetRelative();
                 SetFieldUnit( *m_pLeftIndent, eFUnit );
-                SetMetricValue( *m_pLeftIndent, rOldItem.GetTxtLeft(), eUnit );
+                SetMetricValue( *m_pLeftIndent, rOldItem.GetTextLeft(), eUnit );
             }
 
             if ( rOldItem.GetPropRight() != 100 )
@@ -467,17 +467,17 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
                 SetMetricValue( *m_pRightIndent, rOldItem.GetRight(), eUnit );
             }
 
-            if ( rOldItem.GetPropTxtFirstLineOfst() != 100 )
+            if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
             {
                 m_pFLineIndent->SetRelative( true );
-                m_pFLineIndent->SetValue( rOldItem.GetPropTxtFirstLineOfst() );
+                m_pFLineIndent->SetValue( rOldItem.GetPropTextFirstLineOfst() );
             }
             else
             {
                 m_pFLineIndent->SetRelative();
                 m_pFLineIndent->SetMin(-9999);
                 SetFieldUnit( *m_pFLineIndent, eFUnit );
-                SetMetricValue( *m_pFLineIndent, rOldItem.GetTxtFirstLineOfst(),
+                SetMetricValue( *m_pFLineIndent, rOldItem.GetTextFirstLineOfst(),
                                 eUnit );
             }
             m_pAutoCB->Check(rOldItem.IsAutoFirst());
@@ -487,9 +487,9 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
             const SvxLRSpaceItem& rSpace =
                 static_cast<const SvxLRSpaceItem&>(rSet->Get( _nWhich ));
 
-            SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit );
+            SetMetricValue( *m_pLeftIndent, rSpace.GetTextLeft(), eUnit );
             SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit );
-            SetMetricValue( *m_pFLineIndent, rSpace.GetTxtFirstLineOfst(), eUnit );
+            SetMetricValue( *m_pFLineIndent, rSpace.GetTextFirstLineOfst(), eUnit );
             m_pAutoCB->Check(rSpace.IsAutoFirst());
         }
         AutoHdl_Impl(m_pAutoCB);
@@ -1430,7 +1430,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
 
     if ( bIsPageModel )
         // if PageModel is turned on, always turn off PageBreak
-        rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+        rOutSet->Put( SvxFormatBreakItem( SVX_BREAK_NONE, _nWhich ) );
     else
     {
         eState = m_pPageBreakBox->GetState();
@@ -1441,9 +1441,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
              m_pBreakTypeLB->IsValueChangedFromSaved()   ||
              m_pBreakPositionLB->IsValueChangedFromSaved() )
         {
-            const SvxFmtBreakItem rOldBreak(
-                    static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( _nWhich )));
-            SvxFmtBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
+            const SvxFormatBreakItem rOldBreak(
+                    static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( _nWhich )));
+            SvxFormatBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
 
             switch ( eState )
             {
@@ -1476,7 +1476,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
             pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
 
             if ( eState != m_pPageBreakBox->GetSavedValue()                ||
-                    !pOld || !( *static_cast<const SvxFmtBreakItem*>(pOld) == aBreak ) )
+                    !pOld || !( *static_cast<const SvxFormatBreakItem*>(pOld) == aBreak ) )
             {
                 bModified = true;
                 rOutSet->Put( aBreak );
@@ -1492,10 +1492,10 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
     {
         pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
 
-        if ( !pOld || static_cast<const SvxFmtSplitItem*>(pOld)->GetValue() !=
+        if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() !=
                       ( eState == TRISTATE_FALSE ) )
         {
-            rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+            rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
             bModified = true;
         }
     }
@@ -1507,7 +1507,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
     if ( m_pKeepParaBox->IsValueChangedFromSaved() )
     {
         // if the status has changed, putting is necessary
-        rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+        rOutSet->Put( SvxFormatKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
         bModified = true;
     }
 
@@ -1655,8 +1655,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
 
             if ( eItemState >= SfxItemState::DEFAULT )
             {
-                const SvxFmtBreakItem& rPageBreak =
-                    static_cast<const SvxFmtBreakItem&>(rSet->Get( _nWhich ));
+                const SvxFormatBreakItem& rPageBreak =
+                    static_cast<const SvxFormatBreakItem&>(rSet->Get( _nWhich ));
 
                 SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
 
@@ -1727,8 +1727,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
     if ( eItemState >= SfxItemState::DEFAULT )
     {
         m_pKeepParaBox->EnableTriState( false );
-        const SvxFmtKeepItem& rKeep =
-            static_cast<const SvxFmtKeepItem&>(rSet->Get( _nWhich ));
+        const SvxFormatKeepItem& rKeep =
+            static_cast<const SvxFormatKeepItem&>(rSet->Get( _nWhich ));
 
         if ( rKeep.GetValue() )
             m_pKeepParaBox->SetState( TRISTATE_TRUE );
@@ -1745,8 +1745,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
 
     if ( eItemState >= SfxItemState::DEFAULT )
     {
-        const SvxFmtSplitItem& rSplit =
-            static_cast<const SvxFmtSplitItem&>(rSet->Get( _nWhich ));
+        const SvxFormatSplitItem& rSplit =
+            static_cast<const SvxFormatSplitItem&>(rSet->Get( _nWhich ));
         m_pKeepTogetherBox->EnableTriState( false );
 
         if ( !rSplit.GetValue() )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 9dd3c078639f..6bef88304734 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -233,7 +233,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
         if (SfxItemState::SET != rSet->GetItemState(GetWhich(SID_ATTR_LRSPACE), true, &pLRSpace))
             pLRSpace = GetOldItem(*rSet, SID_ATTR_LRSPACE);
 
-        if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTxtFirstLineOfst() < 0)
+        if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTextFirstLineOfst() < 0)
         {
             SvxTabStop aNull(0, SVX_TAB_ADJUST_DEFAULT);
             aNewTabs.Insert(aNull);
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index c5f7a3b32f40..fb210c6813a3 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -375,8 +375,8 @@ public:
                                     { return !(operator == ( rAttr ) ); }
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
-    Color*&         GetTxtColor()           { return pTxtColor; }
-    Color*&         GetFldColor()           { return pFldColor; }
+    Color*&         GetTextColor()           { return pTxtColor; }
+    Color*&         GetFieldColor()           { return pFldColor; }
 
     const OUString& GetFieldValue() const { return aFieldValue;}
     void SetFieldValue(const OUString& rVal);
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index fa1f99af1169..d59654f713e5 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -70,9 +70,9 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
         case EE_PARA_OUTLLRSPACE:
         case EE_PARA_LRSPACE:
             aDebStr.append("FI=");
-            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst()));
+            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst()));
             aDebStr.append(", LI=");
-            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft()));
+            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()));
             aDebStr.append(", RI=");
             aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight()));
         break;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c9fe9755005f..6f447b90f291 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -878,8 +878,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
         {
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: invalid Item!" );
             SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem);
-            rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
-            rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) );
+            rItem.SetTextFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTextFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetTextLeft( OutputDevice::LogicToLogic( rItem.GetTextLeft(), eSourceUnit, eDestUnit ) );
             rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) );
         }
         break;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3a356ab28115..a119b58dc8dc 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1922,11 +1922,11 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
         else
         {
             const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() );
-// TL_NF_LR         aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) );
+// TL_NF_LR         aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) );
             sal_Int32 nSpaceBefore = 0;
             pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore );
-            short nX = (short)(rLRItem.GetTxtLeft()
-                            + rLRItem.GetTxtFirstLineOfst()
+            short nX = (short)(rLRItem.GetTextLeft()
+                            + rLRItem.GetTextFirstLineOfst()
                             + nSpaceBefore);
             aPoint.X() = pImpEditEngine->GetXValue( nX
                              );
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index c4f3afca1338..ecee5b62ef22 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1564,14 +1564,14 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
         {
             ContentInfo& rC = aContents[i];
             const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rC.GetParaAttribs().Get(EE_PARA_LRSPACE));
-            if ( rLRSpace.GetTxtLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
+            if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
             {
                 const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS));
                 SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
                 for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
                 {
                     const SvxTabStop& rT = rTabs[ t ];
-                    aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
+                    aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTextLeft(),
                                 rT.GetAdjustment(), rT.GetDecimal(), rT.GetFill() ) );
                 }
                 rC.GetParaAttribs().Put( aNewTabs );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index bfded820d6fa..87a1f947af28 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2943,12 +2943,12 @@ bool ImpEditEngine::UpdateFields()
                 rField.Reset();
 
                 if ( aStatus.MarkFields() )
-                    rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
+                    rField.GetFieldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
 
                 OUString aFldValue =
                     GetEditEnginePtr()->CalcFieldValue(
                         static_cast<const SvxFieldItem&>(*rField.GetItem()),
-                        nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor());
+                        nPara, rField.GetStart(), rField.GetTextColor(), rField.GetFieldColor());
 
                 rField.SetFieldValue(aFldValue);
                 if (rField != *pCurrent)
@@ -3089,10 +3089,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace )
                 // width, here not preferred. I general, it is best not leave it
                 // to StartPosX, also the right indents have to be taken into
                 // account!
-                nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+                nCurWidth = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
                 if ( nLine == 0 )
                 {
-                    long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+                    long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
                     nCurWidth -= nFI;
                     if ( pPortion->GetBulletX() > nCurWidth )
                     {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1a8ac4d5918b..fb071e08799e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -737,10 +737,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
         sal_Int32 nPortionStart = 0;
         sal_Int32 nPortionEnd = 0;
 
-        long nStartX = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+        long nStartX = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
         if ( nIndex == 0 )
         {
-            long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+            long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
             nStartX += nFI;
 
             if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) )
@@ -907,9 +907,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                         if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
                             nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
 
-                        short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
-                        aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
-                        aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
+                        short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth);
+                        aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() );
+                        aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) );
                         aCurrentTab.bValid = false;
 
                         // Switch direction in R2L para...
@@ -1577,12 +1577,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
     sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore );
     const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
     const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
-    short nStartX = GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBefore));
+    short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore));
 
     Rectangle aBulletArea = Rectangle( Point(), Point() );
     if ( bLineBreak )
     {
-        nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+        nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
     }
     else
     {
@@ -1593,7 +1593,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
             pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly.
         if ( pParaPortion->GetBulletX() > nStartX )
         {
-            nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+            nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
             if ( pParaPortion->GetBulletX() > nStartX )
                 nStartX = pParaPortion->GetBulletX();
         }
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0fb7962a54da..8cd007a3de34 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -723,11 +723,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         case EE_PARA_LRSPACE:
         {
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
-            sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst();
+            sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst();
             nTxtFirst = LogicToTwips( nTxtFirst );
             rOutput.WriteInt32AsString( nTxtFirst );
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
-            sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft());
+            sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft());
             nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
             rOutput.WriteInt32AsString( nTxtLeft );
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 50db5864bc23..d872838d7250 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -149,8 +149,8 @@ TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
 TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
 TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
 TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
-TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
+TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
 TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
 TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
 
@@ -496,7 +496,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             break;
 
         case MID_TXT_LMARGIN :
-            SetTxtLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
+            SetTextLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
         break;
 
         case MID_R_MARGIN:
@@ -518,11 +518,11 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         }
         break;
         case MID_FIRST_LINE_INDENT     :
-            SetTxtFirstLineOfst((short)(bConvert ?  convertMm100ToTwip(nVal) : nVal));
+            SetTextFirstLineOfst((short)(bConvert ?  convertMm100ToTwip(nVal) : nVal));
             break;
 
         case MID_FIRST_LINE_REL_INDENT:
-            SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
+            SetPropTextFirstLineOfst ( (sal_uInt16)nVal );
             break;
 
         case MID_FIRST_AUTO:
@@ -557,11 +557,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
     const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr);
 
     return (
-        nFirstLineOfst == rOther.GetTxtFirstLineOfst() &&
-        nTxtLeft == rOther.GetTxtLeft() &&
+        nFirstLineOfst == rOther.GetTextFirstLineOfst() &&
+        nTxtLeft == rOther.GetTextLeft() &&
         nLeftMargin == rOther.GetLeft()  &&
         nRightMargin == rOther.GetRight() &&
-        nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() &&
+        nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() &&
         nPropLeftMargin == rOther.GetPropLeft()  &&
         nPropRightMargin == rOther.GetPropRight() &&
         bAutoFirst == rOther.IsAutoFirst() &&
@@ -673,7 +673,7 @@ bool SvxLRSpaceItem::GetPresentation
 SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     short nSaveFI = nFirstLineOfst;
-    const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( 0 );  // nLeftMargin is manipulated together with this, see Create()
+    const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( 0 );  // nLeftMargin is manipulated together with this, see Create()
 
     sal_uInt16 nMargin = 0;
     if( nLeftMargin > 0 )
@@ -713,7 +713,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
         }
     }
 
-    const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( nSaveFI );
+    const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( nSaveFI );
 
     return rStrm;
 }
@@ -1268,7 +1268,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     sal_Int8 cProt = 0;
     if( IsPosProtected() )   cProt |= 0x01;
     if( IsSizeProtected() )  cProt |= 0x02;
-    if( IsCntntProtected() ) cProt |= 0x04;
+    if( IsContentProtected() ) cProt |= 0x04;
     rStrm.WriteSChar( cProt );
     return rStrm;
 }
@@ -1282,7 +1282,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
     SvxProtectItem* pAttr = new SvxProtectItem( Which() );
     pAttr->SetPosProtect( ( cFlags & 0x01 ) != 0 );
     pAttr->SetSizeProtect( ( cFlags & 0x02 ) != 0 );
-    pAttr->SetCntntProtect( ( cFlags & 0x04 ) != 0 );
+    pAttr->SetContentProtect( ( cFlags & 0x04 ) != 0 );
     return pAttr;
 }
 
@@ -2937,18 +2937,18 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
 
-bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" );
 
-    return GetValue() == static_cast<const SvxFmtBreakItem&>( rAttr ).GetValue();
+    return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue();
 }
 
 
 
-bool SvxFmtBreakItem::GetPresentation
+bool SvxFormatBreakItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2962,14 +2962,14 @@ bool SvxFmtBreakItem::GetPresentation
 
 
 
-OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
 }
 
 
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
     switch ( (SvxBreak)GetValue() )
@@ -2986,7 +2986,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons
     return true;
 }
 
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     style::BreakType nBreak;
 
@@ -3017,14 +3017,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 
 
 
-SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
 {
-    return new SvxFmtBreakItem( *this );
+    return new SvxFormatBreakItem( *this );
 }
 
 
 
-SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     rStrm.WriteSChar( GetValue() );
     if( FMTBREAK_NOAUTO > nItemVersion )
@@ -3034,44 +3034,44 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co
 
 
 
-sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
+sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
             SOFFICE_FILEFORMAT_50==nFFVer,
-            "SvxFmtBreakItem: Is there a new file format? ");
+            "SvxFormatBreakItem: Is there a new file format? ");
     return SOFFICE_FILEFORMAT_31==nFFVer ||
            SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
 }
 
 
 
-SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
+SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
     sal_Int8 eBreak, bDummy;
     rStrm.ReadSChar( eBreak );
     if( FMTBREAK_NOAUTO > nVersion )
         rStrm.ReadSChar( bDummy );
-    return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
+    return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() );
 }
 
 
 
-sal_uInt16 SvxFmtBreakItem::GetValueCount() const
+sal_uInt16 SvxFormatBreakItem::GetValueCount() const
 {
     return SVX_BREAK_END;   // SVX_BREAK_PAGE_BOTH + 1
 }
 
-// class SvxFmtKeepItem -------------------------------------------------
+// class SvxFormatKeepItem -------------------------------------------------
 
-SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
 {
-    return new SvxFmtKeepItem( *this );
+    return new SvxFormatKeepItem( *this );
 }
 
 
 
-SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
@@ -3079,16 +3079,16 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 
 
 
-SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsKeep;
     rStrm.ReadSChar( bIsKeep );
-    return new SvxFmtKeepItem( bIsKeep != 0, Which() );
+    return new SvxFormatKeepItem( bIsKeep != 0, Which() );
 }
 
 
 
-bool SvxFmtKeepItem::GetPresentation
+bool SvxFormatKeepItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c78822484e39..6b846e74491f 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -565,7 +565,7 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper )
     return sRet;
 }
 
-OUString SvxNumberFormat::GetCharFmtName()const
+OUString SvxNumberFormat::GetCharFormatName()const
 {
     return sCharStyleName;
 }
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 758e2480ccda..452704b0d9ff 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
 TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
 TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
 TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
 TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
 TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
 TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
@@ -1208,19 +1208,19 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
 
 
 
-// class SvxFmtSplitItem -------------------------------------------------
-SvxFmtSplitItem::~SvxFmtSplitItem()
+// class SvxFormatSplitItem -------------------------------------------------
+SvxFormatSplitItem::~SvxFormatSplitItem()
 {
 }
 
-SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
 {
-    return new SvxFmtSplitItem( *this );
+    return new SvxFormatSplitItem( *this );
 }
 
 
 
-SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
@@ -1228,16 +1228,16 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
 
 
 
-SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsSplit;
     rStrm.ReadSChar( bIsSplit );
-    return new SvxFmtSplitItem( bIsSplit != 0, Which() );
+    return new SvxFormatSplitItem( bIsSplit != 0, Which() );
 }
 
 
 
-bool SvxFmtSplitItem::GetPresentation
+bool SvxFormatSplitItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index da7e9183e4ad..7de20d1eed9d 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -434,7 +434,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
 }
 
 
-Size SvxFont::GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+Size SvxFont::GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
                          const sal_Int32 nIdx, const sal_Int32 nLen ) const
 {
     sal_Int32 nTmp = nLen;
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 3971ce8d8e74..325e787217dd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -398,7 +398,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
     DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
     if(aValues.getLength() == aNames.getLength())
     {
-        SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
         for(int nProp = 0; nProp < aNames.getLength(); nProp++)
         {
             if(pValues[nProp].hasValue())
@@ -461,16 +461,16 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                             sal::static_int_cast< sal_uInt8 >(nVal);
                     }
                     break; // "Format/Option/CombineValue",
-                    case  23: rSwFlags.bAFmtDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
-                    case  24: rSwFlags.bAFmtDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
+                    case  23: rSwFlags.bAFormatDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
+                    case  24: rSwFlags.bAFormatDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
                     case  25: rParent.bAutoFmtByInput = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/Enable",
                     case  26: rSwFlags.bChgToEnEmDash = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeDash",
                     case  27: rSwFlags.bSetNumRule = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ApplyNumbering/Enable",
                     case  28: rSwFlags.bSetBorder = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToBorders",
                     case  29: rSwFlags.bCreateTable = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToTable",
                     case  30: rSwFlags.bReplaceStyles =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ReplaceStyle",
-                    case  31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
-                    case  32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
+                    case  31: rSwFlags.bAFormatByInpDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
+                    case  32: rSwFlags.bAFormatByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
                     case  33: rSwFlags.bAutoCompleteWords = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Completion/Enable",
                     case  34:
                     {
@@ -554,7 +554,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
 
     const Type& rType = cppu::UnoType<bool>::get();
     sal_Bool bVal;
-    SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
         switch(nProp)
@@ -597,16 +597,16 @@ void SvxSwAutoCorrCfg::ImplCommit()
             case  22:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin;
             break; // "Format/Option/CombineValue",
-            case  23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
-            case  24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
+            case  23: bVal = rSwFlags.bAFormatDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
+            case  24: bVal = rSwFlags.bAFormatDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
             case  25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
             case  26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
             case  27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
             case  28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
             case  29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
             case  30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
-            case  31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
-            case  32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
+            case  31: bVal = rSwFlags.bAFormatByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
+            case  32: bVal = rSwFlags.bAFormatByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
             case  33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
             case  34:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 74645ed982c2..31f085c805c1 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -21,7 +21,7 @@
 #include <tools/gen.hxx>
 #include <vcl/keycodes.hxx>
 
-SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
+SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
     : aBulletFont( OUString("StarSymbol"),
                     Size( 0, 14 ) )
 {
@@ -36,10 +36,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bChgToEnEmDash =
     bChgWeightUnderl =
     bSetINetAttr =
-    bAFmtDelSpacesAtSttEnd =
-    bAFmtDelSpacesBetweenLines =
-    bAFmtByInpDelSpacesAtSttEnd =
-    bAFmtByInpDelSpacesBetweenLines =
+    bAFormatDelSpacesAtSttEnd =
+    bAFormatDelSpacesBetweenLines =
+    bAFormatByInpDelSpacesAtSttEnd =
+    bAFormatByInpDelSpacesBetweenLines =
     bDummy = true;
 
     bReplaceStyles =
@@ -52,7 +52,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bSetBorder =
     bCreateTable =
     bSetNumRule =
-    bAFmtByInput =
+    bAFormatByInput =
     bRightMargin =
     bAutoCompleteWords =
     bAutoCmpltCollectWords =
@@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
 }
 
 
-SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags )
+SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
 {
     bAutoCorrect = rAFFlags.bAutoCorrect;
     bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
@@ -92,7 +92,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
     bChgEnumNum = rAFFlags.bChgEnumNum;
     bDelEmptyNode = rAFFlags.bDelEmptyNode;
     bSetNumRule = rAFFlags.bSetNumRule;
-    bAFmtByInput = rAFFlags.bAFmtByInput;
+    bAFormatByInput = rAFFlags.bAFormatByInput;
 
     bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
     bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
@@ -102,10 +102,10 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
     bSetBorder = rAFFlags.bSetBorder;
     bCreateTable = rAFFlags.bCreateTable;
     bReplaceStyles = rAFFlags.bReplaceStyles;
-    bAFmtDelSpacesAtSttEnd = rAFFlags.bAFmtDelSpacesAtSttEnd;
-    bAFmtDelSpacesBetweenLines = rAFFlags.bAFmtDelSpacesBetweenLines;
-    bAFmtByInpDelSpacesAtSttEnd = rAFFlags.bAFmtByInpDelSpacesAtSttEnd;
-    bAFmtByInpDelSpacesBetweenLines = rAFFlags.bAFmtByInpDelSpacesBetweenLines;
+    bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd;
+    bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines;
+    bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
+    bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
 
     bDummy = rAFFlags.bDummy;
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 8f704bb192bf..b573ea1ebd5e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -679,17 +679,17 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
     EditFieldInfo aFldInfo( this, rField, nPara, nPos );
     // The FldColor is preset with COL_LIGHTGRAY.
     if ( rpFldColor )
-        aFldInfo.SetFldColor( *rpFldColor );
+        aFldInfo.SetFieldColor( *rpFldColor );
 
     aCalcFieldValueHdl.Call( &aFldInfo );
-    if ( aFldInfo.GetTxtColor() )
+    if ( aFldInfo.GetTextColor() )
     {
         delete rpTxtColor;
-        rpTxtColor = new Color( *aFldInfo.GetTxtColor() );
+        rpTxtColor = new Color( *aFldInfo.GetTextColor() );
     }
 
     delete rpFldColor;
-    rpFldColor = aFldInfo.GetFldColor() ? new Color( *aFldInfo.GetFldColor() ) : 0;
+    rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0;
 
     return aFldInfo.GetRepresentation();
 }
@@ -1578,9 +1578,9 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
         const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
 
         const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ) );
-        aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore;
+        aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore;
 
-        long nBulletWidth = std::max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
+        long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
         if ( nBulletWidth < aBulletSize.Width() )   // The Bullet creates its space
             nBulletWidth = aBulletSize.Width();
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index fdfda0726f7f..67a574bac6e2 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_KEEP:
                 if( aPardMap.nSplit )
                 {
-                    pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit ));
+                    pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit ));
                 }
                 break;
 
             case RTF_KEEPN:
                 if( aPardMap.nKeep )
                 {
-                    pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep ));
+                    pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep ));
                 }
                 break;
 
@@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                             CalcValue();
                         nSz = sal_uInt16(nTokenValue);
                     }
-                    aLR.SetTxtFirstLineOfst( nSz );
+                    aLR.SetTextFirstLineOfst( nSz );
                     pSet->Put( aLR );
                 }
                 break;
@@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                             CalcValue();
                         nSz = sal_uInt16(nTokenValue);
                     }
-                    aLR.SetTxtLeft( nSz );
+                    aLR.SetTextLeft( nSz );
                     pSet->Put( aLR );
                 }
                 break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 552c52a77b27..56ef7368e8fc 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser()
     sBaseURL.clear();
 
     // generate the correct WhichId table from the set WhichIds.
-    BuildWhichTbl();
+    BuildWhichTable();
 
     return SvRTFParser::CallParser();
 }
@@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & )
 {
 }
 
-void SvxRTFParser::BuildWhichTbl()
+void SvxRTFParser::BuildWhichTable()
 {
     aWhichMap.clear();
     aWhichMap.push_back( 0 );
@@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl()
     // Building a Which-Map 'rWhichMap' from an array of
     // 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'.
     // The Which-Map is not going to be deleted.
-    SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
-    SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
+    SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
+    SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
 }
 
 const SfxItemSet& SvxRTFParser::GetRTFDefaults()
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 506c449d9bed..9e88ceb4a361 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
                                       sal_uLong         nTxBx,
                                       SdrObject*    pObject,
-                                      SwFlyFrmFmt*  pFly,
+                                      SwFlyFrameFormat*  pFly,
                                       short         nHdFtSection) const
 {
     sal_uInt16 nShpCnt = pShapeOrders->size();
@@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
 
 void SvxMSDffManager::ExchangeInShapeOrder( SdrObject*   pOldObject,
                                             sal_uLong        nTxBx,
-                                            SwFlyFrmFmt* pFly,
+                                            SwFlyFrameFormat* pFly,
                                             SdrObject*   pObject) const
 {
     sal_uInt16 nShpCnt = pShapeOrders->size();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 42f3c2d0b531..4536cda3ad52 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
         sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 );
         sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 );
         aLRSpaceItem.SetLeft( nAbsLSpace );
-        aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset );
+        aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset );
         rSet.Put( aLRSpaceItem );
     }
     else
     {
         SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
         aLRSpaceItem.SetLeft( 0 );
-        aLRSpaceItem.SetTxtFirstLineOfstValue( 0 );
+        aLRSpaceItem.SetTextFirstLineOfstValue( 0 );
         rSet.Put( aLRSpaceItem );
     }
     if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) )
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 1a90fb301e7c..e2fd887ad02e 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -96,8 +96,8 @@ public:
     // the pointer is transferred to the possession of the ConfigItems!
     void SetAutoCorrect( SvxAutoCorrect* );
 
-    bool IsAutoFmtByInput() const       { return bAutoFmtByInput; }
-    void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
+    bool IsAutoFormatByInput() const       { return bAutoFmtByInput; }
+    void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
 
     bool IsSaveRelFile() const          { return bFileRel; }
     void SetSaveRelFile( bool bSet )    { bFileRel = bSet; aSwConfig.SetModified(); }
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 65a1bf12cc81..7dee5d66e039 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -24,7 +24,7 @@
 #include <editeng/editengdllapi.h>
 
 
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
 
 /*  [Description]
 
@@ -33,15 +33,15 @@
 */
 #define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
 
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
 {
 public:
     TYPEINFO_OVERRIDE();
 
-    inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+    inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
                             const sal_uInt16 nWhich );
-    inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
-    inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+    inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
+    inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -69,17 +69,17 @@ public:
 };
 
 
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
                                          const sal_uInt16 _nWhich ) :
     SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
 {}
 
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
     SfxEnumItem( rBreak )
 {}
 
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
-    const SvxFmtBreakItem& rBreak )
+inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
+    const SvxFormatBreakItem& rBreak )
 {
     SetValue( rBreak.GetValue() );
     return *this;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 1092311baeda..4646cf75b919 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -23,21 +23,21 @@
 #include <editeng/editengdllapi.h>
 
 
-// class SvxFmtKeepItem ------------------------------------------------
+// class SvxFormatKeepItem ------------------------------------------------
 
 /*  [Description]
 
     This item describes a logical variable "keep paragraphs together?".
 */
 
-class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
 {
 public:
     TYPEINFO_OVERRIDE();
 
-    inline SvxFmtKeepItem( const bool bKeep /*= false*/,
+    inline SvxFormatKeepItem( const bool bKeep /*= false*/,
                            const sal_uInt16 _nWhich  );
-    inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
+    inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -50,11 +50,11 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 };
 
-inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
     SfxBoolItem( _nWhich, bKeep )
 {}
 
-inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep )
+inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep )
 {
     SetValue( rKeep.GetValue() );
     return *this;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 123264e9cd89..4e1b0796bbd6 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -36,7 +36,7 @@
     0 coordinate for the first line indent:
 
     UI         UI       LAYOUT   UI/TEXT      UI/TEXT    (Where?)
-    SetTxtLeft SetTxtFirst GetLeft  GetTxtLeft  GetTxtFirst  (What?)
+    SetTextLeft SetTxtFirst GetLeft  GetTextLeft  GetTxtFirst  (What?)
     500       -500        0        500         -500      (How much?)
     500         0        500       500           0
     500       +500       500       500         +500
@@ -115,16 +115,16 @@ public:
     inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
 
     // The UI/text interface:
-    inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
-    inline long GetTxtLeft() const { return nTxtLeft; }
+    inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
+    inline long GetTextLeft() const { return nTxtLeft; }
 
-    inline void   SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
-    inline short  GetTxtFirstLineOfst() const { return nFirstLineOfst; }
-    inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
+    inline void   SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
+    inline short  GetTextFirstLineOfst() const { return nFirstLineOfst; }
+    inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 )
                     { nPropFirstLineOfst = nProp; }
-    inline sal_uInt16 GetPropTxtFirstLineOfst() const
+    inline sal_uInt16 GetPropTextFirstLineOfst() const
                     { return nPropFirstLineOfst; }
-    inline void SetTxtFirstLineOfstValue( const short nValue )
+    inline void SetTextFirstLineOfstValue( const short nValue )
                     { nFirstLineOfst = nValue; }
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
@@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
     nRightMargin = (nR * nProp) / 100;
     nPropRightMargin = nProp;
 }
-inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
+inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF,
                                                  const sal_uInt16 nProp )
 {
     nFirstLineOfst = short((long(nF) * nProp ) / 100);
@@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
     AdjustLeft();
 }
 
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
 {
     if (0 == nL)
     {
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1e9e623a8466..d3768a8237a1 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -172,7 +172,7 @@
 #define MID_BACK_COLOR_TRANSPARENCY 10
 #define MID_SHADING_VALUE       11
 
-//SvxFmtBreakItem
+//SvxFormatBreakItem
 #define MID_BREAK_BEFORE        0
 #define MID_BREAK_AFTER         1
 
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ae7b3150d72c..bcf8b29b054a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -71,7 +71,7 @@ public:
     void            SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
     bool            IsShowSymbol()const{return bShowSymbol;}
 
-    bool            IsTxtFmt() const
+    bool            IsTextFormat() const
                     {
                         return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType &&
                                com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType &&
@@ -163,8 +163,8 @@ public:
     void            SetSuffix(const OUString& rSet) { sSuffix = rSet;}
     const OUString&   GetSuffix() const { return sSuffix;}
 
-    void                    SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
-    virtual OUString        GetCharFmtName()const;
+    void                    SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
+    virtual OUString        GetCharFormatName()const;
 
     void            SetBulletFont(const vcl::Font* pFont);
     const vcl::Font* GetBulletFont() const {return pBulletFont;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 4b47caeb97ec..5a2dbe9f8cf9 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -524,14 +524,14 @@ public:
 
     const SvxFieldItem& GetField() const { return rFldItem; }
 
-    Color*          GetTxtColor() const { return pTxtColor; }
-    void            SetTxtColor( const Color& rColor )
+    Color*          GetTextColor() const { return pTxtColor; }
+    void            SetTextColor( const Color& rColor )
                         { delete pTxtColor; pTxtColor = new Color( rColor ); }
 
-    Color*          GetFldColor() const { return pFldColor; }
-    void            SetFldColor( const Color& rColor )
+    Color*          GetFieldColor() const { return pFldColor; }
+    void            SetFieldColor( const Color& rColor )
                         { delete pFldColor; pFldColor = new Color( rColor ); }
-    void            ClearFldColor()
+    void            ClearFieldColor()
                         { delete pFldColor; pFldColor = 0; }
 
     sal_Int32       GetPara() const { return nPara; }
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 66fa1a30d1ca..119a8dd3a4ba 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -57,10 +57,10 @@ public:
     virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
     virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
 
-    bool IsCntntProtected() const { return bCntnt; }
+    bool IsContentProtected() const { return bCntnt; }
     bool IsSizeProtected()  const { return bSize;  }
     bool IsPosProtected()   const { return bPos;   }
-    void SetCntntProtect( bool bNew ) { bCntnt = bNew; }
+    void SetContentProtect( bool bNew ) { bCntnt = bNew; }
     void SetSizeProtect ( bool bNew ) { bSize  = bNew; }
     void SetPosProtect  ( bool bNew ) { bPos   = bNew; }
 
@@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
 
 inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
 {
-    bCntnt = rCpy.IsCntntProtected();
+    bCntnt = rCpy.IsContentProtected();
     bSize  = rCpy.IsSizeProtected();
     bPos   = rCpy.IsPosProtected();
     return *this;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index f84ce3b348bc..c5c8b769d8b5 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -24,22 +24,22 @@
 
 class SvXMLUnitConverter;
 
-// class SvxFmtSplitItem -------------------------------------------------
+// class SvxFormatSplitItem -------------------------------------------------
 
 /*  [Description]
 
     This item describes a logical variable "split paragraph yes or no".
 */
 
-class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
 {
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SvxFmtSplitItem();
+    virtual ~SvxFormatSplitItem();
 
-    inline SvxFmtSplitItem( const bool bSplit /*= true*/,
+    inline SvxFormatSplitItem( const bool bSplit /*= true*/,
                             const sal_uInt16 nWh  );
-    inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
+    inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -52,12 +52,12 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 };
 
-inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
     SfxBoolItem( nWh, bSplit )
 {}
 
-inline SvxFmtSplitItem& SvxFmtSplitItem::operator=(
-    const SvxFmtSplitItem& rSplit )
+inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
+    const SvxFormatSplitItem& rSplit )
 {
     SetValue( rSplit.GetValue() );
     return *this;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4438d42d835..18fb82a31315 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 
     OUString sShareAutoCorrFile, sUserAutoCorrFile;
 
-    SvxSwAutoFmtFlags aSwFlags;     // StarWriter AutoFormat Flags
+    SvxSwAutoFormatFlags aSwFlags;     // StarWriter AutoFormat Flags
 
     // all languages in a table
     boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable;
@@ -328,7 +328,7 @@ public:
 
     // Query/Set the current settings of AutoCorrect
     long GetFlags() const                       { return nFlags; }
-    inline SvxSwAutoFmtFlags&   GetSwFlags()    { return aSwFlags;}
+    inline SvxSwAutoFormatFlags&   GetSwFlags()    { return aSwFlags;}
     bool IsAutoCorrFlag( long nFlag ) const
                                 { return (nFlags & nFlag) != 0; }
     void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 51a0c0dcdde6..c84df967ac0d 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -89,7 +89,7 @@ public:
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt );
 
-    Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+    Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
                       const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 39290ec9f376..42098f663220 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
     // Execute pard / plain
     void RTFPardPlain( bool bPard, SfxItemSet** ppSet );
 
-    void BuildWhichTbl();
+    void BuildWhichTable();
 
     enum RTF_CharTypeDef
     {
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 7bfcb353f3e5..5cf829d94ff8 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -59,7 +59,7 @@ public:
 } // namespace editeng
 
 // Class of options for AutoFormat
-struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
 {
     vcl::Font aBulletFont;
     vcl::Font aByInputBulletFont;
@@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     bool bChgUserColl : 1;
     bool bChgEnumNum : 1;
 
-    bool bAFmtByInput : 1;
+    bool bAFormatByInput : 1;
     bool bDelEmptyNode : 1;
     bool bSetNumRule : 1;
 
@@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     bool bAutoCmpltAppendBlanc : 1;
     bool bAutoCmpltShowAsTip : 1;
 
-    bool bAFmtDelSpacesAtSttEnd : 1;
-    bool bAFmtDelSpacesBetweenLines : 1;
-    bool bAFmtByInpDelSpacesAtSttEnd : 1;
-    bool bAFmtByInpDelSpacesBetweenLines : 1;
+    bool bAFormatDelSpacesAtSttEnd : 1;
+    bool bAFormatDelSpacesBetweenLines : 1;
+    bool bAFormatByInpDelSpacesAtSttEnd : 1;
+    bool bAFormatByInpDelSpacesBetweenLines : 1;
 
     bool bAutoCmpltKeepList : 1;
 
@@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
          bDummy8 : 1
          ;
 
-    SvxSwAutoFmtFlags();
-    SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; }
-    SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& );
+    SvxSwAutoFormatFlags();
+    SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
+    SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
 };
 
 #endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index fc54adeaba6b..a3572ca48f7b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,7 @@ class Polygon;
 namespace tools { class PolyPolygon; }
 class FmFormModel;
 class SdrModel;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
 struct SvxMSDffBLIPInfo;
 struct SvxMSDffShapeInfo;
@@ -695,12 +695,12 @@ public:
     void StoreShapeOrder(sal_uLong      nId,
                          sal_uLong      nTxBx,
                          SdrObject*     pObject,
-                         SwFlyFrmFmt*   pFly = 0,
+                         SwFlyFrameFormat*   pFly = 0,
                          short          nHdFtSection = 0) const;
 
     void ExchangeInShapeOrder(SdrObject*    pOldObject,
                               sal_uLong     nTxBx,
-                              SwFlyFrmFmt*  pFly,
+                              SwFlyFrameFormat*  pFly,
                               SdrObject*    pObject) const;
 
     void RemoveFromShapeOrder( SdrObject* pObject ) const;
@@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder
 {
     sal_uLong nShapeId;  ///< shape id used in PLCF SPA and in mso_fbtSp (FSP)
     sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL)
-    SwFlyFrmFmt* pFly;   ///< format of frame that was inserted as a replacement
+    SwFlyFrameFormat* pFly;   ///< format of frame that was inserted as a replacement
                          ///< for a Sdr-Text object in Writer - needed for
                          ///< chaining!
     short nHdFtSection;  ///< used by Writer to find out if linked frames are in
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bc553c013966..0127662ebcfb 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -593,9 +593,9 @@ public:
     SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
 
     /// Whether a merge table is present or not
-    bool HasMergeFmtTbl() const;
+    bool HasMergeFormatTable() const;
     /// Return the new format index for an old format index, if a merge table exists
-    sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
+    sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const;
 
     /** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32
         entries merge table to ::std::map with old index key and new index key.
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b8705dc16ffc..eabdf18c6807 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -169,7 +169,7 @@ public:
     // build a Which-Map 'rWhichMap' from an array of WhichIds
     // 'pWhichIds'. It has the length 'nWhichIds'.
     // The WhichMap is not deleted.
-    static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+    static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
                                sal_uInt16 *pWhichIds,
                                sal_uInt16 nWhichIds );
 };
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 64ed0d94e832..6b00c35b14fd 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,7 +28,7 @@
 #include <svx/svxdllapi.h>
 
 class PopupMenu;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 
 class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
 {
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index e8a9453f2da8..052ed8ffc6e7 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -24,11 +24,11 @@
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
-struct SvxClipboardFmtItem_Impl;
+struct SvxClipboardFormatItem_Impl;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
 {
-    SvxClipboardFmtItem_Impl* pImpl;
+    SvxClipboardFormatItem_Impl* pImpl;
 protected:
 
     virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -36,9 +36,9 @@ protected:
 
 public:
     TYPEINFO_OVERRIDE();
-    SvxClipboardFmtItem( sal_uInt16 nId = 0 );
-    SvxClipboardFmtItem( const SvxClipboardFmtItem& );
-    virtual ~SvxClipboardFmtItem();
+    SvxClipboardFormatItem( sal_uInt16 nId = 0 );
+    SvxClipboardFormatItem( const SvxClipboardFormatItem& );
+    virtual ~SvxClipboardFormatItem();
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index a448aa120844..06c4af78bfbb 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -87,7 +87,7 @@ public:
     void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
 
     void SetMacroTable( const SvxMacroTableDtor& rTbl );
-    const SvxMacroTableDtor* GetMacroTbl() const    { return pMacroTable; }
+    const SvxMacroTableDtor* GetMacroTable() const    { return pMacroTable; }
 
     void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
     sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9aeee8d1c8c1..68b8072ebfa0 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -48,23 +48,23 @@ public:
     SvxOptionsGrid();
     ~SvxOptionsGrid();
 
-    void    SetFldDrawX(    sal_uInt32 nSet){nFldDrawX      = nSet;}
-    void    SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
-    void    SetFldDrawY   ( sal_uInt32 nSet){nFldDrawY      = nSet;}
-    void    SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
-    void    SetFldSnapX(    sal_uInt32 nSet){nFldSnapX      = nSet;}
-    void    SetFldSnapY   ( sal_uInt32 nSet){nFldSnapY      = nSet;}
+    void    SetFieldDrawX(    sal_uInt32 nSet){nFldDrawX      = nSet;}
+    void    SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
+    void    SetFieldDrawY   ( sal_uInt32 nSet){nFldDrawY      = nSet;}
+    void    SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
+    void    SetFieldSnapX(    sal_uInt32 nSet){nFldSnapX      = nSet;}
+    void    SetFieldSnapY   ( sal_uInt32 nSet){nFldSnapY      = nSet;}
     void    SetUseGridSnap( bool bSet ) {bUseGridsnap   = bSet;}
     void    SetSynchronize( bool bSet ) {bSynchronize   = bSet;}
     void    SetGridVisible( bool bSet ) {bGridVisible   = bSet;}
     void    SetEqualGrid( bool bSet )   {bEqualGrid     = bSet;}
 
-    sal_uInt32  GetFldDrawX(    ) const {  return nFldDrawX;    }
-    sal_uInt32  GetFldDivisionX() const {  return nFldDivisionX;}
-    sal_uInt32  GetFldDrawY   ( ) const {  return nFldDrawY;    }
-    sal_uInt32  GetFldDivisionY() const {  return nFldDivisionY;}
-    sal_uInt32  GetFldSnapX(    ) const {  return nFldSnapX;    }
-    sal_uInt32  GetFldSnapY   ( ) const {  return nFldSnapY;    }
+    sal_uInt32  GetFieldDrawX(    ) const {  return nFldDrawX;    }
+    sal_uInt32  GetFieldDivisionX() const {  return nFldDivisionX;}
+    sal_uInt32  GetFieldDrawY   ( ) const {  return nFldDrawY;    }
+    sal_uInt32  GetFieldDivisionY() const {  return nFldDivisionY;}
+    sal_uInt32  GetFieldSnapX(    ) const {  return nFldSnapX;    }
+    sal_uInt32  GetFieldSnapY   ( ) const {  return nFldSnapY;    }
     bool        GetUseGridSnap( ) const {  return bUseGridsnap; }
     bool        GetSynchronize( ) const {  return bSynchronize; }
     bool        GetGridVisible( ) const {  return bGridVisible; }
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 32f6223c8976..f1c529ad2064 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -178,12 +178,12 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP
 {
     SvxGridItem* pItem = new SvxGridItem( nId );
 
-    pItem->SetFldDrawX      ( aGridOpt.GetFldDrawX() );
-    pItem->SetFldDivisionX  ( aGridOpt.GetFldDivisionX() );
-    pItem->SetFldDrawY      ( aGridOpt.GetFldDrawY() );
-    pItem->SetFldDivisionY  ( aGridOpt.GetFldDivisionY() );
-    pItem->SetFldSnapX      ( aGridOpt.GetFldSnapX() );
-    pItem->SetFldSnapY      ( aGridOpt.GetFldSnapY() );
+    pItem->SetFieldDrawX      ( aGridOpt.GetFieldDrawX() );
+    pItem->SetFieldDivisionX  ( aGridOpt.GetFieldDivisionX() );
+    pItem->SetFieldDrawY      ( aGridOpt.GetFieldDrawY() );
+    pItem->SetFieldDivisionY  ( aGridOpt.GetFieldDivisionY() );
+    pItem->SetFieldSnapX      ( aGridOpt.GetFieldSnapX() );
+    pItem->SetFieldSnapY      ( aGridOpt.GetFieldSnapY() );
     pItem->SetUseGridSnap   ( aGridOpt.GetUseGridSnap() );
     pItem->SetSynchronize   ( aGridOpt.GetSynchronize() );
     pItem->SetGridVisible   ( aGridOpt.GetGridVisible() );
@@ -483,22 +483,22 @@ ScViewCfg::ScViewCfg() :
                 switch(nProp)
                 {
                     case SCGRIDOPT_RESOLU_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( nIntVal );
                         break;
                     case SCGRIDOPT_RESOLU_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( nIntVal );
                         break;
                     case SCGRIDOPT_SUBDIV_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionX( nIntVal );
                         break;
                     case SCGRIDOPT_SUBDIV_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionY( nIntVal );
                         break;
                     case SCGRIDOPT_OPTION_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapX( nIntVal );
                         break;
                     case SCGRIDOPT_OPTION_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapY( nIntVal );
                         break;
                     case SCGRIDOPT_SNAPTOGRID:
                         aGrid.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
@@ -624,22 +624,22 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl)
         switch(nProp)
         {
             case SCGRIDOPT_RESOLU_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawX();
                 break;
             case SCGRIDOPT_RESOLU_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawY();
                 break;
             case SCGRIDOPT_SUBDIV_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionX();
                 break;
             case SCGRIDOPT_SUBDIV_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionY();
                 break;
             case SCGRIDOPT_OPTION_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapX();
                 break;
             case SCGRIDOPT_OPTION_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY();
                 break;
             case SCGRIDOPT_SNAPTOGRID:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f2b7b1bbffbb..c135b531975a 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
 
             svtools::ColorConfigEntry eEntry =
                 INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
-            pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor );
+            pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor );
         }
         else
         {
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 973d63f1c907..171e4c3980ee 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -111,7 +111,7 @@
 #define aSfxUInt32Item_Impl sc_source_ui_appl_typemap_aSfxUInt32Item_Impl
 #define aSfxVoidItem_Impl sc_source_ui_appl_typemap_aSfxVoidItem_Impl
 #define aSvxCharReliefItem_Impl sc_source_ui_appl_typemap_aSvxCharReliefItem_Impl
-#define aSvxClipboardFmtItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFmtItem_Impl
+#define aSvxClipboardFormatItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFormatItem_Impl
 #define aSvxColorItem_Impl sc_source_ui_appl_typemap_aSvxColorItem_Impl
 #define aSvxContourItem_Impl sc_source_ui_appl_typemap_aSvxContourItem_Impl
 #define aSvxCrossedOutItem_Impl sc_source_ui_appl_typemap_aSvxCrossedOutItem_Impl
@@ -136,7 +136,7 @@
 #undef aSfxUInt32Item_Impl
 #undef aSfxVoidItem_Impl
 #undef aSvxCharReliefItem_Impl
-#undef aSvxClipboardFmtItem_Impl
+#undef aSvxClipboardFormatItem_Impl
 #undef aSvxColorItem_Impl
 #undef aSvxContourItem_Impl
 #undef aSvxCrossedOutItem_Impl
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index ce261fb3aa8f..ae5bb94123e1 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -524,7 +524,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
             case SID_CLIPBOARD_FORMAT_ITEMS:
                 if ( bPastePossible )
                 {
-                    SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                    SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                     TransferableDataHelper aDataHelper(
                             TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
@@ -913,8 +913,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
             SfxItemSet aAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
             nId = EE_PARA_LRSPACE;
             SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
-                rItem.GetRight(), rItem.GetTxtLeft(),
-                rItem.GetTxtFirstLineOfst(), nId );
+                rItem.GetRight(), rItem.GetTextLeft(),
+                rItem.GetTextFirstLineOfst(), nId );
             aAttr.Put( aLRSpaceItem );
             pView->SetAttributes( aAttr );
         }
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a2e6a82ebde9..1c03ba30758d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -86,8 +86,8 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
     // aNewAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) );
 
     aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
-    aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
-    aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT)  );
+    aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+    aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT)  );
     aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
     aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 3beb0784296a..6e03ef1e5d0c 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -29,7 +29,7 @@
 #include "formatsh.hxx"
 #include "address.hxx"
 
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractScLinkedAreaDlg;
@@ -52,7 +52,7 @@ private:
     CellShell_Impl* pImpl;
     bool            bPastePossible;
 
-    void        GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
+    void        GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats );
     void        ExecuteExternalSource(
                     const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions,
                     const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest );
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 728d17c5f8fd..a56c36f8293f 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -306,13 +306,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
             else if ( aPropertyName == SC_UNO_RASTERVIS )
                 aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
             else if ( aPropertyName == SC_UNO_RASTERRESX )
-                aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERRESY )
-                aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSUBX )
-                aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSUBY )
-                aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSYNC )
                 aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
             else
@@ -442,13 +442,13 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
             else if ( aPropertyName == SC_UNO_RASTERVIS )
                 ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() );
             else if ( aPropertyName == SC_UNO_RASTERRESX )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
             else if ( aPropertyName == SC_UNO_RASTERRESY )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
             else if ( aPropertyName == SC_UNO_RASTERSUBX )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
             else if ( aPropertyName == SC_UNO_RASTERSUBY )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
             else if ( aPropertyName == SC_UNO_RASTERSYNC )
                 ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() );
             else
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index b8627ba945c1..aba13687fb3f 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -365,7 +365,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
     }
 }
 
-static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper,
+static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const TransferableDataHelper& rDataHelper,
                         SotClipboardFormatId nFormatId )
 {
     if ( rDataHelper.HasFormat( nFormatId ) )
@@ -399,7 +399,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat
     return false;
 }
 
-void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
+void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats )
 {
     vcl::Window* pWin = GetViewData()->GetActiveWin();
     bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
@@ -569,7 +569,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet )
     }
     else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN )
     {
-        SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+        SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
         GetPossibleClipboardFormats( aFormats );
         rSet.Put( aFormats );
     }
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1b81de7c4eb7..6fd0e5074493 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1564,7 +1564,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     {
                         bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
 
-                        SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                        SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                         GetPossibleClipboardFormats( aFormats );
 
                         sal_uInt16 nFormatCount = aFormats.Count();
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 94b89305b738..2c258c6e7662 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -612,13 +612,13 @@ void ScDrawView::UpdateUserViewOptions()
         SetSnapEnabled( rGrid.GetUseGridSnap() );
         SetGridSnap( rGrid.GetUseGridSnap() );
 
-        Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 );
-        Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 );
+        Fraction aFractX( rGrid.GetFieldDrawX(), rGrid.GetFieldDivisionX() + 1 );
+        Fraction aFractY( rGrid.GetFieldDrawY(), rGrid.GetFieldDivisionY() + 1 );
         SetSnapGridWidth( aFractX, aFractY );
 
-        SetGridCoarse( Size( rGrid.GetFldDrawX(), rGrid.GetFldDrawY() ) );
-        SetGridFine( Size( rGrid.GetFldDrawX() / (rGrid.GetFldDivisionX() + 1),
-                           rGrid.GetFldDrawY() / (rGrid.GetFldDivisionY() + 1) ) );
+        SetGridCoarse( Size( rGrid.GetFieldDrawX(), rGrid.GetFieldDrawY() ) );
+        SetGridFine( Size( rGrid.GetFieldDrawX() / (rGrid.GetFieldDivisionX() + 1),
+                           rGrid.GetFieldDrawY() / (rGrid.GetFieldDivisionY() + 1) ) );
     }
 }
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 763157ff21bf..ea1a91265caa 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -801,7 +801,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet )
             case SID_CLIPBOARD_FORMAT_ITEMS:
                 if( bPastePossible )
                 {
-                    SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                    SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                     TransferableDataHelper aDataHelper(
                             TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index a2872ba3ca5a..22d46dcd7f05 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2722,13 +2722,13 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
             pSettings[SC_RASTERVIS].Name = SC_UNO_RASTERVIS;
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() );
             pSettings[SC_RASTERRESX].Name = SC_UNO_RASTERRESX;
-            pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+            pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
             pSettings[SC_RASTERRESY].Name = SC_UNO_RASTERRESY;
-            pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+            pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
             pSettings[SC_RASTERSUBX].Name = SC_UNO_RASTERSUBX;
-            pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+            pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
             pSettings[SC_RASTERSUBY].Name = SC_UNO_RASTERSUBY;
-            pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+            pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
             pSettings[SC_RASTERSYNC].Name = SC_UNO_RASTERSYNC;
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() );
         }
@@ -2878,13 +2878,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
             else if ( sName == SC_UNO_RASTERVIS )
                 aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
             else if ( sName == SC_UNO_RASTERRESX )
-                aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERRESY )
-                aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSUBX )
-                aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSUBY )
-                aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSYNC )
                 aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
             pOptions->SetGridOptions(aGridOpt);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 2b26fda54c1e..b9b4558adf4f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -356,7 +356,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
-    aLRSpaceItem.SetTxtFirstLineOfst(600);      // Indentation of first line: 6mm; right: 0
+    aLRSpaceItem.SetTextFirstLineOfst(600);      // Indentation of first line: 6mm; right: 0
     pISet->Put(aLRSpaceItem);
 
     // Title
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3c8e33b0958a..5a8de34029fe 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2164,7 +2164,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P
 
             const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>( aSet.Get(EE_PARA_LRSPACE) );
             SvxLRSpaceItem aNewLRItem(rLRItem);
-            aNewLRItem.SetTxtLeft(0);
+            aNewLRItem.SetTextLeft(0);
             aSet.Put(aNewLRItem);
 
             pNewObj->SetMergedItemSet(aSet);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 944c77ebb2d3..f4eee3948da8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
         // #i16874# enable kerning by default but only for new documents
         rSubtitleSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
-        aSvxLRSpaceItem.SetTxtLeft(0);
+        aSvxLRSpaceItem.SetTextLeft(0);
         rSubtitleSet.Put(aSvxLRSpaceItem);
 
         vcl::Font aTmpFont( GetBulletFont() );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 223f4c39e41d..a3b018cddec7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -576,11 +576,11 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
         if (rSet.GetItemState(EE_PARA_LRSPACE) != SfxItemState::SET || !bOnlyMissingItems)
         {
             const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(pCurSet->Get(EE_PARA_LRSPACE));
-            double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight;
+            double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight;
             SvxLRSpaceItem aNewLRItem(rLRItem);
-            aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight);
-            double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight;
-            aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
+            aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight);
+            double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight;
+            aNewLRItem.SetTextFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
             rSet.Put(aNewLRItem);
         }
 
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index fa6dd6c3a4cb..46a986dee476 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi
     if( bNumbering )
     {
         SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) );
-        if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) )
+        if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) )
         {
             aItem.SetLeftValue( 0 );
-            aItem.SetTxtFirstLineOfst( 0 );
+            aItem.SetTextFirstLineOfst( 0 );
             rSet.Put( aItem );
             bRet = true;
         }
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f16a6af69c9e..4e8ef7296313 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -992,12 +992,12 @@ void SdOptionsGrid::SetDefaults()
 {
     const sal_uInt32 nVal = 1000;
 
-    SetFldDivisionX( nVal );
-    SetFldDivisionY( nVal );
-    SetFldDrawX( nVal );
-    SetFldDrawY( nVal );
-    SetFldSnapX( nVal );
-    SetFldSnapY( nVal );
+    SetFieldDivisionX( nVal );
+    SetFieldDivisionY( nVal );
+    SetFieldDrawX( nVal );
+    SetFieldDrawY( nVal );
+    SetFieldSnapX( nVal );
+    SetFieldSnapY( nVal );
     SetUseGridSnap( false );
     SetSynchronize( true );
     SetGridVisible( false );
@@ -1006,12 +1006,12 @@ void SdOptionsGrid::SetDefaults()
 
 bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
 {
-    return( GetFldDrawX() == rOpt.GetFldDrawX() &&
-            GetFldDivisionX() == rOpt.GetFldDivisionX() &&
-            GetFldDrawY() == rOpt.GetFldDrawY() &&
-            GetFldDivisionY() == rOpt.GetFldDivisionY() &&
-            GetFldSnapX() == rOpt.GetFldSnapX() &&
-            GetFldSnapY() == rOpt.GetFldSnapY() &&
+    return( GetFieldDrawX() == rOpt.GetFieldDrawX() &&
+            GetFieldDivisionX() == rOpt.GetFieldDivisionX() &&
+            GetFieldDrawY() == rOpt.GetFieldDrawY() &&
+            GetFieldDivisionY() == rOpt.GetFieldDivisionY() &&
+            GetFieldSnapX() == rOpt.GetFieldSnapX() &&
+            GetFieldSnapY() == rOpt.GetFieldSnapY() &&
             IsUseGridSnap() == rOpt.IsUseGridSnap() &&
             IsSynchronize() == rOpt.IsSynchronize() &&
             IsGridVisible() == rOpt.IsGridVisible() &&
@@ -1060,23 +1060,23 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
 
 bool SdOptionsGrid::ReadData( const Any* pValues )
 {
-    if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
-    if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
+    if( pValues[0].hasValue() ) SetFieldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
+    if( pValues[1].hasValue() ) SetFieldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
 
     if( pValues[2].hasValue() )
     {
         const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) );
-        SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) );
+        SetFieldDivisionX( SvxOptionsGrid::GetFieldDrawX() / ( nDivX + 1 ) );
     }
 
     if( pValues[3].hasValue() )
     {
         const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) );
-        SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) );
+        SetFieldDivisionY( SvxOptionsGrid::GetFieldDrawY() / ( nDivY + 1 ) );
     }
 
-    if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
-    if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
+    if( pValues[4].hasValue() ) SetFieldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
+    if( pValues[5].hasValue() ) SetFieldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
     if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
     if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
     if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) );
@@ -1087,12 +1087,12 @@ bool SdOptionsGrid::ReadData( const Any* pValues )
 
 bool SdOptionsGrid::WriteData( Any* pValues ) const
 {
-    pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
-    pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
-    pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 );
-    pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 );
-    pValues[ 4 ] <<= (sal_Int32) GetFldSnapX();
-    pValues[ 5 ] <<= (sal_Int32) GetFldSnapY();
+    pValues[ 0 ] <<= (sal_Int32) GetFieldDrawX();
+    pValues[ 1 ] <<= (sal_Int32) GetFieldDrawY();
+    pValues[ 2 ] <<= ( GetFieldDivisionX() ? ( (double) GetFieldDrawX() / GetFieldDivisionX() - 1.0 ) : (double) 0 );
+    pValues[ 3 ] <<= ( GetFieldDivisionY() ? ( (double) GetFieldDrawY() / GetFieldDivisionY() - 1.0 ) : (double) 0 );
+    pValues[ 4 ] <<= (sal_Int32) GetFieldSnapX();
+    pValues[ 5 ] <<= (sal_Int32) GetFieldSnapY();
     pValues[ 6 ] <<= IsUseGridSnap();
     pValues[ 7 ] <<= IsSynchronize();
     pValues[ 8 ] <<= IsGridVisible();
@@ -1115,23 +1115,23 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
 
     if( pView )
     {
-        SetFldDrawX( pView->GetGridCoarse().Width() );
-        SetFldDrawY( pView->GetGridCoarse().Height() );
-        SetFldDivisionX( pView->GetGridFine().Width() ? ( GetFldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
-        SetFldDivisionY( pView->GetGridFine().Height() ? ( GetFldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
-        SetFldSnapX( long(pView->GetSnapGridWidthX()) );
-        SetFldSnapY( long(pView->GetSnapGridWidthY()) );
+        SetFieldDrawX( pView->GetGridCoarse().Width() );
+        SetFieldDrawY( pView->GetGridCoarse().Height() );
+        SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
+        SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
+        SetFieldSnapX( long(pView->GetSnapGridWidthX()) );
+        SetFieldSnapY( long(pView->GetSnapGridWidthY()) );
         SetUseGridSnap( pView->IsGridSnap() );
         SetGridVisible( pView->IsGridVisible() );
     }
     else
     {
-        SetFldDrawX( pOpts->GetFldDrawX() );
-        SetFldDrawY( pOpts->GetFldDrawY() );
-        SetFldDivisionX( pOpts->GetFldDivisionX() ? ( pOpts->GetFldDrawX() / pOpts->GetFldDivisionX() - 1 ) : 0 );
-        SetFldDivisionY( pOpts->GetFldDivisionY() ? ( pOpts->GetFldDrawY() / pOpts->GetFldDivisionY() - 1 ) : 0 );
-        SetFldSnapX( pOpts->GetFldSnapX() );
-        SetFldSnapY( pOpts->GetFldSnapY() );
+        SetFieldDrawX( pOpts->GetFieldDrawX() );
+        SetFieldDrawY( pOpts->GetFieldDrawY() );
+        SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 );
+        SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 );
+        SetFieldSnapX( pOpts->GetFieldSnapX() );
+        SetFieldSnapY( pOpts->GetFieldSnapY() );
         SetUseGridSnap( pOpts->IsUseGridSnap() );
         SetGridVisible( pOpts->IsGridVisible() );
     }
@@ -1139,12 +1139,12 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
 
 void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
 {
-    pOpts->SetFldDrawX( GetFldDrawX() );
-    pOpts->SetFldDivisionX( GetFldDrawX() / ( GetFldDivisionX() + 1 ) );
-    pOpts->SetFldDrawY( GetFldDrawY() );
-    pOpts->SetFldDivisionY( GetFldDrawY() / ( GetFldDivisionY() + 1 ) );
-    pOpts->SetFldSnapX( GetFldSnapX() );
-    pOpts->SetFldSnapY( GetFldSnapY() );
+    pOpts->SetFieldDrawX( GetFieldDrawX() );
+    pOpts->SetFieldDivisionX( GetFieldDrawX() / ( GetFieldDivisionX() + 1 ) );
+    pOpts->SetFieldDrawY( GetFieldDrawY() );
+    pOpts->SetFieldDivisionY( GetFieldDrawY() / ( GetFieldDivisionY() + 1 ) );
+    pOpts->SetFieldSnapX( GetFieldSnapX() );
+    pOpts->SetFieldSnapY( GetFieldSnapY() );
     pOpts->SetUseGridSnap( GetUseGridSnap() );
     pOpts->SetSynchronize( GetSynchronize() );
     pOpts->SetGridVisible( GetGridVisible() );
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index a817f5ed2767..da621f689b55 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -334,11 +334,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             svtools::ColorConfig aConfig;
             svtools::ColorConfigEntry eEntry =
                 INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
-            pInfo->SetTxtColor( aConfig.GetColorValue(eEntry).nColor );
+            pInfo->SetTextColor( aConfig.GetColorValue(eEntry).nColor );
         }
         else if ( dynamic_cast< const SdrMeasureField* >(pField))
         {
-            pInfo->ClearFldColor();
+            pInfo->ClearFieldColor();
         }
         else
         {
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 7d1393ac2108..fc4031d03d8b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -78,7 +78,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
         aNewAttr.Put( aEditAttr );
 
         // left border is offset
-        const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft();
+        const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft();
         // conversion since TabulatorTabPage always uses Twips!
         SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
         aNewAttr.Put( aOff );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 73f17fb8577e..405e7af90876 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -42,7 +42,7 @@ class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractSvxNameDialog;
 class SdrLayer;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 struct ESelection;
 
 namespace sd {
@@ -431,7 +431,7 @@ private:
         content that are supported both by that content and by the
         DrawViewShell.
     */
-    ::std::unique_ptr<SvxClipboardFmtItem> mpCurrentClipboardFormats;
+    ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats;
 
     /** On some occasions it is necessary to make SwitchPage calls
         asynchronously.
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index f2bb07312507..4e13f9725fe0 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -456,23 +456,23 @@ public:
     void    SetDefaults();
     bool    operator==( const SdOptionsGrid& rOpt ) const;
 
-    sal_uInt32  GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); }
-    sal_uInt32  GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); }
-    sal_uInt32  GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); }
-    sal_uInt32  GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); }
-    sal_uInt32  GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); }
-    sal_uInt32  GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); }
+    sal_uInt32  GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); }
+    sal_uInt32  GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); }
+    sal_uInt32  GetFieldDrawY() const { Init(); return SvxOptionsGrid::GetFieldDrawY(); }
+    sal_uInt32  GetFieldDivisionY() const { Init(); return SvxOptionsGrid::GetFieldDivisionY(); }
+    sal_uInt32  GetFieldSnapX() const { Init(); return SvxOptionsGrid::GetFieldSnapX(); }
+    sal_uInt32  GetFieldSnapY() const { Init(); return SvxOptionsGrid::GetFieldSnapY(); }
     bool    IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); }
     bool    IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); }
     bool    IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); }
     bool    IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); }
 
-    void    SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } }
-    void    SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } }
-    void    SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } }
-    void    SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } }
-    void    SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } }
-    void    SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } }
+    void    SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } }
+    void    SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } }
+    void    SetFieldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawY( nSet ); } }
+    void    SetFieldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionY( nSet ); } }
+    void    SetFieldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapX( nSet ); } }
+    void    SetFieldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapY( nSet ); } }
     void    SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } }
     void    SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } }
     void    SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ac9ecbca1f6a..22ca54640576 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -782,8 +782,8 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 
                 nId = EE_PARA_LRSPACE;
                 SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
-                        rItem.GetRight(), rItem.GetTxtLeft(),
-                        rItem.GetTxtFirstLineOfst(), nId );
+                        rItem.GetRight(), rItem.GetTextLeft(),
+                        rItem.GetTextFirstLineOfst(), nId );
 
                 const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>(aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                 const SvxLRSpaceItem& rOrigLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ));
@@ -801,28 +801,28 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                     // become negative - EditEngine really does not
                     // like that.
                     const short nAbsLSpace=aFormat.GetAbsLSpace();
-                    const long  nTxtLeft=rItem.GetTxtLeft();
+                    const long  nTxtLeft=rItem.GetTextLeft();
                     const long  nLeftIndent=std::max(0L,nTxtLeft - nAbsLSpace);
-                    aLRSpaceItem.SetTxtLeft(nLeftIndent);
+                    aLRSpaceItem.SetTextLeft(nLeftIndent);
                     // control for clipped left indent - remainder
                     // reduces number format first line indent
                     aFormat.SetAbsLSpace(nTxtLeft - nLeftIndent);
 
                     // negative first line indent goes to the number
                     // format, positive to the lrSpace item
-                    if( rItem.GetTxtFirstLineOfst() < 0 )
+                    if( rItem.GetTextFirstLineOfst() < 0 )
                     {
                         aFormat.SetFirstLineOffset(
-                            rItem.GetTxtFirstLineOfst()
-                            - rOrigLRSpaceItem.GetTxtFirstLineOfst()
+                            rItem.GetTextFirstLineOfst()
+                            - rOrigLRSpaceItem.GetTextFirstLineOfst()
                             + aFormat.GetCharTextDistance());
-                        aLRSpaceItem.SetTxtFirstLineOfst(0);
+                        aLRSpaceItem.SetTextFirstLineOfst(0);
                     }
                     else
                     {
                         aFormat.SetFirstLineOffset(0);
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rItem.GetTxtFirstLineOfst()
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rItem.GetTextFirstLineOfst()
                             - aFormat.GetFirstLineOffset()
                             + aFormat.GetCharTextDistance());
                     }
@@ -916,8 +916,8 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                     const SvxLRSpaceItem& rLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ) );
                     sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
                     SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
-                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
-                            rLRSpaceItem.GetTxtFirstLineOfst(), nId );
+                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(),
+                            rLRSpaceItem.GetTextFirstLineOfst(), nId );
 
                     const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>( aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                     const SvxNumBulletItem& rNumBulletItem = static_cast<const SvxNumBulletItem&>( aEditAttr.Get( EE_PARA_NUMBULLET ) );
@@ -926,9 +926,9 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                         rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
                     {
                         const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
-                        aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft());
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset()
+                        aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft());
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset()
                             - rFormat.GetCharTextDistance());
                     }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 183b09808415..8b6d968a3bcb 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -93,13 +93,13 @@ using namespace ::com::sun::star::linguistic2;
 
 /** Create a list of clipboard formats that are supported both from the
     current clipboard content and the DrawViewShell.
-    The list is stored in a new instance of SvxClipboardFmtItem.
+    The list is stored in a new instance of SvxClipboardFormatItem.
 */
-::std::unique_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
+::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats (
     TransferableDataHelper& rDataHelper)
 {
-    ::std::unique_ptr<SvxClipboardFmtItem> pResult (
-        new SvxClipboardFmtItem(SID_CLIPBOARD_FORMAT_ITEMS));
+    ::std::unique_ptr<SvxClipboardFormatItem> pResult (
+        new SvxClipboardFormatItem(SID_CLIPBOARD_FORMAT_ITEMS));
 
     sal_uInt32 nFormatCount (rDataHelper.GetFormatCount());
     for (sal_uInt32 i=0; i<nFormatCount; i++)
@@ -193,7 +193,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
         // exit immediately.
         TransferableDataHelper aDataHelper (
             TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
-        ::std::unique_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+        ::std::unique_ptr<SvxClipboardFormatItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
         if (mpDrawView == NULL)
             return 0;
         mpCurrentClipboardFormats = std::move(pFormats);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 44338eb2763d..329fa9cff449 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,10 +298,10 @@ void FrameView::Update(SdOptions* pOptions)
 
         SetSolidDragging( pOptions->IsSolidDragging() );
 
-        SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
-        SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) );
-        Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 ));
-        Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 ));
+        SetGridCoarse( Size( pOptions->GetFieldDrawX(), pOptions->GetFieldDrawY() ) );
+        SetGridFine( Size( pOptions->GetFieldDivisionX(), pOptions->GetFieldDivisionY() ) );
+        Fraction aFractX(pOptions->GetFieldDrawX(), pOptions->GetFieldDrawX() / ( pOptions->GetFieldDivisionX() ? pOptions->GetFieldDivisionX() : 1 ));
+        Fraction aFractY(pOptions->GetFieldDrawY(), pOptions->GetFieldDrawY() / ( pOptions->GetFieldDivisionY() ? pOptions->GetFieldDivisionY() : 1 ));
         SetSnapGridWidth(aFractX, aFractY);
         SetQuickEdit(pOptions->IsQuickEdit());
 
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 1656a6f76425..13a2afa8fe89 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4176,7 +4176,7 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
     Synchron;
 
     /* status: */
-    SlotType = SvxClipboardFmtItem
+    SlotType = SvxClipboardFormatItem
 
     /* config: */
     AccelConfig = FALSE,
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index f0f1795b5293..1d7649e1d98d 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -104,7 +104,7 @@
         String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
     };
     item SfxScriptOrganizer SfxScriptOrganizerItem;
-    item String     SvxClipboardFmtItem;    //! Dummy
+    item String     SvxClipboardFormatItem;    //! Dummy
 
     struct SvxZoom
     {
diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi
index 017fc16a65f4..279f7eea421d 100644
--- a/starmath/sdi/smitems.sdi
+++ b/starmath/sdi/smitems.sdi
@@ -279,12 +279,12 @@ struct SvxFmtBreak
     BOOL        Auto        MID_AUTOBREAK;
     UINT16      Break       MID_BREAKxxx;
 }
-item SvxFmtBreak SvxFmtBreakItem;
+item SvxFmtBreak SvxFormatBreakItem;
 
 
 
-item BOOL SvxFmtKeepItem;
-item BOOL SvxFmtSplitItem;
+item BOOL SvxFormatKeepItem;
+item BOOL SvxFormatSplitItem;
 
 struct SvxFontHeight
 {
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8b8f03f3e15d..d17954ec99cf 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2969,7 +2969,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
 
 SvNumberFormatterMergeMap SvNumberFormatter::ConvertMergeTableToMap()
 {
-    if (!HasMergeFmtTbl())
+    if (!HasMergeFormatTable())
     {
         return SvNumberFormatterMergeMap();
     }
@@ -3837,7 +3837,7 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
     return nDefault;
 }
 
-sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
+sal_uInt32 SvNumberFormatter::GetMergeFormatIndex( sal_uInt32 nOldFmt ) const
 {
     if (pMergeTable)
     {
@@ -3850,7 +3850,7 @@ sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
     return nOldFmt;
 }
 
-bool SvNumberFormatter::HasMergeFmtTbl() const
+bool SvNumberFormatter::HasMergeFormatTable() const
 {
     return pMergeTable && !pMergeTable->empty();
 }
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 5b5354081bd2..50c231390e0d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -550,7 +550,7 @@ void SvParser::Continue( int )
 {
 }
 
-void SvParser::BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
                               sal_uInt16 *pWhichIds,
                               sal_uInt16 nWhichIds )
 {
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9d9f7694fed7..91f08bf8ba60 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8299,7 +8299,7 @@ SfxVoidItem OutlineUp SID_OUTLINE_UP
 ]
 
 
-SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
+SvxFormatBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
 
 [
     /* flags: */
@@ -8486,7 +8486,7 @@ SfxVoidItem ParagraphDialog SID_PARA_DLG
 ]
 
 
-SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
+SvxFormatKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 
 [
     /* flags: */
@@ -8513,7 +8513,7 @@ SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 ]
 
 
-SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT
+SvxFormatSplitItem ParaSplit SID_ATTR_PARA_SPLIT
 
 [
     /* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 6ee210581d40..b8d771160d06 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -321,9 +321,9 @@ item BOOL                   SvxBlinkItem;
 item BOOL                   SvxAutoKernItem;
 item INT32                  SvxColorItem;
 item BOOL                   SvxContourItem;
-item INT16                  SvxFmtBreakItem;  // enum
-item BOOL                   SvxFmtKeepItem;
-item BOOL                   SvxFmtSplitItem;
+item INT16                  SvxFormatBreakItem;  // enum
+item BOOL                   SvxFormatKeepItem;
+item BOOL                   SvxFormatSplitItem;
 item INT16                  SvxKerningItem;
 item INT16                  SvxLanguageItem;
 item BOOL                   SvxNoHyphenItem;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a890925a0801..34768b21677f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -322,7 +322,7 @@ Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDe
                                     ((nScript == css::i18n::ScriptType::COMPLEX) ?
                                         maCTLFont :
                                         rInFont);
-        sal_uIntPtr nWidth = rFont.GetTxtSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
+        sal_uIntPtr nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
         if (nIdx >= maTextWidth.size())
             break;
 
@@ -771,12 +771,12 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
             if (pImpl->mcStartBracket)
             {
                 OUString sBracket(pImpl->mcStartBracket);
-                nStartBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nStartBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             if (pImpl->mcEndBracket)
             {
                 OUString sBracket(pImpl->mcEndBracket);
-                nEndBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nEndBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             nTextWidth = pImpl->CalcTextSize(rRenderContext, pPrinter, aSmallFont).Width();
             long nResultWidth = nStartBracketWidth;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5f3f1b4b216b..421795807ceb 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -626,9 +626,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
 
             long nIndentValue = 0.0;
             if (nIndex == INDENT_LEFT_MARGIN)
-                nIndentValue = mxParaItem->GetTxtLeft();
+                nIndentValue = mxParaItem->GetTextLeft();
             else if (nIndex == INDENT_FIRST_LINE)
-                nIndentValue = mxParaItem->GetTxtFirstLineOfst();
+                nIndentValue = mxParaItem->GetTextFirstLineOfst();
             else if (nIndex == INDENT_RIGHT_MARGIN)
                 nIndentValue = mxParaItem->GetRight();
 
@@ -908,14 +908,14 @@ void SvxRuler::UpdatePara()
 
         if(bRTLText)
         {
-            leftMargin    = nRightFrameMargin - mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin - mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nRightFrameMargin - mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin - mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nLeftFrameMargin + mxParaItem->GetRight() + lAppNullOffset;
         }
         else
         {
-            leftMargin    = nLeftFrameMargin + mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin + mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nLeftFrameMargin + mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin + mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nRightFrameMargin - mxParaItem->GetRight() + lAppNullOffset;
         }
 
@@ -1089,7 +1089,7 @@ void SvxRuler::UpdateTabs()
         long nRightFrameMargin = GetRightFrameMargin();
 
         //#i24363# tab stops relative to indent
-        const long nParaItemTxtLeft = mxParaItem->GetTxtLeft();
+        const long nParaItemTxtLeft = mxParaItem->GetTextLeft();
 
         const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
 
@@ -2218,8 +2218,8 @@ void SvxRuler::ApplyIndents()
         nNewRight           = RoundToCurrentMapMode(nNewRight);
     }
 
-    mxParaItem->SetTxtFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
-    mxParaItem->SetTxtLeft(nNewTxtLeft);
+    mxParaItem->SetTextFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
+    mxParaItem->SetTextLeft(nNewTxtLeft);
     mxParaItem->SetRight(nNewRight);
 
     sal_uInt16 nParagraphId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
@@ -2608,7 +2608,7 @@ void SvxRuler::Click()
     if(mxTabStopItem.get() &&
        (nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS)
     {
-        bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+        bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
         if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2686,7 +2686,7 @@ void SvxRuler::CalcMinMax()
                 //top border is not moveable when table rows are displayed
                 // protection of content means the margin is not moveable
                 // - it's just a page break inside of a cell
-                if(bHorz && !mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz && !mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = mpBorders[0].nMinPos + lNullPix;
                     if(nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)
@@ -2777,7 +2777,7 @@ void SvxRuler::CalcMinMax()
             {
                 // get the bottom move range from the last border position - only available for rows!
                 // protection of content means the margin is not moveable - it's just a page break inside of a cell
-                if(bHorz || mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz || mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = nMaxRight = mpBorders[mxColumnItem->Count() - 1].nMaxPos + lNullPix;
                 }
@@ -3196,7 +3196,7 @@ bool SvxRuler::StartDrag()
        <SvxRuler::CalcMinMax()>
        <SvxRuler::EndDrag()>
     */
-    bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+    bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
 
     if(!bValid)
         return false;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index eafce45383d1..c16ba6f24490 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -24,41 +24,41 @@
 #include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
-struct SvxClipboardFmtItem_Impl
+struct SvxClipboardFormatItem_Impl
 {
     std::vector<OUString> aFmtNms;
     std::vector<SotClipboardFormatId> aFmtIds;
 
-    SvxClipboardFmtItem_Impl() {}
-    SvxClipboardFmtItem_Impl( const SvxClipboardFmtItem_Impl& );
+    SvxClipboardFormatItem_Impl() {}
+    SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
 };
 
-TYPEINIT1_FACTORY( SvxClipboardFmtItem, SfxPoolItem , new  SvxClipboardFmtItem(0));
+TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new  SvxClipboardFormatItem(0));
 
-SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
-                            const SvxClipboardFmtItem_Impl& rCpy )
+SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
+                            const SvxClipboardFormatItem_Impl& rCpy )
     : aFmtNms(rCpy.aFmtNms)
     , aFmtIds(rCpy.aFmtIds)
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
-    : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
+SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId )
+    : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl )
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( const SvxClipboardFmtItem& rCpy )
+SvxClipboardFormatItem::SvxClipboardFormatItem( const SvxClipboardFormatItem& rCpy )
     : SfxPoolItem( rCpy.Which() ),
-    pImpl( new SvxClipboardFmtItem_Impl( *rCpy.pImpl ) )
+    pImpl( new SvxClipboardFormatItem_Impl( *rCpy.pImpl ) )
 {
 }
 
-SvxClipboardFmtItem::~SvxClipboardFmtItem()
+SvxClipboardFormatItem::~SvxClipboardFormatItem()
 {
     delete pImpl;
 }
 
-bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_uInt16 nCount = Count();
 
@@ -76,7 +76,7 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
     return true;
 }
 
-bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxClipboardFormatItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
     if ( rVal >>= aClipFormats )
@@ -94,9 +94,9 @@ bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_
     return false;
 }
 
-bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
+bool SvxClipboardFormatItem::operator==( const SfxPoolItem& rComp ) const
 {
-    const SvxClipboardFmtItem& rCmp = static_cast<const SvxClipboardFmtItem&>(rComp);
+    const SvxClipboardFormatItem& rCmp = static_cast<const SvxClipboardFormatItem&>(rComp);
     if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
         return false;
 
@@ -114,12 +114,12 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
     return nRet;
 }
 
-SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    return new SvxClipboardFmtItem( *this );
+    return new SvxClipboardFormatItem( *this );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
         nPos = pImpl->aFmtNms.size();
@@ -128,7 +128,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
                             sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
@@ -138,17 +138,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUSt
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-sal_uInt16 SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFormatItem::Count() const
 {
     return pImpl->aFmtIds.size();
 }
 
-SotClipboardFormatId SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
+SotClipboardFormatId SvxClipboardFormatItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtIds[ nPos ];
 }
 
-const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
+const OUString SvxClipboardFormatItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtNms[nPos];
 }
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 08d68167b8fb..b1b5b39b4195 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -198,8 +198,8 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
     sIntName = rHyperlinkItem.sIntName;
     nMacroEvents = rHyperlinkItem.nMacroEvents;
 
-    if( rHyperlinkItem.GetMacroTbl() )
-        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTbl() );
+    if( rHyperlinkItem.GetMacroTable() )
+        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() );
     else
         pMacroTable=NULL;
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 5b7255bff356..a0eb16f61b3c 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -63,7 +63,7 @@ SvxClipBoardControl::~SvxClipBoardControl()
 
 VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 {
-    const SvxClipboardFmtItem* pFmtItem = PTR_CAST( SvxClipboardFmtItem, pClipboardFmtItem );
+    const SvxClipboardFormatItem* pFmtItem = PTR_CAST( SvxClipboardFormatItem, pClipboardFmtItem );
     if ( pFmtItem )
     {
         if (pPopup)
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 838e1c749114..7c7e2c491f7a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -421,7 +421,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     vcl::Font rActBulletFont = pActualBullets[nIndex]->aFont;
 
     sal_uInt16 nMask = 1;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(mLevel & nMask)
@@ -430,7 +430,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
             aFmt.SetBulletFont(&rActBulletFont);
             aFmt.SetBulletChar(cChar );
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
             OUString aEmptyStr;
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
@@ -686,7 +686,7 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
             aFmt.SetNumberingType(nSetNumberingType);
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
-            aFmt.SetCharFmtName( sNumCharFmtName );
+            aFmt.SetCharFormatName( sNumCharFmtName );
 
                     Graphic aGraphic;
                     if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, pEntry->nGallaryIndex, &aGraphic))
@@ -1149,7 +1149,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
         //vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         vcl::Font rActBulletFont = static_cast<BulletsSettings_Impl*>(pCurrentBullets->pBullets)->aFont;
         sal_uInt16 nMask = 1;
-        OUString sBulletCharFmtName = GetBulCharFmtName();
+        OUString sBulletCharFormatName = GetBulCharFmtName();
         for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
         {
             if(mLevel & nMask)
@@ -1159,7 +1159,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
                 aFmt.SetBulletFont(&rActBulletFont);
                 aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFmtName(sBulletCharFmtName);
+                aFmt.SetCharFormatName(sBulletCharFormatName);
                 OUString aEmptyStr;
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
@@ -1187,7 +1187,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType(nSetNumberingType);
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
-                aFmt.SetCharFmtName( sNumCharFmtName );
+                aFmt.SetCharFormatName( sNumCharFmtName );
                 if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj )
                 {
                     Size aSize = pEntry->aSize;
@@ -1428,7 +1428,7 @@ bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn
             aFmt.SetPrefix(_pSet->pNumSetting->sPrefix);
             aFmt.SetSuffix(_pSet->pNumSetting->sSuffix);
 
-            aFmt.SetCharFmtName(sNumCharFmtName);
+            aFmt.SetCharFormatName(sNumCharFmtName);
             if (isResetSize) aFmt.SetBulletRelSize(100);
             aNum.SetLevel(i, aFmt);
         }
@@ -1711,7 +1711,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
 
     NumSettings_ImplPtr pLevelSettings = 0;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(pNumSettingsArr->size() > i)
@@ -1774,7 +1774,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             }
 
             aFmt.SetBulletChar(cChar);
-            aFmt.SetCharFmtName( sBulletCharFmtName );
+            aFmt.SetCharFormatName( sBulletCharFormatName );
             if (isResetSize) aFmt.SetBulletRelSize(45);
         }else if ((aFmt.GetNumberingType()&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
             if (pLevelSettings->pBrushItem) {
@@ -1793,7 +1793,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
         } else
         {
             aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? aNum.GetLevelCount() : 0));
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
                 if (isResetSize) aFmt.SetBulletRelSize(100);
         }
         if(pNumSettingsArr->size() > i) {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2604ea250a40..35a0305eb3b3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -250,9 +250,9 @@ void ParaPropertyPanel::initial()
 IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
 {
     SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-    aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
     GetBindings()->GetDispatcher()->Execute(
         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -283,9 +283,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     maTxtLeft += INDENT_STEP;
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -317,9 +317,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
 
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -329,9 +329,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
         else if (aCommand == UNO_HANGINGINDENT)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute(
                 SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -353,9 +353,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl,
         else if (aCommand == UNO_HANGINGINDENT2)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
         }
@@ -466,7 +466,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
     if( pState && eState >= SfxItemState::DEFAULT )
     {
         const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
-        maTxtLeft = pSpace->GetTxtLeft();
+        maTxtLeft = pSpace->GetTextLeft();
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
@@ -474,7 +474,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
-        long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
+        long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst();
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 9ef4ffdc64d2..ab1271ac8fe0 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -168,7 +168,7 @@ bool CommonStylePreviewRenderer::recalculate()
 
 Size CommonStylePreviewRenderer::getRenderSize()
 {
-    maPixelSize = maFont.GetTxtSize(&mrOutputDev, maStyleName);
+    maPixelSize = maFont.GetTextSize(&mrOutputDev, maStyleName);
     if (maPixelSize.Height() > mnMaxHeight)
         maPixelSize.Height() = mnMaxHeight;
     return maPixelSize;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b2712615e1f9..8e5b31dd72d6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -493,14 +493,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
         bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr);
         if (bOk) {
             if (pTxtCol!=NULL) {
-                pFI->SetTxtColor(*pTxtCol);
+                pFI->SetTextColor(*pTxtCol);
                 delete pTxtCol;
             }
             if (pFldCol!=NULL) {
-                pFI->SetFldColor(*pFldCol);
+                pFI->SetFieldColor(*pFldCol);
                 delete pFldCol;
             } else {
-                pFI->SetFldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+                pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
             }
         }
     }
diff --git a/sw/README b/sw/README
index 0fcfd163050f..027e4eb6ffed 100644
--- a/sw/README
+++ b/sw/README
@@ -81,19 +81,19 @@ actions; these are created by the StartUndo/EndUndo wrapper methods.
 === Text Attributes ===
 
 The sub-structure of paragraphs is stored in the SwpHintsArray member
-SwTxtNode::m_pSwpHints.  There is a base class SwTxtAttr with numerous
-subclasses; the SwTxtAttr has a start and end index and a SfxPoolItem
+SwTextNode::m_pSwpHints.  There is a base class SwTextAttr with numerous
+subclasses; the SwTextAttr has a start and end index and a SfxPoolItem
 to store the actual formatting attribute.
 
-There are several sub-categories of SwTxtAttr:
+There are several sub-categories of SwTextAttr:
 
-- formatting attributes: Character Styles (SwTxtCharFmt, RES_TXTATR_CHARFMT)
+- formatting attributes: Character Styles (SwTextCharFormat, RES_TXTATR_CHARFMT)
   and Automatic Styles (no special class, RES_TXTATR_AUTOFMT):
   these are handled by SwpHintsArray::BuildPortions and MergePortions,
   which create non-overlapping portions of formatting attributes.
 
-- nesting attributes: Hyperlinks (SwTxtINetFmt, RES_TXTATR_INETFMT),
-  Ruby (SwTxtRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTxtMeta,
+- nesting attributes: Hyperlinks (SwTextINetFormat, RES_TXTATR_INETFMT),
+  Ruby (SwTextRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTextMeta,
   RES_TXTATR_META/RES_TXTATR_METAFIELD):
   these maintain a properly nested tree structure.
   The Meta/Metafield are "special" because they have both start/end
@@ -116,26 +116,26 @@ There are multiple model classes involved for fields:
   For most types of fields there is one shared instance of this per type,
   which is created in DocumentFieldsManager::_InitFieldTypes()
   but for some there are more than one, and they are dynamically created, see
-  DocumentFieldsManager::InsertFldType().  An example for the latter are
-  variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFldType per
+  DocumentFieldsManager::InsertFieldType().  An example for the latter are
+  variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFieldType per
   variable.
 - SwXFieldMaster is the UNO wrapper of a field type.
   It is a SwClient registered at the SwFieldType.
   Its life-cycle is determined by UNO clients outside of sw; it will get
   disposed when the SwFieldType dies.
-- SwFmtFld is the SfxPoolItem of a field.
-  The SwFmtFld is a SwClient registered at its SwFldType.
-  The SwFmtFld owns the SwField of the field.
+- SwFormatField is the SfxPoolItem of a field.
+  The SwFormatField is a SwClient registered at its SwFieldType.
+  The SwFormatField owns the SwField of the field.
 - SwField contains the core logic of a field.
-  The SwField is owned by the SwFmtFld of the field.
+  The SwField is owned by the SwFormatField of the field.
   There are many subclasses of SwField, one for each different type of field.
   Note that there are not many places that can Expand the field to its
   correct value, since for example page number fields require a View
   with an up to date layout; therefore the correct expansion is cached.
-- SwTxtFld is the text attribute of a field.
-  It owns the SwFmtFld of the field (like all text attributes).
+- SwTextField is the text attribute of a field.
+  It owns the SwFormatField of the field (like all text attributes).
 - SwXTextField is the UNO wrapper object of a field.
-  It is a SwClient registered at the SwFmtFld.
+  It is a SwClient registered at the SwFormatField.
   Its life-cycle is determined by UNO clients outside of sw; it will get
-  disposed when the SwFmtFld dies.
+  disposed when the SwFormatField dies.
 
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index e18e91e99d94..f72468059736 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -35,7 +35,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
                          SwPostItMgr& aMgr,
                          SwPostItBits aBits,
                          SwSidebarItem& rSidebarItem,
-                         SwFmtFld* aField );
+                         SwFormatField* aField );
         virtual ~SwAnnotationWin();
         virtual void dispose() SAL_OVERRIDE;
 
@@ -62,8 +62,8 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
         virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE;
         sal_uInt32 CountFollowing();
 
-        SwFmtFld*       mpFmtFld;
-        SwPostItField*  mpFld;
+        SwFormatField*       mpFormatField;
+        SwPostItField*  mpField;
         PopupMenu*      mpButtonPopup;
 
 };
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index d2363177dadb..74da45127883 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -38,10 +38,10 @@ class SwFrm;
 class SwLinePortion;
 class SwPageFrm;
 class SwPrintData;
-class SwTxtPainter;
+class SwTextPainter;
 class SwEditShell;
 class StringRangeEnumerator;
-class SwTxtNode;
+class SwTextNode;
 class SwNumRule;
 class SwTable;
 class SwNumberTreeNode;
@@ -59,19 +59,19 @@ class SvxLanguageItem;
  *                                          Part
  *                                          Art
  * SwSection                                Sect
- * SwFtnContFrm and SwFlyFrm                Div
- * SwFmt "Quotations"                       BlockQuote
- * SwFmt "Caption"                          Caption
+ * SwFootnoteContFrm and SwFlyFrm                Div
+ * SwFormat "Quotations"                       BlockQuote
+ * SwFormat "Caption"                          Caption
  * SwSection (TOC)                          TOC
- * SwTxtNode in TOC                         TOCI
+ * SwTextNode in TOC                         TOCI
  * SwSection (Index)                        Index
  *
  * Block-Level Structure Elements:
  *
- * SwTxtNode                                P
- * SwFmt "Heading"                          H
- * SwTxtNode with Outline                   H1 - H6
- * SwTxtNode with NumRule                   L, LI, LBody
+ * SwTextNode                                P
+ * SwFormat "Heading"                          H
+ * SwTextNode with Outline                   H1 - H6
+ * SwTextNode with NumRule                   L, LI, LBody
  * SwTable                                  Table
  * SwRowFrm                                 TR
  * SwCellFrm in Headline row or
@@ -80,18 +80,18 @@ class SvxLanguageItem;
  *
  * Inline-Level Structure Elements:
  *
- * SwTxtPortion                             Span
- * SwFmt "Quotation"                        Quote
- * SwFtnFrm                                 Note
+ * SwTextPortion                             Span
+ * SwFormat "Quotation"                        Quote
+ * SwFootnoteFrm                                 Note
  *                                          Form
  *                                          Reference
- * SwFldPortion (AuthorityField)            BibEntry
- * SwFmt "Source Text"                      Code
- * SwFtnPortion, SwFldPortion (RefField)    Link
+ * SwFieldPortion (AuthorityField)            BibEntry
+ * SwFormat "Source Text"                      Code
+ * SwFootnotePortion, SwFieldPortion (RefField)    Link
  *
  * Illustration elements:
  *
- * SwFlyFrm with SwNoTxtFrm                 Figure
+ * SwFlyFrm with SwNoTextFrm                 Figure
  * SwFlyFrm with Math OLE Object            Formula
  *
  */
@@ -111,9 +111,9 @@ struct Frm_Info
 struct Por_Info
 {
     const SwLinePortion& mrPor;
-    const SwTxtPainter& mrTxtPainter;
-    Por_Info( const SwLinePortion& rPor, const SwTxtPainter& rTxtPainer )
-            : mrPor( rPor ), mrTxtPainter( rTxtPainer ) {};
+    const SwTextPainter& mrTextPainter;
+    Por_Info( const SwLinePortion& rPor, const SwTextPainter& rTextPainer )
+            : mrPor( rPor ), mrTextPainter( rTextPainer ) {};
 };
 
 struct lt_TableColumn
@@ -224,7 +224,7 @@ class SwEnhancedPDFExportHelper
     std::vector< sal_Int32 > CalcOutputPageNums( const SwRect& rRect ) const;
 
     void MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rPDFExtOutDevData,
-                                const SwTxtNode& rTNd, const SwRect& rLinkRect,
+                                const SwTextNode& rTNd, const SwRect& rLinkRect,
                                 sal_Int32 nDestId, const OUString& rURL, bool bIntern ) const;
 
     public:
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index ac9d4b0f13a5..17eb50cb0142 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
 #define INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
 
-class SwFlyFrmFmt;
-class SwFmtAnchor;
+class SwFlyFrameFormat;
+class SwFormatAnchor;
 class SwFlyFrm;
 
 // helper class to track change of anchor node of at-paragraph respectively
@@ -37,21 +37,21 @@ public:
 
         @author OD
 
-        @param _rFlyFrmFmt
+        @param _rFlyFrameFormat
         reference to the fly frame format instance, which is handled.
 
-        @param _rNewAnchorFmt
+        @param _rNewAnchorFormat
         new anchor attribute, which will be applied at the given fly frame format
 
         @param _pKeepThisFlyFrm
         optional parameter - pointer to a fly frame of the given fly frame format,
         which isn't deleted, if re-creation of fly frames is necessary.
     */
-    SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
-                           const SwFmtAnchor& _rNewAnchorFmt,
+    SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
+                           const SwFormatAnchor& _rNewAnchorFormat,
                            SwFlyFrm* _pKeepThisFlyFrm = 0L );
 
-    /** calls <SwFlyFrmFmt::MakeFrms>, if re-creation of fly frames is necessary.
+    /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary.
 
         @author OD
     */
@@ -59,7 +59,7 @@ public:
 
 private:
     // fly frame format, which is tracked for a anchor node change.
-    SwFlyFrmFmt& mrFlyFrmFmt;
+    SwFlyFrameFormat& mrFlyFrameFormat;
     // internal flag, which indicates that the certain anchor node change occurs
     // and that re-creation of fly frames is necessary.
     bool mbAnchorNodeChanged;
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 9a866e600d4a..91ca8ce45d0d 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
 class SfxPoolItem;
 class GraphicObject;
 class SdrObject;
-class SwFrmFmt;
-class SwDrawFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwDrawFrameFormat;
+class SwFlyFrameFormat;
 class SwNodeIndex;
-class SwFmtFld;
+class SwFormatField;
 
 namespace utl { class TransliterationWrapper; }
 namespace svt { class EmbeddedObjectRef; }
@@ -111,7 +111,7 @@ public:
     */
     virtual void DeleteSection(SwNode* pNode) = 0;
 
-    /** Delete a range SwFlyFrmFmt.
+    /** Delete a range SwFlyFrameFormat.
     */
     virtual bool DeleteRange(SwPaM&) = 0;
 
@@ -151,11 +151,11 @@ public:
 
     /** Insert graphic or formula. The XXXX are copied.
      */
-    virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
-                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
+                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
     /** Transpose graphic (with undo)
      */
@@ -164,23 +164,23 @@ public:
     /** Insert a DrawObject. The object must be already registered
         in DrawModel.
     */
-    virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
+    virtual SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
 
     /** Insert OLE-objects.
     */
-    virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
-                           const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
+                           const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    /** Split a node at rPos (implemented only for TxtNode).
+    /** Split a node at rPos (implemented only for TextNode).
     */
     virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) = 0;
 
-    virtual bool AppendTxtNode(SwPosition& rPos) = 0;
+    virtual bool AppendTextNode(SwPosition& rPos) = 0;
 
-    /** Replace selected range in a TxtNode with string.
+    /** Replace selected range in a TextNode with string.
         Intended for search & replace.
         bRegExpRplc - replace tabs (\\t) and insert the found string
         ( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&"
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 36c012924185..3d8f3e5db324 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -23,17 +23,17 @@
 #include <sal/types.h>
 #include <tools/solar.h>
 
-class SwFldTypes;
+class SwFieldTypes;
 class SwFieldType;
 class SfxPoolItem;
 struct SwPosition;
-class SwDocUpdtFld;
+class SwDocUpdateField;
 class SwCalc;
-class SwTxtFld;
+class SwTextField;
 class SwField;
 class SwMsgPoolItem;
 class DateTime;
-class _SetGetExpFld;
+class _SetGetExpField;
 struct SwHash;
 class SwNode;
 
@@ -46,19 +46,19 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
  class IDocumentFieldsAccess
  {
  public:
-    virtual const SwFldTypes *GetFldTypes() const = 0;
+    virtual const SwFieldTypes *GetFieldTypes() const = 0;
 
-    virtual SwFieldType *InsertFldType(const SwFieldType &) = 0;
+    virtual SwFieldType *InsertFieldType(const SwFieldType &) = 0;
 
-    virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const = 0;
+    virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const = 0;
 
-    virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
+    virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
 
-    virtual void RemoveFldType(size_t nFld) = 0;
+    virtual void RemoveFieldType(size_t nField) = 0;
 
-    virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
+    virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
 
-    virtual void InsDeletedFldType(SwFieldType &) = 0;
+    virtual void InsDeletedFieldType(SwFieldType &) = 0;
 
     /**
        Puts a value into a field at a certain position.
@@ -78,33 +78,33 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
 
     /** Updates a field.
 
-        @param rDstFmtFld field to update
-        @param rSrcFld field containing the new values
-        @param pMsgHnt
-        @param bUpdateTblFlds TRUE: update table fields, too.
+        @param rDstFormatField field to update
+        @param rSrcField field containing the new values
+        @param pMsgHint
+        @param bUpdateTableFields TRUE: update table fields, too.
 
         @retval true             update was successful
         @retval false            else
     */
-    virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
+    virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) = 0;
 
-    virtual void UpdateRefFlds(SfxPoolItem* pHt) = 0;
+    virtual void UpdateRefFields(SfxPoolItem* pHt) = 0;
 
-    virtual void UpdateTblFlds(SfxPoolItem* pHt) = 0;
+    virtual void UpdateTableFields(SfxPoolItem* pHt) = 0;
 
-    virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) = 0;
+    virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) = 0;
 
-    virtual void UpdateUsrFlds() = 0;
+    virtual void UpdateUsrFields() = 0;
 
-    virtual void UpdatePageFlds(SfxPoolItem*) = 0;
+    virtual void UpdatePageFields(SfxPoolItem*) = 0;
 
-    virtual void LockExpFlds() = 0;
+    virtual void LockExpFields() = 0;
 
-    virtual void UnlockExpFlds() = 0;
+    virtual void UnlockExpFields() = 0;
 
-    virtual bool IsExpFldsLocked() const = 0;
+    virtual bool IsExpFieldsLocked() const = 0;
 
-    virtual SwDocUpdtFld& GetUpdtFlds() const = 0;
+    virtual SwDocUpdateField& GetUpdateFields() const = 0;
 
     /*  @@@MAINTAINABILITY-HORROR@@@
         SwNode (see parameter pChk) is (?) part of the private
@@ -118,17 +118,17 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
     // (Node [ + ::com::sun::star::ucb::Content]).
     // A generated list of all fields may be passed along too
     // (if the addreess != 0 and the pointer == 0 a new list will be returned).
-    virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
+    virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
 
-    virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0;
+    virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) = 0;
 
-    virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) = 0;
+    virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) = 0;
 
-    virtual bool IsNewFldLst() const = 0;
+    virtual bool IsNewFieldLst() const = 0;
 
-    virtual void SetNewFldLst( bool bFlag) = 0;
+    virtual void SetNewFieldLst( bool bFlag) = 0;
 
-    virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) = 0;
+    virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) = 0;
 
 protected:
     virtual ~IDocumentFieldsAccess() {};
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 37b51ef7c065..ab02daa108df 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -24,10 +24,10 @@
 
 class SwViewShell;
 class SwRootFrm;
-class SwFrmFmt;
+class SwFrameFormat;
 class SfxItemSet;
 class SwLayouter;
-class SwFmtAnchor;
+class SwFormatAnchor;
 
 /** Provides access to the layout of a document.
 */
@@ -49,7 +49,7 @@ public:
 
     /**
     */
-    virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
+    virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
 
     /**
     */
@@ -59,12 +59,12 @@ public:
 
     /**
     */
-    virtual void DelLayoutFmt( SwFrmFmt *pFmt ) = 0;
+    virtual void DelLayoutFormat( SwFrameFormat *pFormat ) = 0;
 
     /**
     */
-    virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor,
-                                     bool bSetTxtFlyAtt, bool bMakeFrms ) = 0;
+    virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor,
+                                     bool bSetTextFlyAtt, bool bMakeFrms ) = 0;
 
 protected:
 
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 3e73066d7ec5..7de0f2ffd5ae 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -26,7 +26,7 @@
 
 class SwPaM;
 struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sw { namespace mark {
     class SaveBookmark; // FIXME: Ugly: SaveBookmark is a core-internal class, and should not be used in the interface
@@ -93,7 +93,7 @@ class IDocumentMarkAccess
         /** Returns a mark in the document for a paragraph.
             If there is none, a mark will be created.
 
-           @param rTxtNode
+           @param rTextNode
            [in] the paragraph being marked (a selection over the paragraph is marked)
 
            @param eMark
@@ -102,7 +102,7 @@ class IDocumentMarkAccess
            @returns
            a pointer to the new mark (name might have changed).
         */
-        virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode,
+        virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode,
             MarkType eMark) =0;
 
         /** Moves an existing mark to a new selection and performs needed updates.
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index f5ec75fca5e6..5803f7077482 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -23,14 +23,14 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vector>
-class SwTxtNode;
+class SwTextNode;
 
 /** Provides outline nodes of a document.
 */
 class IDocumentOutlineNodes
 {
 public:
-    typedef ::std::vector< const SwTxtNode* > tSortedOutlineNodeList;
+    typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList;
 
     virtual sal_Int32 getOutlineNodesCount() const = 0;
 
@@ -38,8 +38,8 @@ public:
     virtual OUString getOutlineText( const sal_Int32 nIdx,
                                    const bool bWithNumber = true,
                                    const bool bWithSpacesForLevel = false,
-                                   const bool bWithFtn = true ) const = 0;
-    virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
+                                   const bool bWithFootnote = true ) const = 0;
+    virtual SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
 
     virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const = 0;
 
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 4ff9600139bd..eb37a3ac63d6 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -30,8 +30,8 @@
 class SwRangeRedline;
 class SwTableRowRedline;
 class SwTableCellRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
 class SwPaM;
 struct SwPosition;
 class SwStartNode;
@@ -126,11 +126,11 @@ public:
 
     virtual bool IsIgnoreRedline() const = 0;
 
-    virtual const SwRedlineTbl& GetRedlineTbl() const = 0;
-    virtual SwRedlineTbl& GetRedlineTbl() = 0;
-    virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const = 0;
-    virtual SwExtraRedlineTbl& GetExtraRedlineTbl() = 0;
-    virtual bool HasExtraRedlineTbl() const = 0;
+    virtual const SwRedlineTable& GetRedlineTable() const = 0;
+    virtual SwRedlineTable& GetRedlineTable() = 0;
+    virtual const SwExtraRedlineTable& GetExtraRedlineTable() const = 0;
+    virtual SwExtraRedlineTable& GetExtraRedlineTable() = 0;
+    virtual bool HasExtraRedlineTable() const = 0;
 
     virtual bool IsInRedlines(const SwNode& rNode) const = 0;
 
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index ab907b2d30fa..73a5d547a993 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -186,14 +186,14 @@ enum class DocumentSettingId
        @returns
        the current field update mode.
     */
-    virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
+    virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
 
     /** Set the current field update mode.
 
        @param nMode
        [in] the new field update mode.
     */
-    virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags nMode )  = 0;
+    virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags nMode )  = 0;
 
     /** Get the character compression type for Asian characters.
 
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index bc4034cc46e0..a6fc748d16b9 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -44,7 +44,7 @@ public:
     */
     virtual bool IsLoaded() const = 0;
 
-    virtual bool IsUpdateExpFld() const  = 0;
+    virtual bool IsUpdateExpField() const  = 0;
 
     virtual bool IsNewDoc() const = 0;
 
@@ -54,7 +54,7 @@ public:
 
     virtual void SetNewDoc(bool b) = 0;
 
-    virtual void SetUpdateExpFldStat(bool b) = 0;
+    virtual void SetUpdateExpFieldStat(bool b) = 0;
 
     virtual void SetLoaded(bool b = true) = 0;
 
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 81ec03587e27..c56104b32164 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-class SwTxtFmtColl;
-class SwCharFmt;
-class SwFmt;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwCharFormat;
+class SwFormat;
+class SwFrameFormat;
 class SwNumRule;
 class SwPageDesc;
 
@@ -40,17 +40,17 @@ public:
         If string pointer is defined request only description
         of attributes, do not create style sheet!
     */
-    virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
+    virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
 
     /** Return required automatic format base class.
     */
-    virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) = 0;
 
     /** Return required automatic format.
      */
-    virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) = 0;
 
-    virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) = 0;
 
     /** Return required automatic page style.
      */
@@ -60,8 +60,8 @@ public:
 
     /** Check whether this "auto-collection" is used in document.
      */
-    virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const = 0;
-    virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0;
+    virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const = 0;
+    virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const = 0;
     virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0;
 
 protected:
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 62c053f90fcb..58dc2ebb1ef5 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
 
 struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
 class SwGrammarMarkUp;
 class SwDoc;
 
-/** Organizer of the contact between SwTxtNodes and grammar checker
+/** Organizer of the contact between SwTextNodes and grammar checker
 */
 class IGrammarContact
 {
@@ -42,9 +42,9 @@ public:
     /** getGrammarCheck checks if the given text node is blocked by the current cursor
         if not, the normal markup list is returned
         if blocked, it will return a markup list "proxy"
-    @returns a markup list (grammar) for the given SwTxtNode
+    @returns a markup list (grammar) for the given SwTextNode
     */
-    virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) = 0;
+    virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) = 0;
 
     /** finishGrammarCheck() has to be called if a grammar checking has been completed
         for a text node. If this text node has not been hided by the current proxy list
@@ -52,7 +52,7 @@ public:
         repaint will be triggered by a timer
     @returns void
     */
-    virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) = 0;
+    virtual void finishGrammarCheck( SwTextNode& rTextNode ) = 0;
 
 public:
     virtual ~IGrammarContact() {}
@@ -68,12 +68,12 @@ IGrammarContact* createGrammarContact();
 /** getGrammarContact() delivers the grammar contact of the document (for a given textnode)
 @returns grammar contact
 */
-IGrammarContact* getGrammarContact( const SwTxtNode& );
+IGrammarContact* getGrammarContact( const SwTextNode& );
 
 /** finishGrammarCheck() calls the same function of the grammar contact of the document (for a given textnode)
 @returns void
 */
-void finishGrammarCheck( SwTxtNode& );
+void finishGrammarCheck( SwTextNode& );
 
 #endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
 
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 859e07434a00..8d1ddd0d65f8 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -40,7 +40,7 @@ class SwWrtShell;
 class SwDoc;
 class SwView;
 class SwPostItField;
-class SwFmtFld;
+class SwFormatField;
 class SwField;
 class SfxBroadcaster;
 class SfxHint;
@@ -89,10 +89,10 @@ struct SwPostItPageItem
 
 struct FieldShadowState
 {
-    const SwPostItField* mpShadowFld;
+    const SwPostItField* mpShadowField;
     bool bCursor;
     bool bMouse;
-    FieldShadowState(): mpShadowFld(0),bCursor(false),bMouse(false)
+    FieldShadowState(): mpShadowField(0),bCursor(false),bMouse(false)
     {
     }
 };
@@ -142,7 +142,7 @@ class SwPostItMgr: public SfxListener
         SwView*                         mpView;
         SwWrtShell*                     mpWrtShell;
         VclPtr<SwEditWin>               mpEditWin;
-        std::list< SwSidebarItem*>      mvPostItFlds;
+        std::list< SwSidebarItem*>      mvPostItFields;
         std::vector<SwPostItPageItem*>  mPages;
         ImplSVEvent *                   mnEventId;
         bool                            mbWaitingForCalcRects;
@@ -194,8 +194,8 @@ class SwPostItMgr: public SfxListener
             virtual ~SwPostItMgr();
 
             typedef std::list< SwSidebarItem* >::const_iterator const_iterator;
-            const_iterator begin()  const { return mvPostItFlds.begin(); }
-            const_iterator end()    const { return mvPostItFlds.end();  }
+            const_iterator begin()  const { return mvPostItFields.begin(); }
+            const_iterator end()    const { return mvPostItFields.end();  }
 
             void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
@@ -236,7 +236,7 @@ class SwPostItMgr: public SfxListener
             bool IsHit(const Point &aPointPixel);
             Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const;
 
-            sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const;
+            sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const;
 
             sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection,
                                                              sw::sidebarwindows::SwSidebarWin* aPostIt);
@@ -255,7 +255,7 @@ class SwPostItMgr: public SfxListener
             sal_Int32 GetMinimumSizeWithMeta() const;
             sal_Int32 GetSidebarScrollerHeight() const;
 
-            void SetShadowState(const SwPostItField* pFld,bool bCursor = true);
+            void SetShadowState(const SwPostItField* pField,bool bCursor = true);
 
             void SetSpellChecking();
 
@@ -269,15 +269,15 @@ class SwPostItMgr: public SfxListener
             void StartSpelling();
 
             sal_uInt16 Replace(SvxSearchItem* pItem);
-            sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
+            sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
             sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 
             // get the PostIt window by index
-            sal_Int32 GetPostItCount() const {return mvPostItFlds.size();}
+            sal_Int32 GetPostItCount() const {return mvPostItFields.size();}
             void AssureStdModeAtShell();
 
             void ConnectSidebarWinToFrm( const SwFrm& rFrm,
-                                         const SwFmtFld& rFmtFld,
+                                         const SwFormatField& rFormatField,
                                          sw::sidebarwindows::SwSidebarWin& rSidebarWin );
             void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
                                               sw::sidebarwindows::SwSidebarWin& rSidebarWin );
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 92ec2d49c09a..9514ac0eca90 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -49,7 +49,7 @@ namespace sw { namespace overlay {
 
 namespace sw { namespace sidebarwindows {
 
-class SidebarTxtControl;
+class SidebarTextControl;
 class AnchorOverlayObject;
 class ShadowOverlayObject;
 
@@ -211,7 +211,7 @@ class SwSidebarWin : public vcl::Window
         OutlinerView*   mpOutlinerView;
         Outliner*       mpOutliner;
 
-        VclPtr<sw::sidebarwindows::SidebarTxtControl> mpSidebarTxtControl;
+        VclPtr<sw::sidebarwindows::SidebarTextControl> mpSidebarTextControl;
         VclPtr<ScrollBar>      mpVScrollbar;
         VclPtr<Edit>           mpMetadataAuthor;
         VclPtr<Edit>           mpMetadataDate;
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 81e96800613d..64cf8cea492e 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -22,22 +22,22 @@
 
 #include <SwNumberTree.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 struct SwPosition;
 class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
 
 class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
 {
 public:
 
-    explicit SwNodeNum( SwTxtNode* pTxtNode );
+    explicit SwNodeNum( SwTextNode* pTextNode );
     explicit SwNodeNum( SwNumRule* pNumRule );
     virtual ~SwNodeNum();
 
     SwNumRule* GetNumRule() const { return mpNumRule;}
     void ChangeNumRule( SwNumRule& rNumRule );
-    SwTxtNode* GetTxtNode() const { return mpTxtNode;}
+    SwTextNode* GetTextNode() const { return mpTextNode;}
 
     virtual bool IsNotificationEnabled() const SAL_OVERRIDE;
 
@@ -68,7 +68,7 @@ public:
 
         @author OD
     */
-    const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const;
+    const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const;
 
 protected:
     virtual SwNumberTreeNode * Create() const SAL_OVERRIDE;
@@ -82,7 +82,7 @@ protected:
     // method called at a child after this child has been removed from the list tree
     virtual void PostRemove() SAL_OVERRIDE;
 private:
-    SwTxtNode * mpTxtNode;
+    SwTextNode * mpTextNode;
     SwNumRule * mpNumRule;
 
     static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 3a27cbc28479..0f55905dbba2 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -49,9 +49,9 @@
  *
  * 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML
  *    name arrays.
- * 2. Character contains the ChrFmt and HTMLChrFmt name arrays.
+ * 2. Character contains the ChrFormat and HTMLChrFormat name arrays.
  * 3. Page contains the PageDesc name array.
- * 4. Frame contains the FrmFmt name array.
+ * 4. Frame contains the FrameFormat name array.
  * 5. Numbering Rule contains the NumRule name array.
  */
 
@@ -88,9 +88,9 @@ protected:
                             *pRegisterUINameArray,
                             *pDocUINameArray,
                             *pHTMLUINameArray,
-                            *pFrmFmtUINameArray,
-                            *pChrFmtUINameArray,
-                            *pHTMLChrFmtUINameArray,
+                            *pFrameFormatUINameArray,
+                            *pChrFormatUINameArray,
+                            *pHTMLChrFormatUINameArray,
                             *pPageDescUINameArray,
                             *pNumRuleUINameArray,
     // Programmatic Name tables
@@ -100,9 +100,9 @@ protected:
                             *pRegisterProgNameArray,
                             *pDocProgNameArray,
                             *pHTMLProgNameArray,
-                            *pFrmFmtProgNameArray,
-                            *pChrFmtProgNameArray,
-                            *pHTMLChrFmtProgNameArray,
+                            *pFrameFormatProgNameArray,
+                            *pChrFormatProgNameArray,
+                            *pHTMLChrFormatProgNameArray,
                             *pPageDescProgNameArray,
                             *pNumRuleProgNameArray;
 
@@ -171,9 +171,9 @@ public:
     static const ::std::vector<OUString>& GetRegisterUINameArray();
     static const ::std::vector<OUString>& GetDocUINameArray();
     static const ::std::vector<OUString>& GetHTMLUINameArray();
-    static const ::std::vector<OUString>& GetFrmFmtUINameArray();
-    static const ::std::vector<OUString>& GetChrFmtUINameArray();
-    static const ::std::vector<OUString>& GetHTMLChrFmtUINameArray();
+    static const ::std::vector<OUString>& GetFrameFormatUINameArray();
+    static const ::std::vector<OUString>& GetChrFormatUINameArray();
+    static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray();
     static const ::std::vector<OUString>& GetPageDescUINameArray();
     static const ::std::vector<OUString>& GetNumRuleUINameArray();
 
@@ -183,9 +183,9 @@ public:
     static const ::std::vector<OUString>& GetRegisterProgNameArray();
     static const ::std::vector<OUString>& GetDocProgNameArray();
     static const ::std::vector<OUString>& GetHTMLProgNameArray();
-    static const ::std::vector<OUString>& GetFrmFmtProgNameArray();
-    static const ::std::vector<OUString>& GetChrFmtProgNameArray();
-    static const ::std::vector<OUString>& GetHTMLChrFmtProgNameArray();
+    static const ::std::vector<OUString>& GetFrameFormatProgNameArray();
+    static const ::std::vector<OUString>& GetChrFormatProgNameArray();
+    static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray();
     static const ::std::vector<OUString>& GetPageDescProgNameArray();
     static const ::std::vector<OUString>& GetNumRuleProgNameArray();
 };
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index e34dd2c8cdba..2a8a6b4540d9 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -44,7 +44,7 @@ public:
 class SwUndoFieldFromDoc : public SwUndoField
 {
     SwField * pOldField, * pNewField;
-    SwMsgPoolItem * pHnt;
+    SwMsgPoolItem * pHint;
     bool bUpdate;
 
     void DoImpl();
@@ -52,7 +52,7 @@ class SwUndoFieldFromDoc : public SwUndoField
 public:
     SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField,
                        const SwField & aNewField,
-                       SwMsgPoolItem * pHnt, bool bUpdate,
+                       SwMsgPoolItem * pHint, bool bUpdate,
                        SwUndoId nId = UNDO_FIELD );
 
     virtual ~SwUndoFieldFromDoc();
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 2e439c05f2d8..a8b06d0bdf95 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -15,7 +15,7 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
-class SwTxtNode;
+class SwTextNode;
 
 class ToxLinkProcessorTest;
 
@@ -41,7 +41,7 @@ public:
 
     /** Insert the found links as attributes to a text node */
     void
-    InsertLinkAttributes(SwTxtNode& node);
+    InsertLinkAttributes(SwTextNode& node);
 
 private:
     /** Obtain the pool id which belongs to a character style.
@@ -66,9 +66,9 @@ private:
      */
     struct ClosedLink {
         ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 endPosition) :
-                mINetFmt(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
+                mINetFormat(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
         }
-        SwFmtINetFmt mINetFmt;
+        SwFormatINetFormat mINetFormat;
         sal_Int32 mStartTextPos;
         sal_Int32 mEndTextPos;
     };
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index a0d9e421c190..7e5be38eac81 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -19,7 +19,7 @@
 struct SwFormToken;
 class SwPageDesc;
 class SwRootFrm;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sw {
 
@@ -45,7 +45,7 @@ public:
      *          and to provide the returned SvxTabStop to the attributes of the node.
      */
     virtual HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const = 0;
 };
 
@@ -83,7 +83,7 @@ public:
      * method behaves differently when deriving the tab stop position.
      */
     ToxTabStopTokenHandler::HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const SAL_OVERRIDE;
 
 private:
@@ -92,14 +92,14 @@ private:
      * Is used to determine how to find tab stop position.
      */
     static bool
-    CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout);
+    CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout);
 
     /** Calculate the page margin from the page description.
      *
      * This is the fallback method to determine the position of a tab stop.
      */
     long
-    CalculatePageMarginFromPageDescription(const SwTxtNode& targetNode) const;
+    CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
 
     sal_uInt32 mIndexOfSectionNode;
     const SwPageDesc& mDefaultPageDescription;
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 57f908963ed0..94f142c83ff3 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -29,18 +29,18 @@
 
 class SfxItemSet;
 class SwAttrPool;
-class SwFmtAutoFmt;
+class SwFormatAutoFormat;
 class SwChapterField;
 class SwChapterFieldType;
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
 class SwDoc;
 class SwForm;
 struct SwFormToken;
 class SwPageDesc;
 class SwRootFrm;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
 struct SwTOXSortTabBase;
 class SvxTabStop;
 class ToxTextGeneratorTest;
@@ -80,7 +80,7 @@ private:
      */
     struct HandledTextToken {
         OUString text;
-        std::vector<SwFmtAutoFmt*> autoFormats;
+        std::vector<SwFormatAutoFormat*> autoFormats;
         std::vector<sal_Int32> startPositions;
         std::vector<sal_Int32> endPositions;
     };
@@ -94,7 +94,7 @@ private:
 
     /** Applies the result of a handled text token to a target node. */
     static void
-    ApplyHandledTextToken(const HandledTextToken& htt, SwTxtNode& targetNode);
+    ApplyHandledTextToken(const HandledTextToken& htt, SwTextNode& targetNode);
 
     /** Handle a page number token.
      *
@@ -117,11 +117,11 @@ private:
      * @param pool The attribute pool for the new items
      */
     static std::shared_ptr<SfxItemSet>
-    CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool);
+    CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& pool);
 
     /** This method will call GetNumStringOfFirstNode() of the first node in the provided SwTOXSortTabBase.
      *
-     * The parameters @p bUsePrefix and @p nLevel are passed to SwTxtNode::GetNumString()
+     * The parameters @p bUsePrefix and @p nLevel are passed to SwTextNode::GetNumString()
      *
      * @internal
      * The method is only called if several preconditions for @p rBase are true. Check the implementation
@@ -138,8 +138,8 @@ private:
     /** Generate the text for a chapter token.
      */
     OUString
-    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwCntntFrm* contentFrame,
-            const SwCntntNode *contentNode) const;
+    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+            const SwContentNode *contentNode) const;
 
     /** Obtain a ChapterField to use for the text generation.
      * @internal
@@ -147,7 +147,7 @@ private:
      */
     virtual SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const;
+            const SwContentFrm* contentFrame, const SwContentNode *contentNode) const;
 
     friend class ::ToxTextGeneratorTest;
 };
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2cb5a567319b..bf9dcd1c613a 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -38,7 +38,7 @@ class SwAccessibleParagraph;
 class SwViewShell;
 class Rectangle;
 class SwFrm;
-class SwTxtFrm;
+class SwTextFrm;
 class SwPageFrm;
 class SwAccessibleContext;
 class SwAccessibleContextMap_Impl;
@@ -203,7 +203,7 @@ public:
 
     void InvalidateContent( const SwFrm *pFrm );
 
-    void InvalidateAttr( const SwTxtFrm& rTxtFrm );
+    void InvalidateAttr( const SwTextFrm& rTextFrm );
 
     void InvalidateCursorPosition( const SwFrm *pFrm );
     void InvalidateFocus();
@@ -221,7 +221,7 @@ public:
 
         @author OD
 
-        @param _rTxtFrm
+        @param _rTextFrm
         input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO
         has to be invalidated.
 
@@ -229,14 +229,14 @@ public:
         input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM
         (value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated.
     */
-    void InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+    void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
                                      const bool _bFrom );
 
     /** invalidation of text selection of a paragraph
 
         @author OD
     */
-    void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
+    void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm );
 
     /** invalidation of text selection of all paragraphs
 
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 55fdb78c0c93..1a869f1fd2bc 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -135,8 +135,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         }
 
         // accessors to the format
-        virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
-        virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
+        virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE;
+        virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE;
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const SAL_OVERRIDE;
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index c31afee52daa..31b596a9ac72 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -27,13 +27,13 @@
 class SdrObject;
 class SwFrm;
 class SwLayoutFrm;
-class SwTxtFrm;
+class SwTextFrm;
 
 class SwPageFrm;
 class SwObjPositioningInProgress;
 
-class SwFrmFmt;
-class SwFmtAnchor;
+class SwFrameFormat;
+class SwFormatAnchor;
 
 /** wrapper class for the positioning of Writer fly frames and drawing objects
 
@@ -143,8 +143,8 @@ class SW_DLLPUBLIC SwAnchoredObject
             input parameter - reference to the text frame containing the anchor
             character.
         */
-        void _CheckCharRect( const SwFmtAnchor& _rAnch,
-                             const SwTxtFrm& _rAnchorCharFrm );
+        void _CheckCharRect( const SwFormatAnchor& _rAnch,
+                             const SwTextFrm& _rAnchorCharFrm );
 
         /** check top of line
 
@@ -162,12 +162,12 @@ class SW_DLLPUBLIC SwAnchoredObject
             input parameter - reference to the text frame containing the anchor
             character.
         */
-        void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
-                              const SwTxtFrm& _rAnchorCharFrm );
+        void _CheckTopOfLine( const SwFormatAnchor& _rAnch,
+                              const SwTextFrm& _rAnchorCharFrm );
 
         // method <sw_HideObj(..)> sets needed data structure values for the
         // object positioning
-        friend bool sw_HideObj( const SwTxtFrm& _rFrm,
+        friend bool sw_HideObj( const SwTextFrm& _rFrm,
                                  const RndStdIds _eAnchorType,
                                  const sal_Int32 _nObjAnchorPos,
                                  SwAnchoredObject* _pAnchoredObj );
@@ -260,11 +260,11 @@ class SW_DLLPUBLIC SwAnchoredObject
 
             @author OD
 
-            @return SwTxtFrm*
+            @return SwTextFrm*
             text frame containing the anchor character. It's NULL, if the object
             isn't anchored at-character resp. as-character.
         */
-        SwTxtFrm* FindAnchorCharFrm();
+        SwTextFrm* FindAnchorCharFrm();
 
         // accessors to data of position calculation:
         // frame vertical position is orient at
@@ -357,8 +357,8 @@ class SW_DLLPUBLIC SwAnchoredObject
         void SetCurrRelPos( Point _aRelPos );
 
         // accessors to the format
-        virtual SwFrmFmt& GetFrmFmt() = 0;
-        virtual const SwFrmFmt& GetFrmFmt() const = 0;
+        virtual SwFrameFormat& GetFrameFormat() = 0;
+        virtual const SwFrameFormat& GetFrameFormat() const = 0;
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const = 0;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 949d08d3c7f2..4dcba72214bd 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -110,8 +110,8 @@ public:
         return *m_pForbidden;
     }
 
-    sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const;
-    SvtScriptType GetAllScriptsOfText( const OUString& rTxt ) const;
+    sal_uInt16 GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const;
+    SvtScriptType GetAllScriptsOfText( const OUString& rText ) const;
 
     sal_Int32 getGraphemeCount(const OUString& rStr,
         sal_Int32 nStart, sal_Int32 nEnd) const;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 55cc98f0a54f..1fcbfa5c0517 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -134,16 +134,16 @@ struct SwHash
 struct SwCalcExp : public SwHash
 {
     SwSbxValue  nValue;
-    const SwFieldType* pFldType;
+    const SwFieldType* pFieldType;
 
     SwCalcExp( const OUString& rStr, const SwSbxValue& rVal,
-                const SwFieldType* pFldType = 0 );
+                const SwFieldType* pFieldType = 0 );
 };
 
 SwHash* Find( const OUString& rSrch, SwHash* const * ppTable,
-                sal_uInt16 nTblSize, sal_uInt16* pPos = 0 );
+                sal_uInt16 nTableSize, sal_uInt16* pPos = 0 );
 
-void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize );
+void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize );
 
 // if _CalcOp != 0, this is a valid operator
 struct _CalcOp;
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index f11765e58c5e..ce677d9c746c 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -28,18 +28,18 @@
 
 namespace rtl { class OUString; }
 
-class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
+class SW_DLLPUBLIC SwTableBoxNumFormat : public SfxUInt32Item
 {
     bool bAuto;     ///< automatically given flag
 public:
-    SwTblBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
+    SwTableBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
                         bool bAuto = false );
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr )
+    inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
     {
         SetValue( rAttr.GetValue() );
         SetAutoFlag( rAttr.GetAutoFlag() );
@@ -50,14 +50,14 @@ public:
     void SetAutoFlag( bool bFlag = true )       { bAuto = bFlag; }
 };
 
-class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
+class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula
 {
     SwModify* pDefinedIn;   // Modify object where the formula is located
                             // can only be TableBoxFormat
 
 public:
-    SwTblBoxFormula( const OUString& rFormula );
-    virtual ~SwTblBoxFormula() {};
+    SwTableBoxFormula( const OUString& rFormula );
+    virtual ~SwTableBoxFormula() {};
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -71,24 +71,24 @@ public:
 
           SwTableBox* GetTableBox();
     const SwTableBox* GetTableBox() const
-        { return const_cast<SwTblBoxFormula*>(this)->GetTableBox(); }
+        { return const_cast<SwTableBoxFormula*>(this)->GetTableBox(); }
 
     void ChangeState( const SfxPoolItem* pItem );
-    void Calc( SwTblCalcPara& rCalcPara, double& rValue );
+    void Calc( SwTableCalcPara& rCalcPara, double& rValue );
 };
 
-class SW_DLLPUBLIC SwTblBoxValue : public SfxPoolItem
+class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem
 {
     double nValue;
 public:
-    SwTblBoxValue();
-    SwTblBoxValue( const double aVal );
+    SwTableBoxValue();
+    SwTableBoxValue( const double aVal );
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp )
+    inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
     {
         nValue = rCmp.nValue;
         return *this;
@@ -97,19 +97,19 @@ public:
     double GetValue() const                     { return nValue; }
 };
 
-inline const SwTblBoxNumFormat      &SwAttrSet::GetTblBoxNumFmt(bool bInP) const
-    {   return static_cast<const SwTblBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
-inline const SwTblBoxFormula        &SwAttrSet::GetTblBoxFormula(bool bInP) const
-    {   return static_cast<const SwTblBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
-inline const SwTblBoxValue          &SwAttrSet::GetTblBoxValue(bool bInP) const
-    {   return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
-
-inline const SwTblBoxNumFormat      &SwFmt::GetTblBoxNumFmt(bool bInP) const
-    {   return m_aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula        &SwFmt::GetTblBoxFormula(bool bInP) const
-    {   return m_aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue          &SwFmt::GetTblBoxValue(bool bInP) const
-    {   return m_aSet.GetTblBoxValue(bInP); }
+inline const SwTableBoxNumFormat      &SwAttrSet::GetTableBoxNumFormat(bool bInP) const
+    {   return static_cast<const SwTableBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
+inline const SwTableBoxFormula        &SwAttrSet::GetTableBoxFormula(bool bInP) const
+    {   return static_cast<const SwTableBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
+inline const SwTableBoxValue          &SwAttrSet::GetTableBoxValue(bool bInP) const
+    {   return static_cast<const SwTableBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
+
+inline const SwTableBoxNumFormat      &SwFormat::GetTableBoxNumFormat(bool bInP) const
+    {   return m_aSet.GetTableBoxNumFormat(bInP); }
+inline const SwTableBoxFormula        &SwFormat::GetTableBoxFormula(bool bInP) const
+    {   return m_aSet.GetTableBoxFormula(bInP); }
+inline const SwTableBoxValue          &SwFormat::GetTableBoxValue(bool bInP) const
+    {   return m_aSet.GetTableBoxValue(bInP); }
 
 #endif
 
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 880e2918b329..11386ef6d48e 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -28,27 +28,27 @@ class SwTableSortBoxes;
 class SwSelBoxes;
 class SwCalc;
 class SwTableBox;
-class SwTableFmlUpdate;
+class SwTableFormulaUpdate;
 class SwDoc;
 
-class SwTblCalcPara
+class SwTableCalcPara
 {
-    const SwTableBox* pLastTblBox;
+    const SwTableBox* pLastTableBox;
     sal_uInt16 nStackCnt, nMaxSize;
 
 public:
     SwTableSortBoxes *pBoxStk;  ///< stack for recognizing recursion
     SwCalc& rCalc;              ///< current Calculator
-    const SwTable* pTbl;        ///< current table
+    const SwTable* pTable;        ///< current table
 
-    SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
-    ~SwTblCalcPara();
+    SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable );
+    ~SwTableCalcPara();
 
     bool CalcWithStackOverflow();
     bool IsStackOverflow() const        { return nMaxSize == nStackCnt; }
     bool IncStackCnt()                  { return nMaxSize == ++nStackCnt; }
     void DecStackCnt()                  { if( nStackCnt ) --nStackCnt; }
-    void SetLastTblBox( const SwTableBox* pBox )    { pLastTblBox = pBox; }
+    void SetLastTableBox( const SwTableBox* pBox )    { pLastTableBox = pBox; }
 };
 
 class SwTableFormula
@@ -68,7 +68,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
                         void* pPara = 0 ) const;
     void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
-    void _GetFmlBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
+    void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
     void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
@@ -77,7 +77,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
 
     static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
                     SwSelBoxes& rBoxes );
-    OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
+    OUString ScanString( FnScanFormula fnFormula, const SwTable& rTable,
                         void* = 0 ) const;
 
     static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm );
@@ -97,13 +97,13 @@ protected:
 
     SwTableFormula( const OUString& rFormula );
 
-    OUString MakeFormula( SwTblCalcPara& rCalcPara ) const
+    OUString MakeFormula( SwTableCalcPara& rCalcPara ) const
     {
         return ScanString( &SwTableFormula::_MakeFormula,
-                            *rCalcPara.pTbl, &rCalcPara );
+                            *rCalcPara.pTable, &rCalcPara );
     }
 
-    static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
+    static sal_uInt16 GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox );
 
 public:
 
@@ -118,13 +118,13 @@ public:
     }
 
     /// create from the internal formula (for CORE) the external formula (for UI)
-    void PtrToBoxNm( const SwTable* pTbl );
+    void PtrToBoxNm( const SwTable* pTable );
     /// create from the external formula the internal
-    void BoxNmToPtr( const SwTable* pTbl );
+    void BoxNmToPtr( const SwTable* pTable );
     /// create from the external/internal formula the relative formula
-    void ToRelBoxNm( const SwTable* pTbl );
+    void ToRelBoxNm( const SwTable* pTable );
     /// gets called before/after merging/splitting of tables
-    void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
+    void ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd );
 
     bool IsIntrnlName() const               { return m_eNmType == INTRNL_NAME; }
     NameType GetNameType() const            { return m_eNmType; }
@@ -140,7 +140,7 @@ public:
         m_bValidValue = false;
     }
 
-    void GetBoxesOfFormula(const SwTable& rTbl, SwSelBoxes& rBoxes);
+    void GetBoxesOfFormula(const SwTable& rTable, SwSelBoxes& rBoxes);
     // are all boxes valid which this formula relies on?
     bool HasValidBoxes() const;
 };
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 1fa539091d57..9634ce66f0c8 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -132,71 +132,71 @@ inline const SvxBoxItem          &SwAttrSet::GetCharBorder( bool bInP ) const
 inline const SvxShadowItem       &SwAttrSet::GetCharShadow( bool bInP ) const
     {   return static_cast<const SvxShadowItem&>(Get( RES_CHRATR_SHADOW, bInP )); }
 
-// implementation of the character attribute methods of SwFmt
+// implementation of the character attribute methods of SwFormat
 
-inline const SvxPostureItem          &SwFmt::GetPosture(bool bInP) const
+inline const SvxPostureItem          &SwFormat::GetPosture(bool bInP) const
     {   return m_aSet.GetPosture(bInP); }
-inline const SvxWeightItem           &SwFmt::GetWeight(bool bInP) const
+inline const SvxWeightItem           &SwFormat::GetWeight(bool bInP) const
     {   return m_aSet.GetWeight(bInP); }
-inline const SvxShadowedItem         &SwFmt::GetShadowed(bool bInP) const
+inline const SvxShadowedItem         &SwFormat::GetShadowed(bool bInP) const
     {   return m_aSet.GetShadowed(bInP); }
-inline const SvxAutoKernItem         &SwFmt::GetAutoKern(bool bInP) const
+inline const SvxAutoKernItem         &SwFormat::GetAutoKern(bool bInP) const
     {   return m_aSet.GetAutoKern(bInP); }
-inline const SvxWordLineModeItem     &SwFmt::GetWordLineMode(bool bInP) const
+inline const SvxWordLineModeItem     &SwFormat::GetWordLineMode(bool bInP) const
     {   return m_aSet.GetWordLineMode(bInP); }
-inline const SvxContourItem          &SwFmt::GetContour(bool bInP) const
+inline const SvxContourItem          &SwFormat::GetContour(bool bInP) const
     {   return m_aSet.GetContour(bInP); }
-inline const SvxKerningItem          &SwFmt::GetKerning(bool bInP) const
+inline const SvxKerningItem          &SwFormat::GetKerning(bool bInP) const
     {   return m_aSet.GetKerning(bInP); }
-inline const SvxUnderlineItem        &SwFmt::GetUnderline(bool bInP) const
+inline const SvxUnderlineItem        &SwFormat::GetUnderline(bool bInP) const
     {   return m_aSet.GetUnderline(bInP); }
-inline const SvxOverlineItem         &SwFmt::GetOverline(bool bInP) const
+inline const SvxOverlineItem         &SwFormat::GetOverline(bool bInP) const
     {   return m_aSet.GetOverline(bInP); }
-inline const SvxCrossedOutItem       &SwFmt::GetCrossedOut(bool bInP) const
+inline const SvxCrossedOutItem       &SwFormat::GetCrossedOut(bool bInP) const
     {   return m_aSet.GetCrossedOut(bInP); }
-inline const SvxFontHeightItem             &SwFmt::GetSize(bool bInP) const
+inline const SvxFontHeightItem             &SwFormat::GetSize(bool bInP) const
     {   return m_aSet.GetSize(bInP); }
-inline const SvxPropSizeItem         &SwFmt::GetPropSize(bool bInP) const
+inline const SvxPropSizeItem         &SwFormat::GetPropSize(bool bInP) const
     {   return m_aSet.GetPropSize(bInP); }
-inline const SvxFontItem             &SwFmt::GetFont(bool bInP) const
+inline const SvxFontItem             &SwFormat::GetFont(bool bInP) const
     {   return m_aSet.GetFont(bInP); }
-inline const SvxFontItem         &SwFmt::GetCJKFont(bool bInP) const
+inline const SvxFontItem         &SwFormat::GetCJKFont(bool bInP) const
     {   return m_aSet.GetCJKFont(bInP); }
-inline const SvxFontItem         &SwFmt::GetCTLFont(bool bInP) const
+inline const SvxFontItem         &SwFormat::GetCTLFont(bool bInP) const
     {   return m_aSet.GetCTLFont(bInP); }
-inline const SvxColorItem            &SwFmt::GetColor(bool bInP) const
+inline const SvxColorItem            &SwFormat::GetColor(bool bInP) const
     {   return m_aSet.GetColor(bInP); }
-    inline const SvxCharSetColorItem    &SwFmt::GetCharSetColor(bool bInP) const
+    inline const SvxCharSetColorItem    &SwFormat::GetCharSetColor(bool bInP) const
     {   return m_aSet.GetCharSetColor(bInP); }
-inline const SvxLanguageItem         &SwFmt::GetLanguage(bool bInP) const
+inline const SvxLanguageItem         &SwFormat::GetLanguage(bool bInP) const
     {   return m_aSet.GetLanguage(bInP); }
-inline const SvxEscapementItem       &SwFmt::GetEscapement(bool bInP) const
+inline const SvxEscapementItem       &SwFormat::GetEscapement(bool bInP) const
     {   return m_aSet.GetEscapement(bInP); }
-inline const SvxCaseMapItem          &SwFmt::GetCaseMap(bool bInP) const
+inline const SvxCaseMapItem          &SwFormat::GetCaseMap(bool bInP) const
     {   return m_aSet.GetCaseMap(bInP); }
-inline const SvxNoHyphenItem        &SwFmt::GetNoHyphenHere(bool bInP) const
+inline const SvxNoHyphenItem        &SwFormat::GetNoHyphenHere(bool bInP) const
     {   return m_aSet.GetNoHyphenHere(bInP); }
-inline const SvxBlinkItem           &SwFmt::GetBlink(bool bInP) const
+inline const SvxBlinkItem           &SwFormat::GetBlink(bool bInP) const
     {   return m_aSet.GetBlink(bInP); }
-inline const SvxBrushItem           &SwFmt::GetChrBackground(bool bInP) const
+inline const SvxBrushItem           &SwFormat::GetChrBackground(bool bInP) const
     {   return m_aSet.GetChrBackground(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const
+inline const SvxBrushItem &SwFormat::GetChrHighlight(bool bInP) const
     {   return m_aSet.GetChrHighlight(bInP); }
-inline const SvxEmphasisMarkItem   &SwFmt::GetEmphasisMark( bool bInP ) const
+inline const SvxEmphasisMarkItem   &SwFormat::GetEmphasisMark( bool bInP ) const
     {   return m_aSet.GetEmphasisMark(bInP); }
-inline const SvxTwoLinesItem       &SwFmt::Get2Lines( bool bInP ) const
+inline const SvxTwoLinesItem       &SwFormat::Get2Lines( bool bInP ) const
     {   return m_aSet.Get2Lines(bInP); }
-inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const
+inline const SvxCharScaleWidthItem &SwFormat::GetCharScaleW( bool bInP ) const
     {   return m_aSet.GetCharScaleW(bInP); }
-inline const SvxCharRotateItem     &SwFmt::GetCharRotate( bool bInP ) const
+inline const SvxCharRotateItem     &SwFormat::GetCharRotate( bool bInP ) const
     {   return m_aSet.GetCharRotate(bInP); }
-inline const SvxCharReliefItem     &SwFmt::GetCharRelief( bool bInP ) const
+inline const SvxCharReliefItem     &SwFormat::GetCharRelief( bool bInP ) const
     {   return m_aSet.GetCharRelief(bInP); }
-inline const SvxCharHiddenItem      &SwFmt::GetCharHidden( bool bInP ) const
+inline const SvxCharHiddenItem      &SwFormat::GetCharHidden( bool bInP ) const
     {   return m_aSet.GetCharHidden(bInP); }
-inline const SvxBoxItem     &SwFmt::GetCharBorder( bool bInP ) const
+inline const SvxBoxItem     &SwFormat::GetCharBorder( bool bInP ) const
     {   return m_aSet.GetCharBorder(bInP); }
-inline const SvxShadowItem  &SwFmt::GetCharShadow( bool bInP ) const
+inline const SvxShadowItem  &SwFormat::GetCharShadow( bool bInP ) const
     {   return m_aSet.GetCharShadow(bInP); }
 
 #endif
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index db67d1def83c..a9d029924a01 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -21,18 +21,18 @@
 
 #include <format.hxx>
 
-class SW_DLLPUBLIC SwCharFmt : public SwFmt
+class SW_DLLPUBLIC SwCharFormat : public SwFormat
 {
     friend class SwDoc;
-    friend class SwTxtFmtColl;
+    friend class SwTextFormatColl;
 
-    SwCharFmt( SwAttrPool& rPool, const sal_Char* pFmtName,
-                SwCharFmt *pDerivedFrom )
-          : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+    SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName,
+                SwCharFormat *pDerivedFrom )
+          : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
     {}
-    SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName,
-                SwCharFmt *pDerivedFrom )
-          : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+    SwCharFormat( SwAttrPool& rPool, const OUString &rFormatName,
+                SwCharFormat *pDerivedFrom )
+          : SwFormat( rPool, rFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
     {}
 
 public:
@@ -41,11 +41,11 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-namespace CharFmt
+namespace CharFormat
 {
     SW_DLLPUBLIC extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
-    extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
-    extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
+    extern const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich );
+    extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr );
 }
 
 #endif
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index dc59de1e1e61..5f22ceb36ec5 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -22,8 +22,8 @@
 #include "fldbas.hxx"
 
 class SwFrm;
-class SwCntntNode;
-class SwTxtNode;
+class SwContentNode;
+class SwTextNode;
 class ToxTextGeneratorTest;
 
 enum SwChapterFormat
@@ -60,13 +60,13 @@ class SW_DLLPUBLIC SwChapterField : public SwField
     virtual SwField* Copy() const SAL_OVERRIDE;
 
 public:
-    SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
+    SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0);
 
     // #i53420#
     void ChangeExpansion( const SwFrm*,
-                          const SwCntntNode*,
+                          const SwContentNode*,
         bool bSrchNum = false);
-    void ChangeExpansion(const SwTxtNode &rNd, bool bSrchNum);
+    void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum);
 
     inline sal_uInt8 GetLevel() const;
     inline void SetLevel(sal_uInt8);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index e07ca6fda4e0..7c15b3a88fbf 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -144,7 +144,7 @@
                                                         CalcLayout */
 
 #define FN_REDLINE_ACCEPT            (FN_EDIT2 + 29) /* Redlining Accept/Reject */
-#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId for SwFmtCol */
+#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId for SwFormatCol */
 #define FN_EDIT_CURRENT_TOX          (FN_EDIT2 + 32) /* edit current index */
 #define FN_EDIT_AUTH_ENTRY_DLG       (FN_EDIT2 + 33) /* edit authorities entry*/
 #define FN_UPDATE_CHARTS             (FN_EDIT2 + 34) /* update all charts */
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 84fbb87245c3..2fdcac8ba2c5 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -41,30 +41,30 @@
 
 class SfxItemSet;
 class SfxPoolItem;
-class SwCntntFrm;
+class SwContentFrm;
 class SwCrsrShell;
 class SwCursor;
 class SwField;
 class SwFieldType;
-class SwFmt;
-class SwFmtFld;
+class SwFormat;
+class SwFormatField;
 class SwNodeIndex;
 class SwPaM;
 class SwShellCrsr;
 class SwShellTableCrsr;
 class SwTableNode;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwVisCrsr;
-class SwTxtINetFmt;
-class SwFmtINetFmt;
-class SwTxtAttr;
+class SwTextINetFormat;
+class SwFormatINetFormat;
+class SwTextAttr;
 class SwTableBox;
 class SwTOXMark;
 class SwRangeRedline;
 class IBlockCursor;
-class SwCntntNode;
+class SwContentNode;
 class SwPostItField;
-class SwTxtFld;
+class SwTextField;
 struct SwPosition;
 
 namespace com { namespace sun { namespace star { namespace util {
@@ -103,26 +103,26 @@ struct SwContentAtPos
         ,SW_CURR_ATTRS      = 0x4000        ///< only for debugging
         ,SW_TABLEBOXVALUE   = 0x8000        ///< only for debugging
 #endif
-    } eCntntAtPos;
+    } eContentAtPos;
 
     union {
-        const SwField* pFld;
+        const SwField* pField;
         const SfxPoolItem* pAttr;
         const SwRangeRedline* pRedl;
-        SwCntntNode * pNode;
-        const sw::mark::IFieldmark* pFldmark;
+        SwContentNode * pNode;
+        const sw::mark::IFieldmark* pFieldmark;
     } aFnd;
 
     int nDist;
 
     OUString sStr;
-    const SwTxtAttr* pFndTxtAttr;
+    const SwTextAttr* pFndTextAttr;
 
     SwContentAtPos( int eGetAtPos = 0xffff )
-        : eCntntAtPos( (IsAttrAtPos)eGetAtPos )
+        : eContentAtPos( (IsAttrAtPos)eGetAtPos )
     {
-        aFnd.pFld = 0;
-        pFndTxtAttr = 0;
+        aFnd.pField = 0;
+        pFndTextAttr = 0;
         nDist = 0; // #i23726#
     }
 
@@ -179,7 +179,7 @@ private:
 
     IBlockCursor *m_pBlockCrsr;   ///< interface of cursor for block (=rectangular) selection
 
-    SwShellTableCrsr* m_pTblCrsr; /**< table Crsr; only in tables when the
+    SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the
                                    selection lays over 2 columns */
 
     SwNodeIndex* m_pBoxIdx;       ///< for recognizing of the changed
@@ -189,7 +189,7 @@ private:
                                    in the same column */
     long m_nLeftFrmPos;
     sal_uLong m_nAktNode;             // save CursorPos at Start-Action
-    sal_Int32 m_nAktCntnt;
+    sal_Int32 m_nAktContent;
     sal_uInt16 m_nAktNdTyp;
     bool m_bAktSelection;
 
@@ -222,7 +222,7 @@ private:
     bool m_bGCAttr : 1;           // true -> non expanded attributes exist.
     bool m_bIgnoreReadonly : 1;   // true -> make the cursor visible on next
                                 // EndAction in spite of Readonly
-    bool m_bSelTblCells : 1;      // true -> select cells over the InputWin
+    bool m_bSelTableCells : 1;      // true -> select cells over the InputWin
     bool m_bAutoUpdateCells : 1;  // true -> autoformat cells
     bool m_bBasicHideCrsr : 1;    // true -> HideCrsr from Basic
     bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas
@@ -260,7 +260,7 @@ private:
 
     SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
 
-    SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+    SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr);
 
 typedef bool (SwCursor:: *FNCrsr)();
     SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr );
@@ -290,7 +290,7 @@ protected:
     void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
                     const sal_Int32 nOffset = 0 );
 
-    bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+    bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false );
 
     bool SetInFrontOfLabel( bool bNew );
 
@@ -318,7 +318,7 @@ public:
     ///< delete the current cursor and make the following into the current
     bool DestroyCrsr();
     ///< transform TableCursor to normal cursor, nullify Tablemode
-    void TblCrsrToCursor();
+    void TableCrsrToCursor();
     ///< enter block mode, change normal cursor into block cursor
     void CrsrToBlockCrsr();
     ///< leave block mode, change block cursor into normal cursor
@@ -333,8 +333,8 @@ public:
     /// If document body starts with a table.
     bool StartsWithTable();
 
-    SwPaM* GetCrsr( bool bMakeTblCrsr = true ) const;
-    inline SwCursor* GetSwCrsr( bool bMakeTblCrsr = true ) const;
+    SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const;
+    inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const;
     // return only the current cursor
           SwShellCrsr* _GetCrsr()                       { return m_pCurCrsr; }
     const SwShellCrsr* _GetCrsr() const                 { return m_pCurCrsr; }
@@ -380,10 +380,10 @@ public:
                 bool& bCancel,
                 FindRanges eRng, bool bReplace = false );
 
-    sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+    sal_uLong Find( const SwTextFormatColl& rFormatColl,
                 SwDocPositions eStart, SwDocPositions eEnd,
                 bool& bCancel,
-                FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );
+                FindRanges eRng, const SwTextFormatColl* pReplFormat = 0 );
 
     sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
                 SwDocPositions eStart, SwDocPositions eEnd,
@@ -470,7 +470,7 @@ public:
     void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; }
 
     // Return current frame in which the cursor is placed.
-    SwCntntFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
+    SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
 
     //true if cursor is hidden because of readonly.
     //false if it is working despite readonly.
@@ -574,21 +574,21 @@ public:
 
     // get the selected text at the current cursor. it will be filled with
     // fields etc.
-    OUString GetSelTxt() const;
+    OUString GetSelText() const;
     // return only the text starting from the current cursor position (to the
     // end of the node)
     OUString GetText() const;
 
     // Check of SPoint or Mark of current cursor are placed within a table.
-    inline const SwTableNode* IsCrsrInTbl( bool bIsPtInTbl = true ) const;
+    inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const;
 
     inline Point& GetCrsrDocPos( bool bPoint = true ) const;
     inline bool IsCrsrPtAtEnd() const;
 
-    inline const  SwPaM* GetTblCrs() const;
-    inline        SwPaM* GetTblCrs();
+    inline const  SwPaM* GetTableCrs() const;
+    inline        SwPaM* GetTableCrs();
 
-    bool IsTblComplexForChart();
+    bool IsTableComplexForChart();
     // get current table selection as text
     OUString GetBoxNms() const;
 
@@ -599,11 +599,11 @@ public:
     bool GotoTable( const OUString& rName );
 
     // select a table row, column or box (based on the current cursor)
-    bool SelTblRow() { return _SelTblRowOrCol( true  ); }
-    bool SelTblCol() { return _SelTblRowOrCol( false ); }
-    bool SelTblBox();
+    bool SelTableRow() { return _SelTableRowOrCol( true  ); }
+    bool SelTableCol() { return _SelTableRowOrCol( false ); }
+    bool SelTableBox();
 
-    bool SelTbl();
+    bool SelTable();
 
     bool GotoNextNum();
     bool GotoPrevNum();
@@ -624,14 +624,14 @@ public:
     /** Delivers the current shell cursor
 
         Some operations have to run on the current cursor ring,
-        some on the m_pTblCrsr (if exist) or the current cursor ring and
-        some on the m_pTblCrsr or m_pBlockCrsr or the current cursor ring.
+        some on the m_pTableCrsr (if exist) or the current cursor ring and
+        some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring.
         This small function checks the existence and delivers the wished cursor.
 
         @param bBlock [bool]
         if the block cursor is of interest or not
 
-        @return m_pTblCrsr if exist,
+        @return m_pTableCrsr if exist,
         m_pBlockCrsr if exist and of interest (param bBlock)
         otherwise m_pCurCrsr
     */
@@ -644,20 +644,20 @@ public:
     IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; }
 
     // is the Crsr in a table and is the selection over 2 columns
-    bool IsTableMode() const { return 0 != m_pTblCrsr; }
+    bool IsTableMode() const { return 0 != m_pTableCrsr; }
 
-    const SwShellTableCrsr* GetTableCrsr() const { return m_pTblCrsr; }
-    SwShellTableCrsr* GetTableCrsr() { return m_pTblCrsr; }
-    size_t UpdateTblSelBoxes();
+    const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; }
+    SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; }
+    size_t UpdateTableSelBoxes();
 
-    bool GotoFtnTxt();      ///< jump from content to footnote
-    bool GotoFtnAnchor();   ///< jump from footnote to anchor
-    bool GotoPrevFtnAnchor();
-    bool GotoNextFtnAnchor();
+    bool GotoFootnoteText();      ///< jump from content to footnote
+    bool GotoFootnoteAnchor();   ///< jump from footnote to anchor
+    bool GotoPrevFootnoteAnchor();
+    bool GotoNextFootnoteAnchor();
 
     bool GotoFlyAnchor();       ///< jump from the frame to the anchor
-    bool GotoHeaderTxt();       ///< jump from the content to the header
-    bool GotoFooterTxt();       ///< jump from the content to the footer
+    bool GotoHeaderText();       ///< jump from the content to the header
+    bool GotoFooterText();       ///< jump from the content to the footer
     // jump to the header/footer of the given or current PageDesc
     bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX,
                         bool bInHeader = true );
@@ -675,7 +675,7 @@ public:
 
     // jump to the next or previous table formula
     // optionally only to broken formulas
-    bool GotoNxtPrvTblFormula( bool bNext = true,
+    bool GotoNxtPrvTableFormula( bool bNext = true,
                                bool bOnlyErrors = false );
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
@@ -695,26 +695,26 @@ public:
     inline void UnSetVisCrsr();
 
     // jump to the next or previous field of the corresponding type
-    bool MoveFldType(
-        const SwFieldType* pFldType,
+    bool MoveFieldType(
+        const SwFieldType* pFieldType,
         const bool bNext,
         const sal_uInt16 nResType = USHRT_MAX,
-        const bool bAddSetExpressionFldsToInputFlds = true );
+        const bool bAddSetExpressionFieldsToInputFields = true );
 
-    bool GotoFld( const SwFmtFld& rFld );
+    bool GotoFormatField( const SwFormatField& rField );
 
-    static SwTxtFld* GetTxtFldAtPos(
+    static SwTextField* GetTextFieldAtPos(
         const SwPosition* pPos,
-        const bool bIncludeInputFldAtStart );
+        const bool bIncludeInputFieldAtStart );
     static SwField* GetFieldAtCrsr(
         const SwPaM* pCrsr,
-        const bool bIncludeInputFldAtStart );
-    SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const;
-    bool CrsrInsideInputFld() const;
-    static bool PosInsideInputFld( const SwPosition& rPos );
-    bool DocPtInsideInputFld( const Point& rDocPt ) const;
-    static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos );
-    static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos );
+        const bool bIncludeInputFieldAtStart );
+    SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
+    bool CrsrInsideInputField() const;
+    static bool PosInsideInputField( const SwPosition& rPos );
+    bool DocPtInsideInputField( const Point& rDocPt ) const;
+    static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos );
+    static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos );
 
     // Return number of cursors in ring (The flag indicates whether
     // only cursors containing selections are requested).
@@ -750,7 +750,7 @@ public:
     // its TextNode (or StartNode?)
     // They all get created on the next ::GetCrsr again
     // Used for Drag&Drop/Clipboard-Paste in tables
-    bool ParkTblCrsr();
+    bool ParkTableCrsr();
 
     // Non expanded attributes?
     bool IsGCAttr() const { return m_bGCAttr; }
@@ -768,12 +768,12 @@ public:
     virtual void MakeSelVisible();
 
     // set the cursor to a NOT protected/hidden node
-    bool FindValidCntntNode( bool bOnlyText = false );
+    bool FindValidContentNode( bool bOnlyText = false );
 
     bool GetContentAtPos( const Point& rPt,
-                          SwContentAtPos& rCntntAtPos,
+                          SwContentAtPos& rContentAtPos,
                           bool bSetCrsr = false,
-                          SwRect* pFldRect = 0 );
+                          SwRect* pFieldRect = 0 );
 
     const SwPostItField* GetPostItFieldAtCursor() const;
 
@@ -791,20 +791,20 @@ public:
 
     bool IsPageAtPos( const Point &rPt ) const;
 
-    bool SelectTxtAttr( sal_uInt16 nWhich, bool bExpand, const SwTxtAttr* pAttr = 0 );
-    bool GotoINetAttr( const SwTxtINetFmt& rAttr );
-    const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+    bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = 0 );
+    bool GotoINetAttr( const SwTextINetFormat& rAttr );
+    const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
 
-    bool SelectTxt( const sal_Int32 nStart,
+    bool SelectText( const sal_Int32 nStart,
                         const sal_Int32 nEnd );
 
-    bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
-    void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
-    void ClearTblBoxCntnt();
-    bool EndAllTblBoxEdit();
+    bool CheckTableBoxContent( const SwPosition* pPos = 0 );
+    void SaveTableBoxContent( const SwPosition* pPos = 0 );
+    void ClearTableBoxContent();
+    bool EndAllTableBoxEdit();
 
-    void SetSelTblCells( bool bFlag )           { m_bSelTblCells = bFlag; }
-    bool IsSelTblCells() const                  { return m_bSelTblCells; }
+    void SetSelTableCells( bool bFlag )           { m_bSelTableCells = bFlag; }
+    bool IsSelTableCells() const                  { return m_bSelTableCells; }
 
     bool IsAutoUpdateCells() const              { return m_bAutoUpdateCells; }
     void SetAutoUpdateCells( bool bFlag )       { m_bAutoUpdateCells = bFlag; }
@@ -861,9 +861,9 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
     return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
 }
 
-inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const
 {
-    return static_cast<SwCursor*>(GetCrsr( bMakeTblCrsr ));
+    return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr ));
 }
 
 inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; }
@@ -888,9 +888,9 @@ inline bool SwCrsrShell::IsSelOnePara() const
            m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode;
 }
 
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( bool bIsPtInTbl ) const
+inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const
 {
-    return m_pCurCrsr->GetNode( bIsPtInTbl ).FindTableNode();
+    return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode();
 }
 
 inline bool SwCrsrShell::IsCrsrPtAtEnd() const
@@ -903,14 +903,14 @@ inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const
     return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos();
 }
 
-inline const SwPaM* SwCrsrShell::GetTblCrs() const
+inline const SwPaM* SwCrsrShell::GetTableCrs() const
 {
-    return m_pTblCrsr;
+    return m_pTableCrsr;
 }
 
-inline SwPaM* SwCrsrShell::GetTblCrs()
+inline SwPaM* SwCrsrShell::GetTableCrs()
 {
-    return m_pTblCrsr;
+    return m_pTableCrsr;
 }
 
 inline void SwCrsrShell::UnSetVisCrsr()
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 53e3db095bae..fdba24133fd3 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -65,7 +65,7 @@ struct Sw2LinesPos
 
 /**
  *  SwSpecialPos. This structure is used to pass some additional information
- *  during the call of SwTxtFrm::GetCharRect(). An SwSpecialPos defines a position
+ *  during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position
  *  inside a portion which does not have a representation in the core string or
  *  which is only represented by one position,  e.g., field portions,
  *  number portions, ergo sum and quo vadis portions.
@@ -82,7 +82,7 @@ struct Sw2LinesPos
  *
  *      Get the position of the second character inside a number portion:
  *          nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE;
- *          Call SwTxtFrm:::GetCharRect with core string position 0.
+ *          Call SwTextFrm:::GetCharRect with core string position 0.
  *
  *  Example 2)
  *
@@ -91,7 +91,7 @@ struct Sw2LinesPos
  *      Get the position of the third character in follow field B, core position
  *      of field A is 33.
  *          nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE;
- *          Call SwTxtFrm:::GetCharRect with core string position 33.
+ *          Call SwTextFrm:::GetCharRect with core string position 33.
  */
 
 #define SP_EXTEND_RANGE_NONE    0
@@ -134,9 +134,9 @@ struct SwCrsrMoveState
     bool bRealHeight;           ///< should the real height be calculated?
     bool bFieldInfo;            ///< should be fields recognized?
     bool bPosCorr;              ///< Point had to be corrected
-    bool bFtnNoInfo;            ///< recognized footnote numbering
+    bool bFootnoteNoInfo;            ///< recognized footnote numbering
     bool bExactOnly;            /**< let GetCrsrOfst look for exact matches only,
-                                         i.e. never let it run into GetCntntPos */
+                                         i.e. never let it run into GetContentPos */
     bool bFillRet;              ///< only used temporary in FillMode
     bool bSetInReadOnly;        ///< ReadOnly areas may be entered
     bool bRealWidth;            ///< Calculation of the width required
@@ -146,7 +146,7 @@ struct SwCrsrMoveState
                                        position if screen position is inside second
                                        have of bound rect */
 
-    bool bCntntCheck;           // #i43742# Cursor position over content?
+    bool bContentCheck;           // #i43742# Cursor position over content?
 
     // #i27615#
     /**
@@ -166,7 +166,7 @@ struct SwCrsrMoveState
         bRealHeight( false ),
         bFieldInfo( false ),
         bPosCorr( false ),
-        bFtnNoInfo( false ),
+        bFootnoteNoInfo( false ),
         bExactOnly( false ),
         bFillRet( false ),
         bSetInReadOnly( false ),
@@ -174,7 +174,7 @@ struct SwCrsrMoveState
         b2Lines( false ),
         bNoScroll( false ),
         bPosMatchesBounds( false ),
-        bCntntCheck( false ), // #i43742#
+        bContentCheck( false ), // #i43742#
         bInFrontOfLabel( false ), // #i27615#
         bInNumPortion(false), // #i26726#
         nInNumPostionOffset(0) // #i26726#
@@ -189,7 +189,7 @@ struct SwCrsrMoveState
         bRealHeight( false ),
         bFieldInfo( false ),
         bPosCorr( false ),
-        bFtnNoInfo( false ),
+        bFootnoteNoInfo( false ),
         bExactOnly( false ),
         bFillRet( false ),
         bSetInReadOnly( false ),
@@ -197,7 +197,7 @@ struct SwCrsrMoveState
         b2Lines( false ),
         bNoScroll( false ),
         bPosMatchesBounds( false ),
-        bCntntCheck( false ), // #i43742#
+        bContentCheck( false ), // #i43742#
         bInFrontOfLabel( false ), // #i27615#
         bInNumPortion(false), // #i23726#
         nInNumPostionOffset(0) // #i23726#
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 0509b9116ee2..2ba43ffef947 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -23,7 +23,7 @@
 #include "swdllapi.h"
 
 class SwPaM;
-class SwCntntFrm;
+class SwContentFrm;
 class SwLayoutFrm;
 
 // Structure for SwPaM. Contains the method-pointers for cursor movement.
@@ -31,13 +31,13 @@ struct SwMoveFnCollection;
 typedef SwMoveFnCollection* SwMoveFn;
 
 // Type definition for CrsrShell.
-// Direction-parameter for MovePage (initialized in SwCntntFrm).
+// Direction-parameter for MovePage (initialized in SwContentFrm).
 typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
-typedef SwCntntFrm  * (*SwPosPage)( const SwLayoutFrm * );
+typedef SwContentFrm  * (*SwPosPage)( const SwLayoutFrm * );
 extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext;
 extern SwPosPage fnPageStart, fnPageEnd;
 
-// Direction-parameter for MovePara (initialized in SwCntntFrm).
+// Direction-parameter for MovePara (initialized in SwContentFrm).
 typedef SwMoveFnCollection* SwPosPara;
 typedef bool (*SwWhichPara)( SwPaM&, SwPosPara );
 extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
@@ -57,7 +57,7 @@ extern SwPosTable fnTableStart, fnTableEnd;
 
 // Direction-parameter for MoveColumn
 typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * );
-typedef SwCntntFrm  * (*SwPosColumn)( const SwLayoutFrm * );
+typedef SwContentFrm  * (*SwPosColumn)( const SwLayoutFrm * );
 extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
 extern SwPosColumn fnColumnStart, fnColumnEnd;
 
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7df97ef6d9b0..7f3d6533ad71 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -24,7 +24,7 @@
 #include "swdbdata.hxx"
 
 class SwDoc;
-class SwTxtFld;
+class SwTextField;
 class SwFrm;
 
 // Database field.
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
     OUString aContent;
     OUString sFieldCode; ///< contains Word's field code
     sal_uInt16  nSubType;
-    bool    bIsInBodyTxt    : 1;
+    bool    bIsInBodyText    : 1;
     bool    bValidValue     : 1;
     bool    bInitialized    : 1;
 
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
 public:
-    SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
+    SwDBField(SwDBFieldType*, sal_uLong nFormat = 0);
     virtual ~SwDBField();
 
     virtual SwFieldType*    ChgTyp( SwFieldType* ) SAL_OVERRIDE;
@@ -88,11 +88,11 @@ public:
     void                Evaluate();
 
     /// Evaluation for header and footer.
-    void                ChangeExpansion( const SwFrm*, const SwTxtFld* );
+    void                ChangeExpansion( const SwFrm*, const SwTextField* );
     void                InitContent();
     void                InitContent(const OUString& rExpansion);
 
-    inline void         ChgBodyTxtFlag( bool bIsInBody );
+    inline void         ChgBodyTextFlag( bool bIsInBody );
 
     inline bool         IsInitialized() const   { return bInitialized; }
     inline void         ClearInitialized()      { bInitialized = false; }
@@ -110,16 +110,16 @@ public:
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 
-    static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt,
+    static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
                              double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
 };
 
 inline  void SwDBField::SetExpansion(const OUString& rStr)
     { aContent = rStr; }
 
-/// set from UpdateExpFlds (the Node-Position is known there)
-inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
-    { bIsInBodyTxt = bIsInBody; }
+/// set from UpdateExpFields (the Node-Position is known there)
+inline void SwDBField::ChgBodyTextFlag( bool bIsInBody )
+    { bIsInBodyText = bIsInBody; }
 
 // Base class for all other database fields.
 class SW_DLLPUBLIC SwDBNameInfField : public SwField
@@ -131,7 +131,7 @@ protected:
     const SwDBData& GetDBData() const {return aDBData;}
     SwDBData&       GetDBData() {return aDBData;}
 
-    SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
 public:
     /// DBName
@@ -249,7 +249,7 @@ public:
 class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
 {
 public:
-    SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
     virtual OUString Expand() const SAL_OVERRIDE;
     virtual SwField* Copy() const SAL_OVERRIDE;
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
 {
     long    nNumber;
 public:
-    SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
     virtual OUString Expand() const SAL_OVERRIDE;
     virtual         SwField* Copy() const SAL_OVERRIDE;
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 6b98c528b2a8..5fcf8af7460b 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -26,10 +26,10 @@
 #include <cstdio>
 #include <unordered_map>
 
-class SwCntntNode;
+class SwContentNode;
 class SwNode;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
 class SwpHints;
 class SfxPoolItem;
 class SfxItemSet;
@@ -38,14 +38,14 @@ class SwPaM;
 class SwNodeNum;
 class SwUndo;
 class SwRect;
-class SwFrmFmt;
-class SwFrmFmts;
+class SwFrameFormat;
+class SwFrameFormats;
 class SwNodes;
 class SwRewriter;
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwNumRule;
 class SwOutlineNodes;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwNodeRange;
 
 extern bool bDbgOutStdErr;
@@ -54,12 +54,12 @@ extern bool bDbgOutPrintAttrSet;
 SW_DLLPUBLIC const char * dbg_out(const void * pVoid);
 SW_DLLPUBLIC const char * dbg_out(const OUString & aStr);
 SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormat & rFrameFormat);
 SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
 SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr);
+SW_DLLPUBLIC const char * dbg_out(const SwContentNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextAttr & rAttr);
 SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
@@ -72,9 +72,9 @@ SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
 SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes);
 SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
 SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts);
-SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl);
+SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats);
+SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTable & rTable);
 SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange);
 
 template<typename tKey, typename tMember, typename fHashFunction>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 47defa8e0c44..5bf5432fdc0e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -186,7 +186,7 @@ class SW_DLLPUBLIC SwDBManager
 {
 friend class SwConnectionDisposedListener_Impl;
 
-    OUString            sEMailAddrFld;      ///< Mailing: Column name of email address.
+    OUString            sEMailAddrField;      ///< Mailing: Column name of email address.
     OUString            sSubject;           ///< Mailing: Subject
     OUString            sAttached;          ///< Mailing: Attached Files.
     bool            bCancel;            ///< Mail merge canceled.
@@ -251,7 +251,7 @@ public:
     void     SetSingleJobs(bool b)   { bSingleJobs = b;  }
 
     /// Mailing: Set email data.
-    inline void     SetEMailColumn(const OUString& sColName) { sEMailAddrFld = sColName; }
+    inline void     SetEMailColumn(const OUString& sColName) { sEMailAddrField = sColName; }
     inline void     SetSubject(const OUString& sSbj) { sSubject = sSbj; }
     inline void     SetAttachment(const OUString& sAtt) { sAttached = sAtt; }
 
@@ -265,16 +265,16 @@ public:
                             css::uno::Reference< css::sdbc::XConnection> xConnection,
                             const OUString& rTableName, bool bAppend = false);
 
-    static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+    static sal_uLong GetColumnFormat( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
                             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
                             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn,
-                            SvNumberFormatter* pNFmtr,
+                            SvNumberFormatter* pNFormatr,
                             long nLanguage );
 
-    sal_uLong GetColumnFmt( const OUString& rDBName,
+    sal_uLong GetColumnFormat( const OUString& rDBName,
                             const OUString& rTableName,
                             const OUString& rColNm,
-                            SvNumberFormatter* pNFmtr,
+                            SvNumberFormatter* pNFormatr,
                             long nLanguage );
     sal_Int32 GetColumnType( const OUString& rDBName,
                           const OUString& rTableName,
@@ -301,7 +301,7 @@ public:
                             const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
                             OUString& rResult, double* pNumber);
     /** create and store or find an already stored connection to a data source for use
-    in SwFldMgr and SwDBTreeList */
+    in SwFieldMgr and SwDBTreeList */
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
                     RegisterConnection(OUString& rSource);
 
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 01298ee7689a..07b5cca5e5ca 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -30,13 +30,13 @@
 #include <anchoreddrawobject.hxx>
 
 class SfxPoolItem;
-class SwFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwFlyFrameFormat;
 class SwFlyFrm;
 class SwFrm;
 class SwPageFrm;
 class SwVirtFlyDrawObj;
-class SwFmtAnchor;
+class SwFormatAnchor;
 class SwFlyDrawObj;
 class SwRect;
 class SwDrawContact;
@@ -49,9 +49,9 @@ class SdrTextObj;
  If not it is a simple DrawObject. It has a UserCall which
  is client of the format we are looking for.
  Implementation in dcontact.cxx. */
-SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj );
-inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj )
-{   return ::FindFrmFmt( const_cast<SdrObject*>(pObj) ); }
+SW_DLLPUBLIC SwFrameFormat *FindFrameFormat( SdrObject *pObj );
+inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj )
+{   return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); }
 bool HasWrap( const SdrObject* pObj );
 
 void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
@@ -105,7 +105,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// For reader. Only the connection is created.
-    SwContact( SwFrmFmt *pToRegisterIn );
+    SwContact( SwFrameFormat *pToRegisterIn );
     virtual ~SwContact();
 
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0;
@@ -115,9 +115,9 @@ public:
     virtual SdrObject *GetMaster() = 0;
     virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
 
-          SwFrmFmt  *GetFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt  *GetFmt() const
-        { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
+          SwFrameFormat  *GetFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat  *GetFormat() const
+        { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
 
     bool IsInDTOR() const { return mbInDTOR;}
 
@@ -145,27 +145,27 @@ public:
 
     /** some virtual helper methods for information
      about the object (Writer fly frame resp. drawing object) */
-    const SwFmtAnchor& GetAnchorFmt() const
+    const SwFormatAnchor& GetAnchorFormat() const
     {
-        assert( GetFmt() );
+        assert( GetFormat() );
 
-        return GetFmt()->GetAnchor();
+        return GetFormat()->GetAnchor();
     }
 
-    RndStdIds GetAnchorId() const { return GetAnchorFmt().GetAnchorId(); }
+    RndStdIds GetAnchorId() const { return GetAnchorFormat().GetAnchorId(); }
     bool      ObjAnchoredAtPage() const { return GetAnchorId() == FLY_AT_PAGE; }
     bool      ObjAnchoredAtFly()  const { return GetAnchorId() == FLY_AT_FLY; }
     bool      ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_PARA; }
     bool      ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AT_CHAR; }
     bool      ObjAnchoredAsChar() const { return GetAnchorId() == FLY_AS_CHAR; }
 
-    const SwPosition&  GetCntntAnchor() const
+    const SwPosition&  GetContentAnchor() const
     {
-        assert( GetAnchorFmt().GetCntntAnchor() );
-        return *(GetAnchorFmt().GetCntntAnchor());
+        assert( GetAnchorFormat().GetContentAnchor() );
+        return *(GetAnchorFormat().GetContentAnchor());
     }
 
-    const SwIndex&     GetCntntAnchorIndex() const;
+    const SwIndex&     GetContentAnchorIndex() const;
 
     /** get data collection of anchored objects, handled by with contact
 
@@ -198,7 +198,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// Creates DrawObject and registers it with the Model.
-    SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
+    SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
     virtual ~SwFlyDrawContact();
 
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -390,7 +390,7 @@ class SwDrawContact : public SwContact
     public:
         TYPEINFO_OVERRIDE();
 
-        SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
+        SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
         virtual ~SwDrawContact();
 
         virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -419,9 +419,9 @@ class SwDrawContact : public SwContact
         SwPageFrm* FindPage( const SwRect &rRect );
 
         /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm).
-         The anchor is determined according to the attribute SwFmtAnchor.
+         The anchor is determined according to the attribute SwFormatAnchor.
          If required the object gets unregistered with the old anchor. */
-        void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
+        void ConnectToLayout( const SwFormatAnchor *pAnch = 0 );
         /** method to insert 'master' drawing object
          into drawing page */
         void InsertMasterIntoDrawPage();
@@ -459,7 +459,7 @@ class SwDrawContact : public SwContact
         /** get data collection of anchored objects, handled by with contact
         */
 
-        static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* );
+        static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* );
         virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
 };
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5459308496a9..77a045880e3b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -82,72 +82,72 @@ class SwAutoCompleteWord;
 class SwAutoCorrExceptWord;
 class SwCalc;
 class SwCellFrm;
-class SwCharFmt;
-class SwCharFmts;
-class SwConditionTxtFmtColl;
+class SwCharFormat;
+class SwCharFormats;
+class SwConditionTextFormatColl;
 class SwCrsrShell;
 class SwCursor;
 class SwDBNameInfField;
 class SwDocShell;
-class SwDocUpdtFld;
-class SwDrawFrmFmt;
+class SwDocUpdateField;
+class SwDrawFrameFormat;
 class SwDrawView;
 class SwEditShell;
 class SwFieldType;
 class SwField;
-class SwTxtFld;
-class SwFldTypes;
-class SwFlyFrmFmt;
-class SwFmtsBase;
-class SwFmt;
-class SwFmtINetFmt;
-class SwFmtRefMark;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFtnIdxs;
-class SwFtnInfo;
+class SwTextField;
+class SwFieldTypes;
+class SwFlyFrameFormat;
+class SwFormatsBase;
+class SwFormat;
+class SwFormatINetFormat;
+class SwFormatRefMark;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFootnoteIdxs;
+class SwFootnoteInfo;
 class SwEndNoteInfo;
 class GraphicObject;
-class SwGrfFmtColl;
-class SwGrfFmtColls;
+class SwGrfFormatColl;
+class SwGrfFormatColls;
 class SwLineNumberInfo;
 class SwDBManager;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwNodeIndex;
 class SwNodeRange;
 class SwNodes;
 class SwNumRule;
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwPageDesc;
 class SwPagePreviewPrtData;
 class SwRangeRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
 class SwRootFrm;
 class SwRubyList;
 class SwRubyListEntry;
-class SwSectionFmt;
-class SwSectionFmts;
+class SwSectionFormat;
+class SwSectionFormats;
 class SwSectionData;
 class SwSelBoxes;
 class SwTOXBaseSection;
 class SwTOXTypes;
 class SwTabCols;
 class SwTable;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwTableBox;
-class SwTableBoxFmt;
-class SwTableFmt;
-class SwTableLineFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
+class SwTableLineFormat;
 class SwTableNode;
 class SwTextBlocks;
-class SwTxtFmtColl;
-class SwTxtFmtColls;
+class SwTextFormatColl;
+class SwTextFormatColls;
 class SwURLStateChanged;
 class SwUnoCrsr;
-class SwUnoCrsrTbl;
+class SwUnoCrsrTable;
 class SwViewShell;
-class _SetGetExpFld;
+class _SetGetExpField;
 class SwDrawContact;
 class SwLayouter;
 class SdrView;
@@ -191,7 +191,7 @@ class IDocumentState;
 class IDocumentLayoutAccess;
 class IDocumentStylePoolAccess;
 class IDocumentExternalData;
-class _SetGetExpFlds;
+class _SetGetExpFields;
 
 namespace sw { namespace mark {
     class MarkManager;
@@ -291,20 +291,20 @@ class SW_DLLPUBLIC SwDoc :
     const ::boost::scoped_ptr< ::sw::DocumentExternalDataManager > m_pDocumentExternalDataManager;
 
     // Pointer
-    SwFrmFmt        *mpDfltFrmFmt;       //< Default formats.
-    SwFrmFmt        *mpEmptyPageFmt;     //< Format for the default empty page
-    SwFrmFmt        *mpColumnContFmt;    //< Format for column container
-    SwCharFmt       *mpDfltCharFmt;
-    SwTxtFmtColl    *mpDfltTxtFmtColl;   //< Defaultformatcollections
-    SwGrfFmtColl    *mpDfltGrfFmtColl;
-
-    SwFrmFmts       *mpFrmFmtTbl;        //< Format table
-    SwCharFmts      *mpCharFmtTbl;
-    SwFrmFmts       *mpSpzFrmFmtTbl;
-    SwSectionFmts   *mpSectionFmtTbl;
-    SwFrmFmts       *mpTblFrmFmtTbl;     //< For tables
-    SwTxtFmtColls   *mpTxtFmtCollTbl;    //< FormatCollections
-    SwGrfFmtColls   *mpGrfFmtCollTbl;
+    SwFrameFormat        *mpDfltFrameFormat;       //< Default formats.
+    SwFrameFormat        *mpEmptyPageFormat;     //< Format for the default empty page
+    SwFrameFormat        *mpColumnContFormat;    //< Format for column container
+    SwCharFormat       *mpDfltCharFormat;
+    SwTextFormatColl    *mpDfltTextFormatColl;   //< Defaultformatcollections
+    SwGrfFormatColl    *mpDfltGrfFormatColl;
+
+    SwFrameFormats       *mpFrameFormatTable;        //< Format table
+    SwCharFormats      *mpCharFormatTable;
+    SwFrameFormats       *mpSpzFrameFormatTable;
+    SwSectionFormats   *mpSectionFormatTable;
+    SwFrameFormats       *mpTableFrameFormatTable;     //< For tables
+    SwTextFormatColls   *mpTextFormatCollTable;    //< FormatCollections
+    SwGrfFormatColls   *mpGrfFormatCollTable;
 
     SwTOXTypes      *mpTOXTypes;         //< Tables/indices
     SwDefTOXBase_Impl * mpDefTOXBases;   //< defaults of SwTOXBase's
@@ -315,10 +315,10 @@ class SW_DLLPUBLIC SwDoc :
     SwDoc           *mpGlossaryDoc;      //< Pointer to glossary-document.
 
     SwNumRule       *mpOutlineRule;
-    SwFtnInfo       *mpFtnInfo;
+    SwFootnoteInfo       *mpFootnoteInfo;
     SwEndNoteInfo   *mpEndNoteInfo;
     SwLineNumberInfo*mpLineNumberInfo;
-    SwFtnIdxs       *mpFtnIdxs;
+    SwFootnoteIdxs       *mpFootnoteIdxs;
 
     SwDocShell      *mpDocShell;         //< Ptr to SfxDocShell of Doc.
     SfxObjectShellLock mxTmpDocShell;    //< A temporary shell that is used to copy OLE-Nodes
@@ -328,12 +328,12 @@ class SW_DLLPUBLIC SwDoc :
     SwURLStateChanged *mpURLStateChgd;   //< SfxClient for changes in INetHistory
     SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields
 
-    mutable SwNumRuleTbl    *mpNumRuleTbl;   //< List of all named NumRules.
+    mutable SwNumRuleTable    *mpNumRuleTable;   //< List of all named NumRules.
 
     // Hash map to find numrules by name
     mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap;
 
-    SwUnoCrsrTbl    *mpUnoCrsrTbl;
+    SwUnoCrsrTable    *mpUnoCrsrTable;
 
     SwPagePreviewPrtData *mpPgPViewPrtData;  //< Indenting / spacing for printing of page view.
     SwPaM           *mpExtInputRing;
@@ -373,13 +373,13 @@ private:
     bool mbInXMLImport           : 1;    //< TRUE: During xml import, attribute portion building is not necessary.
     bool mbUpdateTOX             : 1;    //< TRUE: After loading document, update TOX.
     bool mbInLoadAsynchron       : 1;    //< TRUE: Document is in the process of being loaded asynchronously.
-    bool mbIsAutoFmtRedline      : 1;    //< TRUE: Redlines are recorded by Autoformat.
+    bool mbIsAutoFormatRedline      : 1;    //< TRUE: Redlines are recorded by Autoformat.
     bool mbOLEPrtNotifyPending   : 1;    /**< TRUE: Printer has changed. At creation of
                                                 View
                                                 notification of OLE-Objects PrtOLENotify() is required. */
     bool mbAllOLENotify          : 1;    //< True: Notification of all objects is required.
     bool mbIsRedlineMove         : 1;    //< True: Redlines are moved into to / out of the section.
-    bool mbInsOnlyTxtGlssry      : 1;    //< True: insert 'only text' glossary into doc
+    bool mbInsOnlyTextGlssry      : 1;    //< True: insert 'only text' glossary into doc
     bool mbContains_MSVBasic     : 1;    //< True: MS-VBasic exist is in our storage
     bool mbClipBoard             : 1;    //< TRUE: this document represents the clipboard
     bool mbColumnSelection       : 1;    /**< TRUE: this content has bee created by a column selection
@@ -397,20 +397,20 @@ private:
     static SwAutoCompleteWord *mpACmpltWords;  //< List of all words for AutoComplete
 
     // private methods
-    SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
-                                const SwCntntNode& rNode, RndStdIds eRequestId,
+    SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos,
+                                const SwContentNode& rNode, RndStdIds eRequestId,
                                 const SfxItemSet* pFlyAttrSet,
-                                SwFrmFmt* = 0 );
-    sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
-
-    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool );
-    SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
-                        FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
-    void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
-                        FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt );
+                                SwFrameFormat* = 0 );
+    sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms );
+
+    typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
+    SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr,
+                        FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat );
+    void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase& rDestArr,
+                        FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat );
     void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
-                                const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
-    static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName );
+                                const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat );
+    static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName );
 
     SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
 
@@ -428,15 +428,15 @@ private:
 
     void _CreateNumberFormatter();
 
-    bool _UnProtectTblCells( SwTable& rTbl );
+    bool _UnProtectTableCells( SwTable& rTable );
 
     /** Create sub-documents according to the given collection.
      If no collection is given, take chapter style of the 1st level. */
     bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
-                        const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
+                        const SwTextFormatColl* pSplitColl, int nOutlineLevel = 0 );
 
     // Update charts of given table.
-    void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const;
+    void _UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const;
 
     static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
                                 sal_uInt16 nMode );
@@ -446,11 +446,11 @@ private:
     DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void );
 
 public:
-    SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool );
-    SwFmt *_MakeFrmFmt(const OUString &, SwFmt *, bool, bool );
+    SwFormat *_MakeCharFormat(const OUString &, SwFormat *, bool, bool );
+    SwFormat *_MakeFrameFormat(const OUString &, SwFormat *, bool, bool );
 
 private:
-    SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool );
+    SwFormat *_MakeTextFormatColl(const OUString &, SwFormat *, bool, bool );
 
 private:
     bool mbReadOnly;
@@ -532,7 +532,7 @@ public:
     ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const;
     ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager();
 
-    bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 );
+    bool UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal = 0 );
     bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen );
 
     // IDocumentStylePoolAccess
@@ -635,18 +635,18 @@ public:
      have to be surrounded completely by ::com::sun::star::awt::Selection.
      ( Start < Pos < End ) !!!
      (Required for Writers.) */
-    SwPosFlyFrms GetAllFlyFmts( const SwPaM* = 0,
+    SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0,
                         bool bDrawAlso = false,
                         bool bAsCharAlso = false ) const;
 
     // Because swrtf.cxx and define private public here now.
-    SwFlyFrmFmt  *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
-    SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
+    SwFlyFrameFormat  *MakeFlyFrameFormat (const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+    SwDrawFrameFormat *MakeDrawFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
 
     // From now on this interface has to be used for Flys.
     // pAnchorPos must be set, if they are not attached to pages AND
-    // Anchor is not already set at valid CntntPos
-    // in FlySet/FrmFmt.
+    // Anchor is not already set at valid ContentPos
+    // in FlySet/FrameFormat.
     /* new parameter bCalledFromShell
 
        true: An existing adjust item at pAnchorPos is propagated to
@@ -656,14 +656,14 @@ public:
 
        false: no propagation
     */
-    SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType,
+    SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType,
                                  const SwPosition* pAnchorPos,
                                  const SfxItemSet* pSet = 0,
-                                 SwFrmFmt *pParent = 0,
+                                 SwFrameFormat *pParent = 0,
                                  bool bCalledFromShell = false );
-    SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
+    SwFlyFrameFormat* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                                 const SwSelBoxes* pSelBoxes = 0,
-                                SwFrmFmt *pParent = 0 );
+                                SwFrameFormat *pParent = 0 );
 
     //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
     // and evtl. corrects that items to ensure unique names for that type. This call may
@@ -672,25 +672,25 @@ public:
     // these items work for the UNO API and thus e.g. for ODF im/export)
     void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
 
-    bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
+    bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
 
-    bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
+    bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat,
                         SfxItemSet* pSet = 0, bool bKeepOrient = false );
-    void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+    void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
                          const OUString& sNewTitle );
-    void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+    void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
                                const OUString& sNewDescription );
 
     // Footnotes
     // Footnote information
-    const SwFtnInfo& GetFtnInfo() const         { return *mpFtnInfo; }
-    void SetFtnInfo(const SwFtnInfo& rInfo);
+    const SwFootnoteInfo& GetFootnoteInfo() const         { return *mpFootnoteInfo; }
+    void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; }
     void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
-          SwFtnIdxs& GetFtnIdxs()       { return *mpFtnIdxs; }
-    const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; }
+          SwFootnoteIdxs& GetFootnoteIdxs()       { return *mpFootnoteIdxs; }
+    const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; }
     // change footnotes in area
-    bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
+    bool SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
                     sal_uInt16 nNumber, bool bIsEndNote );
 
     /** Operations on the content of the document e.g.
@@ -712,7 +712,7 @@ public:
 
     // Glossary Document
     void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
-    bool IsInsOnlyTextGlossary() const      { return mbInsOnlyTxtGlssry; }
+    bool IsInsOnlyTextGlossary() const      { return mbInsOnlyTextGlssry; }
 
     void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress );
 
@@ -747,34 +747,34 @@ public:
 
     std::set<SwRootFrm*> GetAllLayouts();
 
-    void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
-    const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
+    void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName );
+    const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
 
-    static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName );
+    static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName );
 
     // Set a valid name for all Flys that have none (Called by Readers after reading).
     void SetAllUniqueFlyNames();
 
-    /** Reset attributes. All TxtHints and (if completely selected) all hard-
+    /** Reset attributes. All TextHints and (if completely selected) all hard-
      formatted stuff (auto-formats) are removed.
      Introduce new optional parameter <bSendDataChangedEvents> in order to
      control, if the side effect "send data changed events" is triggered or not. */
     void ResetAttrs( const SwPaM &rRg,
-                     bool bTxtAttr = true,
+                     bool bTextAttr = true,
                      const std::set<sal_uInt16> &rAttrs = std::set<sal_uInt16>(),
                      const bool bSendDataChangedEvents = true );
-    void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
+    void RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
 
     /** Set attribute in given format.1y
      *  If Undo is enabled, the old values is added to the Undo history. */
-    void SetAttr( const SfxPoolItem&, SwFmt& );
+    void SetAttr( const SfxPoolItem&, SwFormat& );
     /** Set attribute in given format.1y
      *  If Undo is enabled, the old values is added to the Undo history. */
-    void SetAttr( const SfxItemSet&, SwFmt& );
+    void SetAttr( const SfxItemSet&, SwFormat& );
 
     // method to reset a certain attribute at the given format
     void ResetAttrAtFormat( const sal_uInt16 nWhichId,
-                            SwFmt& rChangedFormat );
+                            SwFormat& rChangedFormat );
 
     /** Set attribute as new default attribute in current document.
      If Undo is activated, the old one is listed in Undo-History. */
@@ -782,107 +782,107 @@ public:
     void SetDefault( const SfxItemSet& );
 
     // Query default attribute in this document.
-    const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+    const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
 
     // Do not expand text attributes.
-    bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
+    bool DontExpandFormat( const SwPosition& rPos, bool bFlag = true );
 
     // Formats
-    const SwFrmFmts* GetFrmFmts() const     { return mpFrmFmtTbl; }
-          SwFrmFmts* GetFrmFmts()           { return mpFrmFmtTbl; }
-    const SwCharFmts* GetCharFmts() const   { return mpCharFmtTbl;}
-          SwCharFmts* GetCharFmts()         { return mpCharFmtTbl;}
+    const SwFrameFormats* GetFrameFormats() const     { return mpFrameFormatTable; }
+          SwFrameFormats* GetFrameFormats()           { return mpFrameFormatTable; }
+    const SwCharFormats* GetCharFormats() const   { return mpCharFormatTable;}
+          SwCharFormats* GetCharFormats()         { return mpCharFormatTable;}
 
     // LayoutFormats (frames, DrawObjects), sometimes const sometimes not
-    const SwFrmFmts* GetSpzFrmFmts() const   { return mpSpzFrmFmtTbl; }
-          SwFrmFmts* GetSpzFrmFmts()         { return mpSpzFrmFmtTbl; }
-
-    const SwFrmFmt *GetDfltFrmFmt() const   { return mpDfltFrmFmt; }
-          SwFrmFmt *GetDfltFrmFmt()         { return mpDfltFrmFmt; }
-    const SwFrmFmt *GetEmptyPageFmt() const { return mpEmptyPageFmt; }
-          SwFrmFmt *GetEmptyPageFmt()       { return mpEmptyPageFmt; }
-    const SwFrmFmt *GetColumnContFmt() const{ return mpColumnContFmt; }
-          SwFrmFmt *GetColumnContFmt()      { return mpColumnContFmt; }
-    const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;}
-          SwCharFmt *GetDfltCharFmt()       { return mpDfltCharFmt;}
+    const SwFrameFormats* GetSpzFrameFormats() const   { return mpSpzFrameFormatTable; }
+          SwFrameFormats* GetSpzFrameFormats()         { return mpSpzFrameFormatTable; }
+
+    const SwFrameFormat *GetDfltFrameFormat() const   { return mpDfltFrameFormat; }
+          SwFrameFormat *GetDfltFrameFormat()         { return mpDfltFrameFormat; }
+    const SwFrameFormat *GetEmptyPageFormat() const { return mpEmptyPageFormat; }
+          SwFrameFormat *GetEmptyPageFormat()       { return mpEmptyPageFormat; }
+    const SwFrameFormat *GetColumnContFormat() const{ return mpColumnContFormat; }
+          SwFrameFormat *GetColumnContFormat()      { return mpColumnContFormat; }
+    const SwCharFormat *GetDfltCharFormat() const { return mpDfltCharFormat;}
+          SwCharFormat *GetDfltCharFormat()       { return mpDfltCharFormat;}
 
     // @return the interface of the management of (auto)styles
     IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; }
 
     // Remove all language dependencies from all existing formats
-    void RemoveAllFmtLanguageDependencies();
+    void RemoveAllFormatLanguageDependencies();
 
-    SwFrmFmt  *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom,
+    SwFrameFormat  *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom,
                           bool bBroadcast = false, bool bAuto = true);
-    void       DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
-    SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const
-        {   return static_cast<SwFrmFmt*>(FindFmtByName( static_cast<SwFmtsBase&>(*mpFrmFmtTbl), rName )); }
+    void       DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false );
+    SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const
+        {   return static_cast<SwFrameFormat*>(FindFormatByName( static_cast<SwFormatsBase&>(*mpFrameFormatTable), rName )); }
 
-    SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom,
+    SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
                            bool bBroadcast = false,
                            bool bAuto = true );
-    void       DelCharFmt(size_t nFmt, bool bBroadcast = false);
-    void       DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
-    SwCharFmt* FindCharFmtByName( const OUString& rName ) const
-        {   return static_cast<SwCharFmt*>(FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName )); }
+    void       DelCharFormat(size_t nFormat, bool bBroadcast = false);
+    void       DelCharFormat(SwCharFormat* pFormat, bool bBroadcast = false);
+    SwCharFormat* FindCharFormatByName( const OUString& rName ) const
+        {   return static_cast<SwCharFormat*>(FindFormatByName( (SwFormatsBase&)*mpCharFormatTable, rName )); }
 
     // Formatcollections (styles)
     // TXT
-    const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
-    SwTxtFmtColl* GetDfltTxtFmtColl() { return mpDfltTxtFmtColl; }
-    const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
-    SwTxtFmtColls *GetTxtFmtColls() { return mpTxtFmtCollTbl; }
-    SwTxtFmtColl *MakeTxtFmtColl( const OUString &rFmtName,
-                                  SwTxtFmtColl *pDerivedFrom,
+    const SwTextFormatColl* GetDfltTextFormatColl() const { return mpDfltTextFormatColl; }
+    SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl; }
+    const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable; }
+    SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable; }
+    SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
+                                  SwTextFormatColl *pDerivedFrom,
                                   bool bBroadcast = false,
                                   bool bAuto = true );
-    SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName,
-                                               SwTxtFmtColl *pDerivedFrom,
+    SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName,
+                                               SwTextFormatColl *pDerivedFrom,
                                                bool bBroadcast = false);
-    void DelTxtFmtColl(size_t nFmt, bool bBroadcast = false);
-    void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
+    void DelTextFormatColl(size_t nFormat, bool bBroadcast = false);
+    void DelTextFormatColl( SwTextFormatColl* pColl, bool bBroadcast = false );
     /** Add 4th optional parameter <bResetListAttrs>.
-     'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
+     'side effect' of <SetTextFormatColl> with <bReset = true> is that the hard
      attributes of the affected text nodes are cleared, except the break
      attribute, the page description attribute and the list style attribute.
      The new parameter <bResetListAttrs> indicates, if the list attributes
      (list style, restart at and restart with) are cleared as well in case
      that <bReset = true> and the paragraph style has a list style attribute set. */
-    bool SetTxtFmtColl(const SwPaM &rRg, SwTxtFmtColl *pFmt,
+    bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat,
                        const bool bReset = true,
                        const bool bResetListAttrs = false);
-    SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const
-        {   return static_cast<SwTxtFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName )); }
+    SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const
+        {   return static_cast<SwTextFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpTextFormatCollTable, rName )); }
 
     void ChkCondColls();
 
-    const SwGrfFmtColl* GetDfltGrfFmtColl() const   { return mpDfltGrfFmtColl; }
-    SwGrfFmtColl* GetDfltGrfFmtColl()  { return mpDfltGrfFmtColl; }
-    const SwGrfFmtColls *GetGrfFmtColls() const     { return mpGrfFmtCollTbl; }
-    SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName,
-                                    SwGrfFmtColl *pDerivedFrom);
-    SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
-        {   return static_cast<SwGrfFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName )); }
+    const SwGrfFormatColl* GetDfltGrfFormatColl() const   { return mpDfltGrfFormatColl; }
+    SwGrfFormatColl* GetDfltGrfFormatColl()  { return mpDfltGrfFormatColl; }
+    const SwGrfFormatColls *GetGrfFormatColls() const     { return mpGrfFormatCollTable; }
+    SwGrfFormatColl *MakeGrfFormatColl(const OUString &rFormatName,
+                                    SwGrfFormatColl *pDerivedFrom);
+    SwGrfFormatColl* FindGrfFormatCollByName( const OUString& rName ) const
+        {   return static_cast<SwGrfFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpGrfFormatCollTable, rName )); }
 
     // Table formatting
-    const SwFrmFmts* GetTblFrmFmts() const  { return mpTblFrmFmtTbl; }
-          SwFrmFmts* GetTblFrmFmts()        { return mpTblFrmFmtTbl; }
-    size_t GetTblFrmFmtCount( bool bUsed ) const;
-    SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed ) const;
-    SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
-    void        DelTblFrmFmt( SwTableFmt* pFmt );
-    SwTableFmt* FindTblFmtByName( const OUString& rName, bool bAll = false ) const;
+    const SwFrameFormats* GetTableFrameFormats() const  { return mpTableFrameFormatTable; }
+          SwFrameFormats* GetTableFrameFormats()        { return mpTableFrameFormatTable; }
+    size_t GetTableFrameFormatCount( bool bUsed ) const;
+    SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const;
+    SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+    void        DelTableFrameFormat( SwTableFormat* pFormat );
+    SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
 
     /** Access to frames.
     Iterate over Flys - forr Basic-Collections. */
     size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
-    SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
+    SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
 
     // Copy formats in own arrays and return them.
-    SwFrmFmt  *CopyFrmFmt ( const SwFrmFmt& );
-    SwCharFmt *CopyCharFmt( const SwCharFmt& );
-    SwTxtFmtColl* CopyTxtColl( const SwTxtFmtColl& rColl );
-    SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl& rColl );
+    SwFrameFormat  *CopyFrameFormat ( const SwFrameFormat& );
+    SwCharFormat *CopyCharFormat( const SwCharFormat& );
+    SwTextFormatColl* CopyTextColl( const SwTextFormatColl& rColl );
+    SwGrfFormatColl* CopyGrfColl( const SwGrfFormatColl& rColl );
 
     // Replace all styles with those from rSource.
     void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true );
@@ -948,19 +948,19 @@ public:
     bool        ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
 
     /** Copy the complete PageDesc - beyond document and "deep"!
-     Optionally copying of PoolFmtId, -HlpId can be prevented. */
+     Optionally copying of PoolFormatId, -HlpId can be prevented. */
     void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
                         bool bCopyPoolIds = true );
 
-    /** Copy header (with contents) from SrcFmt to DestFmt
+    /** Copy header (with contents) from SrcFormat to DestFormat
      (can also be copied into other document). */
-    void CopyHeader( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
-        { CopyPageDescHeaderFooterImpl( true, rSrcFmt, rDestFmt ); }
+    void CopyHeader( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+        { CopyPageDescHeaderFooterImpl( true, rSrcFormat, rDestFormat ); }
 
-    /** Copy footer (with contents) from SrcFmt to DestFmt.
+    /** Copy footer (with contents) from SrcFormat to DestFormat.
      (can also be copied into other document). */
-    void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
-        { CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); }
+    void CopyFooter( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+        { CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); }
 
     // For Reader
     void ChgPageDesc( const OUString & rName, const SwPageDesc& );
@@ -977,7 +977,7 @@ public:
     /** The html import sometimes overwrites the
      page sizes set in the page descriptions. This function is used to
      correct this. */
-    void CheckDefaultPageFmt();
+    void CheckDefaultPageFormat();
 
     // Methods for tables/indices
     static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& );
@@ -1041,7 +1041,7 @@ public:
     sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
 
     // Sort table text.
-    bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
+    bool SortTable(const SwSelBoxes& rBoxes, const SwSortOptions&);
     bool SortText(const SwPaM&, const SwSortOptions&);
 
     // Correct the SwPosition-Objects that are registered with the document
@@ -1118,7 +1118,7 @@ public:
 
     static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos );
 
-    const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; }
+    const SwNumRuleTable& GetNumRuleTable() const { return *mpNumRuleTable; }
 
     /**
        Add numbering rule to document.
@@ -1143,7 +1143,7 @@ public:
     OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
 
     void UpdateNumRule();   // Update all invalids.
-    void ChgNumRuleFmts( const SwNumRule& rRule );
+    void ChgNumRuleFormats( const SwNumRule& rRule );
     bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule,
                         const OUString& rNewRule );
 
@@ -1213,28 +1213,28 @@ public:
        propagation.
        false: do not propagate
     */
-    const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts,  // HEADLINE_NO_BORDER
+    const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts,  // HEADLINE_NO_BORDER
                                 const SwPosition& rPos, sal_uInt16 nRows,
                                 sal_uInt16 nCols, short eAdjust,
-                                const SwTableAutoFmt* pTAFmt = 0,
+                                const SwTableAutoFormat* pTAFormat = 0,
                                 const std::vector<sal_uInt16> *pColArr = 0,
                                 bool bCalledFromShell = false,
                                 bool bNewModel = true );
 
     // If index is in a table, return TableNode, else 0.
-                 SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
-    inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const;
+                 SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx );
+    inline const SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx ) const;
 
     // Create a balanced table out of the selected range.
-    const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER,
+    const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER,
                                 const SwPaM& rRange, sal_Unicode cCh,
                                 short eAdjust,
-                                const SwTableAutoFmt* = 0 );
+                                const SwTableAutoFormat* = 0 );
 
     // text to table conversion - API support
     const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes );
 
-    bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh );
+    bool TableToText( const SwTableNode* pTableNd, sal_Unicode cCh );
 
     // Create columns / rows in table.
     bool InsertCol( const SwCursor& rCursor,
@@ -1252,15 +1252,15 @@ public:
     bool DeleteCol( const SwCursor& rCursor );
 
     // Split / concatenate boxes in table.
-    bool SplitTbl( const SwSelBoxes& rBoxes, bool bVert = true,
+    bool SplitTable( const SwSelBoxes& rBoxes, bool bVert = true,
                        sal_uInt16 nCnt = 1, bool bSameHeight = false );
 
     // @return enum TableMergeErr.
-    sal_uInt16 MergeTbl( SwPaM& rPam );
-    OUString GetUniqueTblName() const;
-    bool IsInsTblFormatNum() const;
-    bool IsInsTblChangeNumFormat() const;
-    bool IsInsTblAlignNum() const;
+    sal_uInt16 MergeTable( SwPaM& rPam );
+    OUString GetUniqueTableName() const;
+    bool IsInsTableFormatNum() const;
+    bool IsInsTableChangeNumFormat() const;
+    bool IsInsTableAlignNum() const;
 
     // From FEShell (for Undo and BModified).
     static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
@@ -1279,34 +1279,34 @@ public:
     void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet );
 
     // AutoFormat for table/table selection.
-    bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
+    bool SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew );
 
     // Query attributes.
-    bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet );
+    bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
 
     void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
 
     bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                 SwTwips nAbsDiff, SwTwips nRelDiff );
-    SwTableBoxFmt* MakeTableBoxFmt();
-    SwTableLineFmt* MakeTableLineFmt();
+    SwTableBoxFormat* MakeTableBoxFormat();
+    SwTableLineFormat* MakeTableLineFormat();
 
     // Check if box has numerical valule. Change format of box if required.
-    void ChkBoxNumFmt( SwTableBox& rAktBox, bool bCallUpdate );
-    void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
+    void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate );
+    void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
     void ClearBoxNumAttrs( const SwNodeIndex& rNode );
     void ClearLineNumAttrs( SwPosition & rPos );
 
-    bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
-                        const SwTable* pCpyTbl = 0, bool bCpyName = false,
+    bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+                        const SwTable* pCpyTable = 0, bool bCpyName = false,
                         bool bCorrPos = false );
 
-    bool UnProtectCells( const OUString& rTblName );
+    bool UnProtectCells( const OUString& rTableName );
     bool UnProtectCells( const SwSelBoxes& rBoxes );
-    bool UnProtectTbls( const SwPaM& rPam );
-    bool HasTblAnyProtection( const SwPosition* pPos,
-                              const OUString* pTblName = 0,
-                              bool* pFullTblProtection = 0 );
+    bool UnProtectTables( const SwPaM& rPam );
+    bool HasTableAnyProtection( const SwPosition* pPos,
+                              const OUString* pTableName = 0,
+                              bool* pFullTableProtection = 0 );
 
     // Split table at baseline position, i.e. create a new table.
     bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0,
@@ -1324,26 +1324,26 @@ public:
     void UpdateAllCharts()          { DoUpdateAllCharts(); }
 
     // Table is renamed and refreshes charts.
-    void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+    void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
 
     // @return the reference in document that is set for name.
-    const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+    const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
 
     // @return RefMark via index - for UNO.
-    const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
+    const SwFormatRefMark* GetRefMark( sal_uInt16 nIndex ) const;
 
     /** @return names of all references that are set in document.
      If array pointer is 0 return only whether a RefMark is set in document. */
     sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
 
     // Insert label. If a FlyFormat is created, return it.
-    SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+    SwFlyFrameFormat* InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
                     const OUString& rNumberingSeparator,
                     const bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
                     const OUString& rCharacterStyle,
                     const bool bCpyBrd = true );
-    SwFlyFrmFmt* InsertDrawLabel(
-        const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator,
+    SwFlyFrameFormat* InsertDrawLabel(
+        const OUString &rText, const OUString& rSeparator, const OUString& rNumberSeparator,
         const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj );
 
     // Query attribute pool.
@@ -1366,10 +1366,10 @@ public:
     static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
                                 const SwNode** ppSttNd = 0 );
     static SwSection* GetCurrSection( const SwPosition& rPos );
-    SwSectionFmts& GetSections() { return *mpSectionFmtTbl; }
-    const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; }
-    SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
-    void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
+    SwSectionFormats& GetSections() { return *mpSectionFormatTable; }
+    const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; }
+    SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom );
+    void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false );
     void UpdateSection(size_t const nSect, SwSectionData &,
             SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false);
     OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
@@ -1426,7 +1426,7 @@ public:
     SwAutoCorrExceptWord* GetAutoCorrExceptWord()       { return mpACEWord; }
     void DeleteAutoCorrExceptWord();
 
-    const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+    const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
 
     // Call into intransparent Basic; expect possible Return String.
     bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
@@ -1457,10 +1457,10 @@ public:
     // Create sub-documents according to given collection.
     // If no collection is given, use chapter styles for 1st level.
     bool GenerateGlobalDoc( const OUString& rPath,
-                                const SwTxtFmtColl* pSplitColl = 0 );
+                                const SwTextFormatColl* pSplitColl = 0 );
     bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 );
     bool GenerateHTMLDoc( const OUString& rPath,
-                                const SwTxtFmtColl* pSplitColl = 0 );
+                                const SwTextFormatColl* pSplitColl = 0 );
     bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 );
 
     //  Compare two documents.
@@ -1469,13 +1469,13 @@ public:
     // Merge two documents.
     long MergeDoc( const SwDoc& rDoc );
 
-    bool IsAutoFmtRedline() const           { return mbIsAutoFmtRedline; }
-    void SetAutoFmtRedline( bool bFlag )    { mbIsAutoFmtRedline = bFlag; }
+    bool IsAutoFormatRedline() const           { return mbIsAutoFormatRedline; }
+    void SetAutoFormatRedline( bool bFlag )    { mbIsAutoFormatRedline = bFlag; }
 
     // For AutoFormat: with Undo/Redlining.
-    void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
+    void SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId,
                                 const SfxItemSet* pSet = 0 );
-    void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& );
+    void SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& );
 
     // Only for SW-textbloxks! Does not pay any attention to layout!
     void ClearDoc();        // Deletes all content!
@@ -1493,8 +1493,8 @@ public:
     void SetOLEObjModified();
 
     // Uno - Interfaces
-    const SwUnoCrsrTbl& GetUnoCrsrTbl() const       { return *mpUnoCrsrTbl; }
-    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
+    const SwUnoCrsrTable& GetUnoCrsrTable() const       { return *mpUnoCrsrTable; }
+    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false );
 
     // FeShell - Interfaces
     // !!! These assume always an existing layout !!!
@@ -1503,10 +1503,10 @@ public:
                         const bool _bSameOnly,
                         const bool _bPosCorr );
 
-    void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew );
-    static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz );
-    void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew );
-    static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz );
+    void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew );
+    static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz );
+    void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew );
+    static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz );
     bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true );
     void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew );
     static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill );
@@ -1531,9 +1531,9 @@ public:
     static sal_uInt16 GetBoxAlign( const SwCursor& rCursor );
     void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false );
 
-    SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    void Unchain( SwFrmFmt &rFmt );
+    SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    void Unchain( SwFrameFormat &rFormat );
 
     // For Copy/Move from FrmShell.
     SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
@@ -1545,7 +1545,7 @@ public:
     SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
     void DeleteExtTextInput( SwExtTextInput* pDel );
     SwExtTextInput* GetExtTextInput( const SwNode& rNd,
-                                sal_Int32 nCntntPos = -1) const;
+                                sal_Int32 nContentPos = -1) const;
     SwExtTextInput* GetExtTextInput() const;
 
     // Interface for access to AutoComplete-List.
@@ -1599,9 +1599,9 @@ public:
                         const bool bValue );
 
     // Change a format undoable.
-    void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
+    void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet);
 
-    void RenameFmt(SwFmt & rFmt, const OUString & sNewName,
+    void RenameFormat(SwFormat & rFormat, const OUString & sNewName,
                    bool bBroadcast = false);
 
     // Change a TOX undoable.
@@ -1671,18 +1671,18 @@ public:
 
 private:
     // Copies master header to left / first one, if necessary - used by ChgPageDesc().
-    void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
+    void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
     // Copies master footer to left / first one, if necessary - used by ChgPageDesc().
-    void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst);
+    void CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst);
 
 };
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
 void ClrContourCache();
 
-inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
+inline const SwTableNode* SwDoc::IsIdxInTable( const SwNodeIndex& rIdx ) const
 {
-    return const_cast<SwDoc*>(this)->IsIdxInTbl( rIdx );
+    return const_cast<SwDoc*>(this)->IsIdxInTable( rIdx );
 }
 
 inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
@@ -1704,7 +1704,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
         mbAllOLENotify = false;
 }
 
-bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
+bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFields * pSrtLst );
 
 #endif  //_DOC_HXX
 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c671a695b921..2d2871f37df5 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -48,13 +48,13 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #include <numrule.hxx>
 
 /** provides some methods for generic operations on lists that contain
-SwFmt* subclasses. */
-class SwFmtsBase
+SwFormat* subclasses. */
+class SwFormatsBase
 {
 public:
-    virtual size_t GetFmtCount() const = 0;
-    virtual SwFmt* GetFmt(size_t idx) const = 0;
-    virtual ~SwFmtsBase() {};
+    virtual size_t GetFormatCount() const = 0;
+    virtual SwFormat* GetFormat(size_t idx) const = 0;
+    virtual ~SwFormatsBase() {};
 };
 
 template<typename Value>
@@ -112,86 +112,86 @@ public:
 };
 
 template<typename Value>
-class SwFmtsModifyBase : public SwVectorModifyBase<Value>, public SwFmtsBase
+class SwFormatsModifyBase : public SwVectorModifyBase<Value>, public SwFormatsBase
 {
 protected:
-    SwFmtsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
+    SwFormatsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
             policy = SwVectorModifyBase<Value>::DestructorPolicy::FreeElements)
         : SwVectorModifyBase<Value>(policy) {}
 
 public:
-    virtual size_t GetFmtCount() const SAL_OVERRIDE
+    virtual size_t GetFormatCount() const SAL_OVERRIDE
         { return std::vector<Value>::size(); }
 
-    virtual Value GetFmt(size_t idx) const SAL_OVERRIDE
+    virtual Value GetFormat(size_t idx) const SAL_OVERRIDE
         { return std::vector<Value>::operator[](idx); }
 
-    inline size_t GetPos(const SwFmt *p) const
-        { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFmt*>( p ) ) ); }
-    inline bool Contains(const SwFmt *p) const {
-        Value p2 = dynamic_cast<Value>(const_cast<SwFmt*>(p));
+    inline size_t GetPos(const SwFormat *p) const
+        { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFormat*>( p ) ) ); }
+    inline bool Contains(const SwFormat *p) const {
+        Value p2 = dynamic_cast<Value>(const_cast<SwFormat*>(p));
         return p2 != nullptr && SwVectorModifyBase<Value>::Contains(p2);
     }
 };
 
-class SwGrfFmtColls : public SwFmtsModifyBase<SwGrfFmtColl*>
+class SwGrfFormatColls : public SwFormatsModifyBase<SwGrfFormatColl*>
 {
 public:
-    SwGrfFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+    SwGrfFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
 };
 
 /// Specific frame formats (frames, DrawObjects).
-class SW_DLLPUBLIC SwFrmFmts : public SwFmtsModifyBase<SwFrmFmt*>
+class SW_DLLPUBLIC SwFrameFormats : public SwFormatsModifyBase<SwFrameFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter, const char* pName) const;
 };
 
-class SwCharFmts : public SwFmtsModifyBase<SwCharFmt*>
+class SwCharFormats : public SwFormatsModifyBase<SwCharFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwTxtFmtColls : public SwFmtsModifyBase<SwTxtFmtColl*>
+class SwTextFormatColls : public SwFormatsModifyBase<SwTextFormatColl*>
 {
 public:
-    SwTxtFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+    SwTextFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 /// Array of Undo-history.
-class SW_DLLPUBLIC SwSectionFmts : public SwFmtsModifyBase<SwSectionFmt*>
+class SW_DLLPUBLIC SwSectionFormats : public SwFormatsModifyBase<SwSectionFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwFldTypes : public SwVectorModifyBase<SwFieldType*> {
+class SwFieldTypes : public SwVectorModifyBase<SwFieldType*> {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {};
 
-class SW_DLLPUBLIC SwNumRuleTbl : public SwVectorModifyBase<SwNumRule*> {
+class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-struct CompareSwRedlineTbl
+struct CompareSwRedlineTable
 {
     bool operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const;
 };
-class _SwRedlineTbl
-    : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTbl,
+class _SwRedlineTable
+    : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTable,
                 o3tl::find_partialorder_ptrequals>
 {
 public:
-    ~_SwRedlineTbl();
+    ~_SwRedlineTable();
 };
 
-class SwRedlineTbl : private _SwRedlineTbl
+class SwRedlineTable : private _SwRedlineTable
 {
 public:
     bool Contains(const SwRangeRedline* p) const { return find(const_cast<SwRangeRedline* const>(p)) != end(); }
@@ -221,30 +221,30 @@ public:
     /**
      Find the redline at the given position.
 
-     @param tableIndex position in SwRedlineTbl to start searching at, will be updated with the index of the returned
+     @param tableIndex position in SwRedlineTable to start searching at, will be updated with the index of the returned
                        redline (or the next redline after the given position if not found)
      @param next true: redline starts at position and ends after, false: redline starts before position and ends at or after
     */
     const SwRangeRedline* FindAtPosition( const SwPosition& startPosition, sal_uInt16& tableIndex, bool next = true ) const;
 
-    using _SwRedlineTbl::const_iterator;
-    using _SwRedlineTbl::begin;
-    using _SwRedlineTbl::end;
-    using _SwRedlineTbl::size;
-    using _SwRedlineTbl::size_type;
-    using _SwRedlineTbl::operator[];
-    using _SwRedlineTbl::empty;
-    using _SwRedlineTbl::Resort;
+    using _SwRedlineTable::const_iterator;
+    using _SwRedlineTable::begin;
+    using _SwRedlineTable::end;
+    using _SwRedlineTable::size;
+    using _SwRedlineTable::size_type;
+    using _SwRedlineTable::operator[];
+    using _SwRedlineTable::empty;
+    using _SwRedlineTable::Resort;
 };
 
 /// Table that holds 'extra' redlines, such as 'table row insert\delete', 'paragraph moves' etc...
-class SwExtraRedlineTbl
+class SwExtraRedlineTable
 {
 private:
     std::vector<SwExtraRedline*>    m_aExtraRedlines;
 
 public:
-    ~SwExtraRedlineTbl();
+    ~SwExtraRedlineTable();
 
     bool Insert( SwExtraRedline* p );
 
@@ -262,10 +262,10 @@ public:
     bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
 };
 
-class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> {
+class SwUnoCrsrTable : public std::set<SwUnoCrsr*> {
 public:
     /// the destructor will free all objects still in the set
-    ~SwUnoCrsrTbl();
+    ~SwUnoCrsrTable();
 };
 
 typedef std::vector<SwOLENode*> SwOLENodes;
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index 4a7a88364ca1..fd53d80bfcbf 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -24,7 +24,7 @@
 
 struct SW_DLLPUBLIC SwDocStat
 {
-    sal_uInt16          nTbl;
+    sal_uInt16          nTable;
     sal_uInt16          nGrf;
     sal_uInt16          nOLE;
     sal_uLong           nPage;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index acf16d94aac3..1298cc618467 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -32,9 +32,9 @@
 class SwDoc;
 class SwDocStyleSheetPool;
 class SwPageDesc;
-class SwCharFmt;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwCharFormat;
+class SwTextFormatColl;
+class SwFrameFormat;
 class SwNumRule;
 
 // Temporary StyleSheet.
@@ -43,9 +43,9 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
     friend class SwDocStyleSheetPool;
     friend class SwStyleSheetIterator;
 
-    SwCharFmt*          pCharFmt;
-    SwTxtFmtColl*       pColl;
-    SwFrmFmt*           pFrmFmt;
+    SwCharFormat*          pCharFormat;
+    SwTextFormatColl*       pColl;
+    SwFrameFormat*           pFrameFormat;
     const SwPageDesc*   pDesc;
     const SwNumRule*    pNumRule;
 
@@ -125,9 +125,9 @@ public:
     virtual OUString        GetDescription() SAL_OVERRIDE;
     virtual OUString        GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
 
-    SwCharFmt*              GetCharFmt();
-    SwTxtFmtColl*           GetCollection();
-    SwFrmFmt*               GetFrmFmt();
+    SwCharFormat*              GetCharFormat();
+    SwTextFormatColl*           GetCollection();
+    SwFrameFormat*               GetFrameFormat();
     const SwPageDesc*       GetPageDesc();
     const SwNumRule*        GetNumRule();
     void                    SetNumRule(const SwNumRule& rRule);
@@ -139,14 +139,14 @@ public:
 class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
 {
     // Local helper class.
-    class SwPoolFmtList
+    class SwPoolFormatList
     {
         std::vector<OUString> maImpl;
         typedef std::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash;
         UniqueHash maUnique;
         void rehash();
     public:
-        SwPoolFmtList() {}
+        SwPoolFormatList() {}
         void Append( char cChar, const OUString& rStr );
         void clear() { maImpl.clear(); maUnique.clear(); }
         size_t size() { return maImpl.size(); }
@@ -158,7 +158,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
 
     rtl::Reference< SwDocStyleSheet > mxIterSheet;
     rtl::Reference< SwDocStyleSheet > mxStyleSheet;
-    SwPoolFmtList       aLst;
+    SwPoolFormatList       aLst;
     sal_uInt32          nLastPos;
     bool                bFirstCalled;
 
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5bb92646b171..f7d8cf46dd94 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -27,12 +27,12 @@
 #include "fldbas.hxx"
 #include "numrule.hxx"
 
-class _SetGetExpFlds;
-class SwTxtFld;
+class _SetGetExpFields;
+class SwTextField;
 class SwFrm;
 class OutlinerParaObject;
 class SwTextAPIObject;
-class SwFmtFld;
+class SwFormatField;
 
 enum SwAuthorFormat
 {
@@ -137,10 +137,10 @@ class SwPageNumberFieldType : public SwFieldType
 public:
     SwPageNumberFieldType();
 
-    OUString Expand( sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber,
+    OUString Expand( sal_uInt32 nFormat, short nOff, sal_uInt16 const nPageNumber,
                      sal_uInt16 const nMaxPage, const OUString& ) const;
     void ChangeExpansion( SwDoc* pDoc,
-                            bool bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+                            bool bVirtPageNum, const sal_Int16* pNumFormat = 0 );
     virtual SwFieldType* Copy() const SAL_OVERRIDE;
 };
 
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageNumberField : public SwField
 
 public:
     SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM,
-                      sal_uInt32 nFmt = 0, short nOff = 0,
+                      sal_uInt32 nFormat = 0, short nOff = 0,
                       sal_uInt16 const nPageNumber = 0,
                       sal_uInt16 const nMaxPage = 0);
 
@@ -191,7 +191,7 @@ class SwAuthorField : public SwField
     OUString aContent;
 
 public:
-    SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
+    SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -218,7 +218,7 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
     OUString aContent;
 
 public:
-    SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
+    SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -243,7 +243,7 @@ public:
 class SW_DLLPUBLIC SwTemplNameField : public SwField
 {
 public:
-    SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
+    SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -259,10 +259,10 @@ class SwDocStatFieldType : public SwFieldType
 
 public:
     SwDocStatFieldType(SwDoc*);
-    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const;
+    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    inline void             SetNumFormat( sal_Int16 eFmt )  { nNumberingType = eFmt; }
+    inline void             SetNumFormat( sal_Int16 eFormat )  { nNumberingType = eFormat; }
 };
 
 class SW_DLLPUBLIC SwDocStatField : public SwField
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDocStatField : public SwField
 
 public:
     SwDocStatField( SwDocStatFieldType*,
-                    sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0);
+                    sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0);
 
     void ChangeExpansion( const SwFrm* pFrm );
 
@@ -284,11 +284,11 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-class SwHiddenTxtFieldType : public SwFieldType
+class SwHiddenTextFieldType : public SwFieldType
 {
     bool bHidden;
 public:
-    SwHiddenTxtFieldType(bool bSetHidden = true);
+    SwHiddenTextFieldType(bool bSetHidden = true);
 
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
@@ -296,10 +296,10 @@ public:
     inline bool             GetHiddenFlag() const { return bHidden; }
 };
 
-class SwHiddenTxtField : public SwField
+class SwHiddenTextField : public SwField
 {
-    OUString aTRUETxt;         ///< Text if condition true.
-    OUString aFALSETxt;        ///< If condition false.
+    OUString aTRUEText;         ///< Text if condition true.
+    OUString aFALSEText;        ///< If condition false.
     OUString aContent;         ///< Evaluated DB-text.
 
     OUString aCond;            ///< Condition.
@@ -313,14 +313,14 @@ class SwHiddenTxtField : public SwField
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
 public:
-    SwHiddenTxtField( SwHiddenTxtFieldType*,
+    SwHiddenTextField( SwHiddenTextFieldType*,
                      bool   bConditional,
                      const OUString& rCond,
-                     const OUString& rTxt,
+                     const OUString& rText,
                      bool   bHidden  = false,
                      sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
 
-    SwHiddenTxtField( SwHiddenTxtFieldType*,
+    SwHiddenTextField( SwHiddenTextFieldType*,
                       const OUString& rCond,
                       const OUString& rTrue,
                       const OUString& rFalse,
@@ -400,7 +400,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField
 public:
     /// Direct input, delete old value.
     SwMacroField( SwMacroFieldType*, const OUString& rLibAndName,
-                  const OUString& rTxt);
+                  const OUString& rText);
 
     inline OUString  GetMacro() const { return aMacro; }
     OUString         GetLibName() const;
@@ -443,7 +443,7 @@ public:
 
 class SW_DLLPUBLIC SwPostItField : public SwField
 {
-    OUString sTxt;
+    OUString sText;
     OUString sAuthor;
     OUString sInitials; ///< Initials of the author.
     OUString sName;     ///< Name of the comment.
@@ -454,7 +454,7 @@ class SW_DLLPUBLIC SwPostItField : public SwField
 public:
     SwPostItField( SwPostItFieldType*,
                    const OUString& rAuthor,
-                   const OUString& rTxt,
+                   const OUString& rText,
                    const OUString& rInitials,
                    const OUString& rName,
                    const DateTime& rDate);
@@ -474,7 +474,7 @@ public:
     /// Text
     virtual OUString   GetPar2() const SAL_OVERRIDE;
     virtual void            SetPar2(const OUString& rStr) SAL_OVERRIDE;
-    const OUString&         GetTxt() const { return sTxt; }
+    const OUString&         GetText() const { return sText; }
     const OUString&         GetInitials() const { return sInitials;}
     void                    SetName(const OUString& rStr);
     const OUString&         GetName() const { return sName;}
@@ -508,8 +508,8 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
     virtual SwField*        Copy() const SAL_OVERRIDE;
 
 public:
-    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0);
-    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0);
+    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat=0);
+    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0);
 
     virtual void            SetSubType(sal_uInt16) SAL_OVERRIDE;
     virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
@@ -541,7 +541,7 @@ class SwExtUserField : public SwField
     sal_uInt16  nType;
 
 public:
-    SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0);
+    SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat=0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -598,30 +598,30 @@ class SwRefPageGetFieldType : public SwFieldType
     SwDoc*          pDoc;
     sal_Int16       nNumberingType;
 
-    void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
+    void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList );
 protected:
     /// overwritten to update all RefPageGet fields
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
 public:
     SwRefPageGetFieldType( SwDoc* pDoc );
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
-    bool MakeSetList( _SetGetExpFlds& rTmpLst );
+    bool MakeSetList( _SetGetExpFields& rTmpLst );
     SwDoc*  GetDoc() const                  { return pDoc; }
 };
 
 // Query relative page numbering.
 class SwRefPageGetField : public SwField
 {
-    OUString sTxt;
+    OUString sText;
 public:
-    SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
+    SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFormat );
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
-    void SetText( const OUString& rTxt )      { sTxt = rTxt; }
+    void SetText( const OUString& rText )      { sText = rText; }
 
-    void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
+    void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField );
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
@@ -636,12 +636,12 @@ public:
     SwJumpEditFieldType( SwDoc* pDoc );
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    SwCharFmt* GetCharFmt();
+    SwCharFormat* GetCharFormat();
 };
 
 class SwJumpEditField : public SwField
 {
-    OUString sTxt, sHelp;
+    OUString sText, sHelp;
 public:
     SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
                      const OUString& sText, const OUString& sHelp );
@@ -657,8 +657,8 @@ public:
     virtual OUString  GetPar2() const SAL_OVERRIDE;
     virtual void    SetPar2(const OUString& rStr) SAL_OVERRIDE;
 
-    SwCharFmt* GetCharFmt() const
-        { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFmt(); }
+    SwCharFormat* GetCharFormat() const
+        { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); }
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c95e682dd85f..c80d81d32642 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -60,35 +60,35 @@ class SwDBManager;
 struct SwDocStat;
 class SwAutoCompleteWord;
 
-class SwFmtRefMark;
+class SwFormatRefMark;
 
 class SwNumRule;
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwGrfNode;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
-class SwFrmFmt;
-class SwCharFmt;
+class SwFrameFormat;
+class SwCharFormat;
 class SwExtTextInput;
 class Graphic;
 class GraphicObject;
-class SwFmtINetFmt;
+class SwFormatINetFormat;
 class SwTable;
 class SwTextBlocks;
-class SwFmtFtn;
+class SwFormatFootnote;
 class SwSection;
 class SwSectionData;
-class SwSectionFmt;
-class SwTableAutoFmt;
+class SwSectionFormat;
+class SwTableAutoFormat;
 class SwPageDesc;
-class SwTxtINetFmt;
-class SwSeqFldList;
+class SwTextINetFormat;
+class SwSeqFieldList;
 class SwGlblDocContent;
 class SwGlblDocContents;
 class SwRangeRedline;
 class SwRedlineData;
-class SwFtnInfo;
+class SwFootnoteInfo;
 class SwEndNoteInfo;
 class SwLineNumberInfo;
 class SwAuthEntry;
@@ -119,10 +119,10 @@ namespace sw {
 struct SwGetINetAttr
 {
     OUString sText;
-    const SwTxtINetFmt& rINetAttr;
+    const SwTextINetFormat& rINetAttr;
 
-    SwGetINetAttr( const OUString& rTxt, const SwTxtINetFmt& rAttr )
-        : sText( rTxt ), rINetAttr( rAttr )
+    SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr )
+        : sText( rText ), rINetAttr( rAttr )
     {}
 };
 typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
@@ -133,13 +133,13 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
 #define CNT_OLE 0x0010
 
 // Test USHORT for a defined form of content.
-#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
+#define CNT_HasText(USH) ((USH)&CNT_TXT)
 #define CNT_HasGrf(USH) ((USH)&CNT_GRF)
 #define CNT_HasOLE(USH) ((USH)&CNT_OLE)
 
 class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
 {
-    static SvxSwAutoFmtFlags* s_pAutoFmtFlags;
+    static SvxSwAutoFormatFlags* s_pAutoFormatFlags;
 
     /// For the private methods DelRange and those of AutoCorrect.
     friend class SwAutoFormat;
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
     /// For the PamCorrAbs/-Rel methods.
     friend class SwUndo;
 
-    SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
+    SAL_DLLPRIVATE SfxPoolItem& _GetChrFormat( SfxPoolItem& ) const;
 
     /** Returns pointer to a SwGrfNode
      that will be used by GetGraphic() and GetGraphicSize(). */
@@ -156,9 +156,9 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
 
     SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 );
 
-    SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
+    SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet );
 
-    using SwViewShell::UpdateFlds;
+    using SwViewShell::UpdateFields;
     using SwModify::GetInfo;
 
 public:
@@ -207,8 +207,8 @@ public:
     bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
 
     long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
-    bool AppendTxtNode();
-    void AutoFmtBySplitNode();
+    bool AppendTextNode();
+    void AutoFormatBySplitNode();
 
     /** If cursor is in a INetAttribute it will be deleted completely
      including the descriptive text (needed at drag & drop). */
@@ -216,7 +216,7 @@ public:
 
     /** If Cursor is at the end of a character style in which the DontExpand-flag
      is not yet set, the latter will be set (==> return TRUE). */
-    bool DontExpandFmt();
+    bool DontExpandFormat();
 
     /** Apply / remove attributes.
      @return attributes in required AttributeSet.
@@ -272,7 +272,7 @@ public:
     void SetDefault( const SfxPoolItem& );
 
     /// Query default attribute of document.
-    const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+    const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
 
     void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = NULL );
     void GCAttr();
@@ -284,17 +284,17 @@ public:
     sal_uInt16 GetCurLang() const;
 
     /// TABLE
-    size_t GetTblFrmFmtCount( bool bUsed = false ) const;
-    SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed = false ) const;
-    OUString GetUniqueTblName() const;
+    size_t GetTableFrameFormatCount( bool bUsed = false ) const;
+    SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const;
+    OUString GetUniqueTableName() const;
 
     /// CHAR
-    sal_uInt16 GetCharFmtCount() const;
-    SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const;
-    SwCharFmt* GetCurCharFmt() const;
-    void FillByEx(SwCharFmt*, bool bReset = false);
-    SwCharFmt* MakeCharFmt( const OUString& rName, SwCharFmt* pDerivedFrom = 0 );
-    SwCharFmt* FindCharFmtByName( const OUString& rName ) const;
+    sal_uInt16 GetCharFormatCount() const;
+    SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const;
+    SwCharFormat* GetCurCharFormat() const;
+    void FillByEx(SwCharFormat*, bool bReset = false);
+    SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = 0 );
+    SwCharFormat* FindCharFormatByName( const OUString& rName ) const;
 
     /* FormatCollections (new) - Explaining the general naming pattern:
      * GetXXXCount() returns the count of xxx in the document.
@@ -307,20 +307,20 @@ public:
      */
 
     // TXT
-    SwTxtFmtColl& GetDfltTxtFmtColl() const;
-    sal_uInt16 GetTxtFmtCollCount() const;
-    SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
+    SwTextFormatColl& GetDfltTextFormatColl() const;
+    sal_uInt16 GetTextFormatCollCount() const;
+    SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const;
     /**
      * Get the named paragraph format of the current selection.
      *
-     * @see GetPaMTxtFmtColl()
+     * @see GetPaMTextFormatColl()
      *
      * @return the named paragraph format of the first node that contains one.
      * Nodes are sort by order of appearance in the selections ;
      * selections are sort by their order of creation
      * (last created selection first, oldest selection at last).
      */
-    SwTxtFmtColl* GetCurTxtFmtColl() const;
+    SwTextFormatColl* GetCurTextFormatColl() const;
     /**
      * Get the named paragraph format of the selection(s) described by a SwPaM.
      *
@@ -329,21 +329,21 @@ public:
      *
      * @return the named paragraph format of the first node that contains one.
      */
-    SwTxtFmtColl* GetPaMTxtFmtColl( SwPaM* pPaM ) const;
+    SwTextFormatColl* GetPaMTextFormatColl( SwPaM* pPaM ) const;
 
     // #i62675#
-    /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
-    void SetTxtFmtColl(SwTxtFmtColl*, const bool bResetListAttrs = false);
-    SwTxtFmtColl *MakeTxtFmtColl(const OUString &rFmtCollName,
-        SwTxtFmtColl *pDerivedFrom = 0);
-    void FillByEx(SwTxtFmtColl*, bool bReset = false);
-    SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const;
+    /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)>
+    void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false);
+    SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName,
+        SwTextFormatColl *pDerivedFrom = 0);
+    void FillByEx(SwTextFormatColl*, bool bReset = false);
+    SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const;
 
     /// @return "Auto-Collection" with given Id. If it does not exist create it.
-    SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId );
+    SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId );
 
     /// @return required automatic format base class.
-    SwFmt* GetFmtFromPool( sal_uInt16 nId );
+    SwFormat* GetFormatFromPool( sal_uInt16 nId );
 
     /// @return required automatic page style.
     SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
@@ -352,21 +352,21 @@ public:
     bool IsUsed( const SwModify& ) const;
 
     /// @return required automatic format.
-    SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
-        { return static_cast<SwFrmFmt*>(SwEditShell::GetFmtFromPool( nId )); }
-    SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
-        { return static_cast<SwCharFmt*>(SwEditShell::GetFmtFromPool( nId )); }
+    SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId )
+        { return static_cast<SwFrameFormat*>(SwEditShell::GetFormatFromPool( nId )); }
+    SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId )
+        { return static_cast<SwCharFormat*>(SwEditShell::GetFormatFromPool( nId )); }
 
     void Insert2(SwField&, const bool bForceExpandHints = false);
 
-    void UpdateFlds( SwField & );   ///< One single field.
+    void UpdateFields( SwField & );   ///< One single field.
 
-    sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
-    SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
-    SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const;
+    sal_uInt16 GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+    SwFieldType* GetFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+    SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
 
-    void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
-    void RemoveFldType(sal_uInt16 nResId, const OUString& rName);
+    void RemoveFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
+    void RemoveFieldType(sal_uInt16 nResId, const OUString& rName);
 
     void FieldToText( SwFieldType* pType );
 
@@ -385,17 +385,17 @@ public:
 
     /// Check whether DB fields point to an available data source and returns it.
     bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const;
-    void UpdateExpFlds(bool bCloseDB = false);///< only every expression fields update
-    void LockExpFlds();
-    void UnlockExpFlds();
+    void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update
+    void LockExpFields();
+    void UnlockExpFields();
 
-    SwFldUpdateFlags GetFldUpdateFlags(bool bDocSettings = false) const;
-    void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
+    SwFieldUpdateFlags GetFieldUpdateFlags(bool bDocSettings = false) const;
+    void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags );
 
     /// For evaluation of DB fields (new DB-manager).
     SwDBManager* GetDBManager() const;
 
-    SwFieldType* InsertFldType(const SwFieldType &);
+    SwFieldType* InsertFieldType(const SwFieldType &);
 
     /// Changes in document?
     bool IsModified() const;
@@ -519,7 +519,7 @@ public:
     bool SelectionHasBullet() const;
 
     OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
-    void ChgNumRuleFmts( const SwNumRule& rRule );
+    void ChgNumRuleFormats( const SwNumRule& rRule );
 
     /// Set (and query if) a numbering with StartFlag starts at current PointPos.
     void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL );
@@ -614,7 +614,7 @@ public:
      else give a rap on the knuckles!
      If a string-ptr != 0 return the respective name. */
     void GetGrfNms( OUString* pGrfName, OUString* pFltName,
-                    const SwFlyFrmFmt* = 0 ) const;
+                    const SwFlyFrameFormat* = 0 ) const;
 
     /// Re-read if graphic is not ok. Current graphic is replaced by the new one.
     void ReRead( const OUString& rGrfName, const OUString& rFltName,
@@ -627,14 +627,14 @@ public:
     // #i73788#
     /// Remove default parameter, because method always called this default value.
     Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
-    const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
+    const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
 
     /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode
      (and mark is neither set not pointint to same ClientObject)
      else give rap on the knuckles. */
     svt::EmbeddedObjectRef&  GetOLEObject() const;
 
-    /// Is there an OLEObject with this name (SwFmt)?
+    /// Is there an OLEObject with this name (SwFormat)?
     bool HasOLEObj( const OUString &rName ) const;
 
     /// @return pointer to the data of the chart in which Cursr is.
@@ -653,13 +653,13 @@ public:
      including styles. */
     sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName,
                          const OUString& rShortName, bool bSaveRelFile = false,
-                         const OUString* pOnlyTxt=0 );
+                         const OUString* pOnlyText=0 );
 
     /// Save complete content of doc as glossary.
     sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName,
                             const OUString& rShortName,
                             bool bSaveRelFile = false,
-                            bool bOnlyTxt = false );
+                            bool bOnlyText = false );
 
     // Linguistics...
     /// Save selections.
@@ -675,35 +675,35 @@ public:
     /// For Inserting SoftHyphen. Position is offset within the syllabificated word.
     static void InsertSoftHyph( const sal_Int32 nHyphPos );
 
-    const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
+    const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts,  ///< ALL_TBL_INS_ATTR
                                 sal_uInt16 nRows, sal_uInt16 nCols,
                                 sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
-                                const SwTableAutoFmt* pTAFmt = 0 );
+                                const SwTableAutoFormat* pTAFormat = 0 );
 
-    void InsertDDETable( const SwInsertTableOptions& rInsTblOpts,  ///< HEADLINE_NO_BORDER
+    void InsertDDETable( const SwInsertTableOptions& rInsTableOpts,  ///< HEADLINE_NO_BORDER
                          SwDDEFieldType* pDDEType,
                          sal_uInt16 nRows, sal_uInt16 nCols,
                          sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL );
 
     void UpdateTable();
-    void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+    void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
 
-    SwFrmFmt *GetTableFmt();
-    bool TextToTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
+    SwFrameFormat *GetTableFormat();
+    bool TextToTable( const SwInsertTableOptions& rInsTableOpts,  ///< ALL_TBL_INS_ATTR
                       sal_Unicode cCh,
                       sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
-                      const SwTableAutoFmt* pTAFmt = 0 );
+                      const SwTableAutoFormat* pTAFormat = 0 );
     bool TableToText( sal_Unicode cCh );
     bool IsTextToTableAvailable() const;
 
-    bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
-    void SetTblBoxFormulaAttrs( const SfxItemSet& rSet );
+    bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const;
+    void SetTableBoxFormulaAttrs( const SfxItemSet& rSet );
 
     bool IsTableBoxTextFormat() const;
     OUString GetTableBoxText() const;
 
-    TblChgMode GetTblChgMode() const;
-    void SetTblChgMode( TblChgMode eMode );
+    TableChgMode GetTableChgMode() const;
+    void SetTableChgMode( TableChgMode eMode );
 
     /// Split table at cursor position.
     bool SplitTable( sal_uInt16 eMode );
@@ -766,7 +766,7 @@ public:
     void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd );
 
     /// @return reference set in document according to given name.
-    const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+    const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
 
     /**  @return names of all references set in document.
       If ArrayPointer == 0 then return only whether a RefMark is set in document. */
@@ -778,20 +778,20 @@ public:
     bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord );
 
     /// Set our styles according to the respective rules.
-    void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
+    void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = 0 );
 
-    static SvxSwAutoFmtFlags* GetAutoFmtFlags();
-    static void SetAutoFmtFlags(SvxSwAutoFmtFlags *);
+    static SvxSwAutoFormatFlags* GetAutoFormatFlags();
+    static void SetAutoFormatFlags(SvxSwAutoFormatFlags *);
 
     /// Calculates selection.
     OUString Calculate();
 
-    bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr,
+    bool InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr,
                     bool bKeepSelection = false );
     void GetINetAttrs( SwGetINetAttrs& rArr );
 
-    OUString GetDropTxt( const sal_Int32 nChars ) const;
-    void   ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL );
+    OUString GetDropText( const sal_Int32 nChars ) const;
+    void   ReplaceDropText( const OUString &rStr, SwPaM* pPaM = NULL );
 
     /** May an outline be moved or copied?
      Check whether it's in text body, not in table, and not read-only (move). */
@@ -801,11 +801,11 @@ public:
     sal_uInt16 GetLineCount( bool bActPos = true );
 
     /// Query and set footnote-text/number. Set.. to current SSelection!
-    bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
-    bool SetCurFtn( const SwFmtFtn& rFillFtn );
-    bool HasFtns( bool bEndNotes = false ) const;
+    bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = 0 );
+    bool SetCurFootnote( const SwFormatFootnote& rFillFootnote );
+    bool HasFootnotes( bool bEndNotes = false ) const;
 
-    size_t GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
+    size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false );
     /// @return list of all footnotes and their first portions of text.
 
     SwSection const* InsertSection(
@@ -820,10 +820,10 @@ public:
      and not an inner one. */
     SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 );
 
-    size_t GetSectionFmtCount() const;
-    size_t GetSectionFmtPos(const SwSectionFmt&) const;
-    const SwSectionFmt& GetSectionFmt(size_t nFmt) const;
-    void DelSectionFmt( size_t nFmt);
+    size_t GetSectionFormatCount() const;
+    size_t GetSectionFormatPos(const SwSectionFormat&) const;
+    const SwSectionFormat& GetSectionFormat(size_t nFormat) const;
+    void DelSectionFormat( size_t nFormat);
     void UpdateSection( size_t const nSect, SwSectionData &,
             SfxItemSet const*const  = 0);
     bool IsAnySectionInDoc( bool bChkReadOnly = false,
@@ -833,7 +833,7 @@ public:
     OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
 
     /// Set attributes.
-    void SetSectionAttr(const SfxItemSet& rSet, SwSectionFmt* pSectFmt = 0);
+    void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = 0);
 
     /** Search inside the cursor selection for full selected sections.
      if any part of section in the selection @return 0.
@@ -911,8 +911,8 @@ public:
     long MergeDoc( const SwDoc& rDoc );
 
     /// Footnote attributes global to document.
-    const SwFtnInfo& GetFtnInfo() const;
-    void  SetFtnInfo(const SwFtnInfo& rInfo);
+    const SwFootnoteInfo& GetFootnoteInfo() const;
+    void  SetFootnoteInfo(const SwFootnoteInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const;
     void  SetEndNoteInfo(const SwEndNoteInfo& rInfo);
 
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index e58953cc7380..149ba2b94dba 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -26,47 +26,47 @@
 #include <vector>
 
 class SfxPoolItem;
-class SwTxtNode;
+class SwTextNode;
 class SwFrm;
 struct SwPosition;
-class SwTxtFld;
+class SwTextField;
 class SwDoc;
-class SwFmtFld;
-class _SetGetExpFlds;
+class SwFormatField;
+class _SetGetExpFields;
 class SwEditShell;
 
-/// Forward declaration: get "BodyTxtNode" for exp.fld in Fly's headers/footers/footnotes.
-const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
+/// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes.
+const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos,
                                  const SwFrm& rFrm );
 
 OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false);
 
-struct _SeqFldLstElem
+struct _SeqFieldLstElem
 {
     OUString sDlgEntry;
     sal_uInt16 nSeqNo;
 
-    _SeqFldLstElem( const OUString& rStr, sal_uInt16 nNo )
+    _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo )
         : sDlgEntry( rStr ), nSeqNo( nNo )
     {}
 };
 
-class SW_DLLPUBLIC SwSeqFldList
+class SW_DLLPUBLIC SwSeqFieldList
 {
-    std::vector<_SeqFldLstElem*> maData;
+    std::vector<_SeqFieldLstElem*> maData;
 public:
-    ~SwSeqFldList()
+    ~SwSeqFieldList()
     {
-        for( std::vector<_SeqFldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
+        for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
             delete *it;
     }
 
-    bool InsertSort(_SeqFldLstElem* pNew);
-    bool SeekEntry(const _SeqFldLstElem& rNew, size_t* pPos) const;
+    bool InsertSort(_SeqFieldLstElem* pNew);
+    bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const;
 
     size_t Count() { return maData.size(); }
-    _SeqFldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
-    const _SeqFldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
+    _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
+    const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
     void Clear() { maData.clear(); }
 };
 
@@ -85,7 +85,7 @@ protected:
 class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
 {
     OUString        sExpand;
-    bool            bIsInBodyTxt;
+    bool            bIsInBodyText;
     sal_uInt16          nSubType;
 
     bool            bLateInitialization; // #i82544#
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
 
 public:
     SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
-                   sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0);
+                   sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFormat = 0);
 
     virtual void                SetValue( const double& rVal ) SAL_OVERRIDE;
     virtual void                SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
@@ -104,14 +104,14 @@ public:
     inline void                 ChgExpStr(const OUString& rExpand);
 
     /// Called by formatting.
-    inline bool                 IsInBodyTxt() const;
+    inline bool                 IsInBodyText() const;
 
-    /// Set by UpdateExpFlds where node position is known.
-    inline void                 ChgBodyTxtFlag( bool bIsInBody );
+    /// Set by UpdateExpFields where node position is known.
+    inline void                 ChgBodyTextFlag( bool bIsInBody );
 
     /** For fields in header/footer/footnotes/flys:
      Only called by formatting!! */
-    void                        ChangeExpansion( const SwFrm&, const SwTxtFld& );
+    void                        ChangeExpansion( const SwFrm&, const SwTextField& );
 
     virtual OUString    GetFieldName() const SAL_OVERRIDE;
 
@@ -124,7 +124,7 @@ public:
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 
-    static sal_Int32    GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0);
+    static sal_Int32    GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0);
     // #i82544#
     void                SetLateInitialization() { bLateInitialization = true;}
 };
@@ -136,12 +136,12 @@ inline OUString SwGetExpField::GetExpStr() const
     { return sExpand;   }
 
  /// Called by formatting.
-inline bool SwGetExpField::IsInBodyTxt() const
-    { return bIsInBodyTxt; }
+inline bool SwGetExpField::IsInBodyText() const
+    { return bIsInBodyText; }
 
- /// Set by UpdateExpFlds where node position is known.
-inline void SwGetExpField::ChgBodyTxtFlag( bool bIsInBody )
-    { bIsInBodyTxt = bIsInBody; }
+ /// Set by UpdateExpFields where node position is known.
+inline void SwGetExpField::ChgBodyTextFlag( bool bIsInBody )
+    { bIsInBodyText = bIsInBody; }
 
 class SwSetExpField;
 
@@ -175,9 +175,9 @@ public:
     /// Overlay, because set-field takes care for its being updated by itself.
     inline OUString         GetSetRefName() const;
 
-    sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
+    sal_uInt16 SetSeqRefNo( SwSetExpField& rField );
 
-    size_t GetSeqFldList( SwSeqFldList& rList );
+    size_t GetSeqFieldList( SwSeqFieldList& rList );
     OUString MakeSeqName( sal_uInt16 nSeqNo );
 
     /// Number sequence fields chapterwise if required.
@@ -185,9 +185,9 @@ public:
     void SetDelimiter( const OUString& s )    { sDelim = s; }
     sal_uInt8 GetOutlineLvl() const                 { return nLevel; }
     void SetOutlineLvl( sal_uInt8 n )           { nLevel = n; }
-    void SetChapter( SwSetExpField& rFld, const SwNode& rNd );
+    void SetChapter( SwSetExpField& rField, const SwNode& rNd );
 
-    /** Member only for SwDoc::UpdateExpFld.
+    /** Member only for SwDoc::UpdateExpField.
      It is needed only at runtime of sequence field types! */
     const SwNode* GetOutlineChgNd() const   { return pOutlChgNd; }
     void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
@@ -215,16 +215,16 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
     bool            bInput;
     sal_uInt16          nSeqNo;
     sal_uInt16          nSubType;
-    SwFmtFld * mpFmtFld; /// pool item to which the SwSetExpField belongs
+    SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs
 
     virtual OUString            Expand() const SAL_OVERRIDE;
     virtual SwField*            Copy() const SAL_OVERRIDE;
 
 public:
-    SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0);
+    SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFormat = 0);
 
-    void SetFmtFld(SwFmtFld & rFmtFld);
-    SwFmtFld* GetFmtFld() { return mpFmtFld;}
+    void SetFormatField(SwFormatField & rFormatField);
+    SwFormatField* GetFormatField() { return mpFormatField;}
 
     virtual void                SetValue( const double& rVal ) SAL_OVERRIDE;
 
@@ -243,7 +243,7 @@ public:
     virtual sal_uInt16              GetSubType() const SAL_OVERRIDE;
     virtual void                SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
 
-    inline bool                 IsSequenceFld() const;
+    inline bool                 IsSequenceField() const;
 
     /// Logical number, sequence fields.
     inline void                 SetSeqNumber( sal_uInt16 n )    { nSeqNo = n; }
@@ -277,7 +277,7 @@ inline void SwSetExpField::SetInputFlag(bool bInp)
 inline bool SwSetExpField::GetInputFlag() const
     { return bInput; }
 
-inline bool SwSetExpField::IsSequenceFld() const
+inline bool SwSetExpField::IsSequenceField() const
     { return 0 != (nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(GetTyp())->GetType()); }
 
 class SwInputFieldType : public SwFieldType
@@ -300,7 +300,7 @@ class SW_DLLPUBLIC SwInputField : public SwField
     sal_uInt16 nSubType;
     bool mbIsFormField;
 
-    SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to
+    SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to
 
     virtual OUString        Expand() const SAL_OVERRIDE;
     virtual SwField*        Copy() const SAL_OVERRIDE;
@@ -318,12 +318,12 @@ public:
         const OUString& rContent,
         const OUString& rPrompt,
         sal_uInt16 nSubType = 0,
-        sal_uLong nFmt = 0,
+        sal_uLong nFormat = 0,
         bool bIsFormField = true );
     virtual ~SwInputField();
 
-    void SetFmtFld( SwFmtFld& rFmtFld );
-    SwFmtFld* GetFmtFld() { return mpFmtFld;}
+    void SetFormatField( SwFormatField& rFormatField );
+    SwFormatField* GetFormatField() { return mpFormatField;}
 
     // Providing new Input Field's content:
     // Fill Input Field's content depending on <nSupType>.
@@ -374,19 +374,19 @@ public:
 
 private:
     SwEditShell*              pSh;
-    _SetGetExpFlds*           pSrtLst;
-    std::set<const SwTxtFld*> aTmpLst;
+    _SetGetExpFields*           pSrtLst;
+    std::set<const SwTextField*> aTmpLst;
 };
 
  /// Implementation in tblcalc.cxx.
-class SwTblFieldType : public SwValueFieldType
+class SwTableFieldType : public SwValueFieldType
 {
 public:
-    SwTblFieldType(SwDoc* pDocPtr);
+    SwTableFieldType(SwDoc* pDocPtr);
     virtual SwFieldType* Copy() const SAL_OVERRIDE;
 };
 
-class SwTblField : public SwValueField, public SwTableFormula
+class SwTableField : public SwValueField, public SwTableFormula
 {
     OUString      sExpand;
     sal_uInt16      nSubType;
@@ -400,8 +400,8 @@ class SwTblField : public SwValueField, public SwTableFormula
     OUString GetCommand();
 
 public:
-    SwTblField( SwTblFieldType*, const OUString& rFormel,
-                sal_uInt16 nSubType = 0, sal_uLong nFmt = 0);
+    SwTableField( SwTableFieldType*, const OUString& rFormel,
+                sal_uInt16 nSubType = 0, sal_uLong nFormat = 0);
 
     virtual void        SetValue( const double& rVal ) SAL_OVERRIDE;
     virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
@@ -410,7 +410,7 @@ public:
     OUString            GetExpStr() const               { return sExpand; }
     void                ChgExpStr(const OUString& rStr) { sExpand = rStr; }
 
-    void                CalcField( SwTblCalcPara& rCalcPara );
+    void                CalcField( SwTableCalcPara& rCalcPara );
 
     virtual OUString    GetFieldName() const SAL_OVERRIDE;
 
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index d70f43a18a82..0e044b0b9dbb 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -24,29 +24,29 @@
 #include <format.hxx>
 #include <charfmt.hxx>
 
-class SwTxtCharFmt;
+class SwTextCharFormat;
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient
 {
-    friend class SwTxtCharFmt;
-    SwTxtCharFmt* pTxtAttr;     ///< My text attribute.
+    friend class SwTextCharFormat;
+    SwTextCharFormat* pTextAttr;     ///< My text attribute.
 
 public:
-    SwFmtCharFmt() : pTxtAttr(0) {}
+    SwFormatCharFormat() : pTextAttr(0) {}
 
     /// single argument ctors shall be explicit.
-    explicit SwFmtCharFmt( SwCharFmt *pFmt );
-    virtual ~SwFmtCharFmt();
+    explicit SwFormatCharFormat( SwCharFormat *pFormat );
+    virtual ~SwFormatCharFormat();
 
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtCharFmt( const SwFmtCharFmt& rAttr );
+    SwFormatCharFormat( const SwFormatCharFormat& rAttr );
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
 
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION;
+    SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
@@ -65,8 +65,8 @@ public:
 
     virtual bool    GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
-    SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
+    void SetCharFormat( SwFormat* pFormat ) { pFormat->Add(this); }
+    SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
 };
 #endif
 
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6925032b79ae..b3bbfcda8aa9 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -43,15 +43,15 @@ class SwFlyFrm;
 class SwTabCols;
 class SvxBrushItem;
 class SvxFrameDirectionItem;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwFrm;
-class SwFmtFrmSize;
-class SwFmtRowSplit;
+class SwFormatFrmSize;
+class SwFormatRowSplit;
 class SdrObject;
 class Color;
 class Outliner;
 class SotDataObject;
-class SwFrmFmt;
+class SwFrameFormat;
 struct SwSortOptions;
 class SdrMarkList;
 
@@ -139,9 +139,9 @@ enum CurRectType
 
 struct SwGetCurColNumPara
 {
-    const SwFrmFmt* pFrmFmt;
+    const SwFrameFormat* pFrameFormat;
     const SwRect* pPrtRect, *pFrmRect;
-    SwGetCurColNumPara() : pFrmFmt( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
+    SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
 };
 
 #define SW_PASTESDR_INSERT      1
@@ -235,7 +235,7 @@ public:
     virtual ~SwFEShell();
 
     /// Copy and Paste methods for internal clipboard.
-    bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
+    bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = 0 );
     bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false);
 
     /// Paste some pages into another doc - used in mailmerge.
@@ -248,7 +248,7 @@ public:
     void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false );
 
     /// Is selected frame within another frame?
-    const SwFrmFmt* IsFlyInFly();
+    const SwFrameFormat* IsFlyInFly();
 
     /** If an object as been given, exactly this object is selected
      (instead of searching over position). */
@@ -311,12 +311,12 @@ public:
                         const RndStdIds _nAnchorId,
                         const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
                         const sal_Int16 _eVertRelOrient = com::sun::star::text::RelOrientation::FRAME,
-                        const SwPosition* _pToCharCntntPos = NULL,
+                        const SwPosition* _pToCharContentPos = NULL,
                         const bool _bFollowTextFlow = false,
                         bool _bMirror = false,
                         Point* _opRef = NULL,
                         Size* _opPercent = NULL,
-                        const SwFmtFrmSize* pFmtFrmSize = 0 ) const;
+                        const SwFormatFrmSize* pFormatFrmSize = 0 ) const;
 
     /// Set size of draw objects.
     void SetObjRect( const SwRect& rRect );
@@ -332,18 +332,18 @@ public:
     Size  GetObjSize()       const;
 
     /// SS for envelopes: get all page-bound objects and set them to new page.
-    void GetPageObjs( std::vector<SwFrmFmt*>& rFillArr );
-    void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 );
+    void GetPageObjs( std::vector<SwFrameFormat*>& rFillArr );
+    void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 );
 
     /// Show current selection (frame / draw object as required).
     virtual void MakeSelVisible() SAL_OVERRIDE;
 
-    /** @return FrmFmt of object that may be under Point.
+    /** @return FrameFormat of object that may be under Point.
      Object does not become selected! */
-    const SwFrmFmt* GetFmtFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
+    const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
 
     /// @return a format too, if the point is over the text of any fly.
-    const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const;
+    const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const;
 
     /** Which Protection is set at selected object?
      returns several flags in sal_uInt8 */
@@ -363,8 +363,8 @@ public:
     bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
     bool SetFlyFrmAttr( SfxItemSet &rSet );
     bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
-    const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
-                         SwFrmFmt *pParent = 0 );
+    const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
+                         SwFrameFormat *pParent = 0 );
     void SetFlyPos( const Point &rAbsPos);
     Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
 
@@ -373,12 +373,12 @@ public:
      - add output parameter <bVertL2R> */
     bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
 
-    SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0.
-    void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
+    SwFrameFormat* GetCurFrameFormat() const; ///< If frame then frame style, else 0.
+    void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
     const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
 
     /// Find/delete fly containing the cursor.
-    SwFrmFmt* WizzardGetFly();
+    SwFrameFormat* WizzardGetFly();
 
     /// Independent selecting of flys.
     bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
@@ -388,14 +388,14 @@ public:
 
    /// Iterate over flys  - for Basic-collections.
     size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
-    const SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
+    const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
 
-    /// If a fly is selected, it draws cursor into the first CntntFrm.
-    const SwFrmFmt* SelFlyGrabCrsr();
+    /// If a fly is selected, it draws cursor into the first ContentFrm.
+    const SwFrameFormat* SelFlyGrabCrsr();
 
     /// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys
-    const SwFrmFmt* GetFlyFrmFmt() const;
-          SwFrmFmt* GetFlyFrmFmt();
+    const SwFrameFormat* GetFlyFrameFormat() const;
+          SwFrameFormat* GetFlyFrameFormat();
 
     /** OLE. Server requires new size. Desired values are adjusted as frame attributes.
      If the values are not allowed, the formatting clips and determines scaling.
@@ -413,7 +413,7 @@ public:
     virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                                   const SwRect *pFlyPrtRect = 0,
                                   const SwRect *pFlyFrmRect = 0,
-                                  const bool bNoTxtFrmPrtAreaChanged = false ) = 0;
+                                  const bool bNoTextFrmPrtAreaChanged = false ) = 0;
 
     /** Connect objects with ActivateWhenVisible at Paint.
      Called by notxtfrm::Paint, implemented in wrtsh. */
@@ -445,16 +445,16 @@ public:
                   bool bSelFrame = true );
 
     /// Position is a graphic with URL?
-    const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
+    const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
                                     OUString *pTargetFrameName = 0,
                                     OUString *pURLDescription = 0 ) const;
 
     /** For Chain always connect Fly specified by format with that hit by point.
      rRect contains rect of Fly (for its highlight). */
-    SwChainRet Chainable( SwRect &rRect, const SwFrmFmt &rSource, const Point &rPt ) const;
-    SwChainRet Chain( SwFrmFmt &rSource, const Point &rPt );
-    SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    void Unchain( SwFrmFmt &rFmt );
+    SwChainRet Chainable( SwRect &rRect, const SwFrameFormat &rSource, const Point &rPt ) const;
+    SwChainRet Chain( SwFrameFormat &rSource, const Point &rPt );
+    SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    void Unchain( SwFrameFormat &rFormat );
     void HideChainMarker();
     void SetChainMarker();
 
@@ -530,7 +530,7 @@ public:
 
     /** Get selected DrawObj as graphics (MetaFile/Bitmap).
      Return value indicates if it was converted. */
-    bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const;
+    bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const;
 
     void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
     bool Paste( const Graphic &rGrf, const OUString& rURL );
@@ -544,7 +544,7 @@ public:
                 const Graphic* pGraphic = 0,
                 const SfxItemSet* pFlyAttrSet = 0,
                 const SfxItemSet* pGrfAttrSet = 0,
-                SwFrmFmt* = 0 );
+                SwFrameFormat* = 0 );
 
     /// Insertion of a drawing object which have to be already inserted in the DrawModel.
     void InsertDrawObj( SdrObject& rDrawObj,
@@ -562,7 +562,7 @@ public:
     void AlignAllFormulasToBaseline();
 
     /// Provide information about content situated closes to given Point.
-    Point GetCntntPos( const Point& rPoint, bool bNext ) const;
+    Point GetContentPos( const Point& rPoint, bool bNext ) const;
 
     /// Convert document position into position relative to the current page.
     Point GetRelativePagePosition(const Point& rDocPos);
@@ -595,14 +595,14 @@ public:
     sal_uInt16 GetPageNumber( const Point &rPoint ) const;
     bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
 
-    SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&,
+    SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
                 const SfxItemSet* pFlyAttrSet = 0,
                 const SfxItemSet* pGrfAttrSet = 0,
-                SwFrmFmt* = 0 );
+                SwFrameFormat* = 0 );
     bool    FinishOLEObj(); ///< Shutdown server.
 
-    void GetTblAttr( SfxItemSet & ) const;
-    void SetTblAttr( const SfxItemSet & );
+    void GetTableAttr( SfxItemSet & ) const;
+    void SetTableAttr( const SfxItemSet & );
 
     bool HasWholeTabSelection() const;
 
@@ -615,7 +615,7 @@ public:
     bool DeleteTable();
     bool DeleteRow(bool bCompleteTable = false);
 
-    bool DeleteTblSel();        ///< Current selection, may be whole table.
+    bool DeleteTableSel();        ///< Current selection, may be whole table.
 
     sal_uInt16 MergeTab();          /**< Merge selected parts of table.
                                       @return error via enum. */
@@ -624,13 +624,13 @@ public:
     bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
     bool Sort(const SwSortOptions&);    //Sortieren.
 
-    void SetRowHeight( const SwFmtFrmSize &rSz );
+    void SetRowHeight( const SwFormatFrmSize &rSz );
 
     /// Pointer must be detroyed by caller != 0.
-    void GetRowHeight( SwFmtFrmSize *&rpSz ) const;
+    void GetRowHeight( SwFormatFrmSize *&rpSz ) const;
 
-    void SetRowSplit( const SwFmtRowSplit &rSz );
-    void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
+    void SetRowSplit( const SwFormatRowSplit &rSz );
+    void GetRowSplit( SwFormatRowSplit *&rpSz ) const;
 
     void   SetBoxAlign( sal_uInt16 nOrient );
     sal_uInt16 GetBoxAlign() const;         ///< USHRT_MAX if ambiguous.
@@ -662,7 +662,7 @@ public:
                           const Point &rPt );
 
     /// pEnd will be used during MouseMove
-    bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+    bool SelTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
 
     void GetTabRows( SwTabCols &rToFill ) const;
     void SetTabRows( const SwTabCols &rNew, bool bCurColOnly );
@@ -672,9 +672,9 @@ public:
     void ProtectCells();    /**< If a table selection exists it is destroyed in case
                              cursor is not allowed in readonly. */
     void UnProtectCells();  ///< Refers to table selection.
-    void UnProtectTbls();   ///< Unprotect all tables in selection.
-    bool HasTblAnyProtection( const OUString* pTblName = 0,
-                              bool* pFullTblProtection = 0 );
+    void UnProtectTables();   ///< Unprotect all tables in selection.
+    bool HasTableAnyProtection( const OUString* pTableName = 0,
+                              bool* pFullTableProtection = 0 );
     bool CanUnProtectCells() const;
 
     sal_uInt16 GetRowsToRepeat() const;
@@ -700,13 +700,13 @@ public:
     bool BalanceCellWidth( bool bTstOnly );
 
     /// AutoFormat for table/ table selection.
-    bool SetTableAutoFmt( const SwTableAutoFmt& rNew );
+    bool SetTableAutoFormat( const SwTableAutoFormat& rNew );
 
-    bool GetTableAutoFmt( SwTableAutoFmt& rGet );
+    bool GetTableAutoFormat( SwTableAutoFormat& rGet );
 
     bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 );
 
-    bool GetAutoSum( OUString& rFml ) const;
+    bool GetAutoSum( OUString& rFormula ) const;
 
     /** Phy: real page count.
      Virt: consider offset that may have been set by user. */
@@ -716,7 +716,7 @@ public:
     void SetPageOffset( sal_uInt16 nOffset );   ///< Changes last page offset.
     sal_uInt16 GetPageOffset() const;           ///< @return last page offset.
 
-    void InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+    void InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
                       const OUString& rNumberSeparator,
                       const bool bBefore, const sal_uInt16 nId,
                       const OUString& rCharacterStyle,
@@ -737,10 +737,10 @@ public:
     bool IsLastCellInRow() const;
 
     /// Width of current range for column-dialog.
-    long GetSectionWidth( SwFmt const & rFmt ) const;
+    long GetSectionWidth( SwFormat const & rFormat ) const;
 
-    void GetConnectableFrmFmts
-    (SwFrmFmt & rFmt, const OUString & rReference, bool bSuccessors,
+    void GetConnectableFrameFormats
+    (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
      ::std::vector< OUString > & aPrevPageVec,
      ::std::vector< OUString > & aThisPageVec,
      ::std::vector< OUString > & aNextPageVec,
@@ -775,10 +775,10 @@ public:
 
     void ParkCursorInTab();
 
-    SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
+    SwTextNode * GetNumRuleNodeAtPos(const Point &rPot);
     bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
 
-    static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
+    static bool IsVerticalModeAtNdAndPos( const SwTextNode& _rTextNode,
                                    const Point& _rDocPos );
 
     void ToggleHeaderFooterEdit( );
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index cc365ed6b2ec..7447fdb86096 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -78,7 +78,7 @@ enum RES_FIELDS
 };
 
  /// List of FieldTypes at UI.
-enum SwFldTypesEnum
+enum SwFieldTypesEnum
 {
     TYP_BEGIN,
     TYP_DATEFLD = TYP_BEGIN,    // 0
@@ -224,7 +224,7 @@ enum SwDateTimeSubType
 };
 
 /// General tools.
-OUString  GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
+OUString  GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM);
 void      SetErrorStr(const OUString& rStr);
 OUString  FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
 
@@ -240,9 +240,9 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
     sal_uInt16 m_nWhich;
 
     friend void _FinitUI();     ///< In order to delete pointer!
-    static  std::vector<OUString>* s_pFldNames;
+    static  std::vector<OUString>* s_pFieldNames;
 
-    static void _GetFldName();  ///< Sets up FldNames; fldmgr.cxx!
+    static void _GetFieldName();  ///< Sets up FieldNames; fldmgr.cxx!
 
 protected:
     /// Single argument ctors shall be explicit.
@@ -267,10 +267,10 @@ public:
 
             sal_uInt16          Which() const { return m_nWhich; }
 
-    inline  void            UpdateFlds() const;
+    inline  void            UpdateFields() const;
 };
 
-inline void SwFieldType::UpdateFlds() const
+inline void SwFieldType::UpdateFields() const
 {
     const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 );
 }
@@ -297,7 +297,7 @@ protected:
     void                SetFormat(sal_uInt32 const nSet) { m_nFormat = nSet; }
 
     SwField( SwFieldType* pTyp,
-             sal_uInt32 nFmt = 0,
+             sal_uInt32 nFormat = 0,
              sal_uInt16 nLang = LANGUAGE_SYSTEM,
              bool m_bUseFieldValueCache = true );
 
@@ -314,7 +314,7 @@ public:
         @remark     most callers should use the cached field value.
                     this is because various fields need special handing
                     (ChangeExpansion()) to return correct values, and only
-                    SwTxtFormatter::NewFldPortion() sets things up properly.
+                    SwTextFormatter::NewFieldPortion() sets things up properly.
         @return     the generated text (suitable for display)
       */
     OUString            ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const;
@@ -396,9 +396,9 @@ public:
     inline bool     UseFormat() const                   { return m_bUseFormat; }
     inline void     EnableFormat(bool bFormat = true)   { m_bUseFormat = bFormat; }
 
-    OUString        ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const;
+    OUString        ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const;
     OUString        DoubleToString(const double &rVal, LanguageType eLng) const;
-    OUString        DoubleToString(const double &rVal, sal_uInt32 nFmt) const;
+    OUString        DoubleToString(const double &rVal, sal_uInt32 nFormat) const;
 };
 
 class SW_DLLPUBLIC SwValueField : public SwField
@@ -407,8 +407,8 @@ private:
     double m_fValue;
 
 protected:
-    SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
-    SwValueField( const SwValueField& rFld );
+    SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+    SwValueField( const SwValueField& rField );
 
 public:
     virtual                 ~SwValueField();
@@ -421,10 +421,10 @@ public:
     virtual double          GetValue() const;
     virtual void            SetValue( const double& rVal );
 
-    inline OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const
-        { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFmt, nLng); }
+    inline OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const
+        { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng); }
 
-    static sal_uInt32       GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
+    static sal_uInt32       GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat);
 };
 
 class SW_DLLPUBLIC SwFormulaField : public SwValueField
@@ -433,8 +433,8 @@ private:
     OUString m_sFormula;
 
 protected:
-    SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 );
-    SwFormulaField( const SwFormulaField& rFld );
+    SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, const double fVal = 0.0 );
+    SwFormulaField( const SwFormulaField& rField );
 
 public:
     virtual OUString        GetFormula() const SAL_OVERRIDE;
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 2bfbec12cc6f..f99eb558d7ab 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField
 
 public:
         SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
-                    sal_uLong nFmt = 0, sal_uInt16 nLng = 0);
+                    sal_uLong nFormat = 0, sal_uInt16 nLng = 0);
 
         virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
         virtual void            SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 99d77062483d..ab53fea827da 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -22,7 +22,7 @@
 #include "rcid.hrc"
 
 /*--------------------------------------------------------------------
-    TypeId, see SwFldTypesEnum
+    TypeId, see SwFieldTypesEnum
  --------------------------------------------------------------------*/
 
 #define STR_TYPE_BEGIN      RC_FLDDLG_BEGIN
diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx
index 788ec5966282..6995b403dbb1 100644
--- a/sw/inc/fldupde.hxx
+++ b/sw/inc/fldupde.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_FLDUPDE_HXX
 #define INCLUDED_SW_INC_FLDUPDE_HXX
 
-enum SwFldUpdateFlags
+enum SwFieldUpdateFlags
 {
     AUTOUPD_OFF,
     AUTOUPD_FIELD_ONLY,
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index f3434bdb2ed9..0a912d06ce2f 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -23,20 +23,20 @@
 #include <boost/shared_ptr.hpp>
 #include <set>
 
-class SwFrmFmt;
+class SwFrameFormat;
 class SwNodeIndex;
 
 /// For querying current flys in document.
 class SW_DLLPUBLIC SwPosFlyFrm
 {
-    const SwFrmFmt* pFrmFmt;    ///< FlyFrmFmt
+    const SwFrameFormat* pFrameFormat;    ///< FlyFrameFormat
     SwNodeIndex* pNdIdx;        ///< Index for node is sufficient.
     sal_uInt32 nOrdNum;
 public:
-    SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos );
+    SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
     virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
 
-    const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
+    const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
     const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
     sal_uInt32 GetOrdNum() const { return nOrdNum; }
 };
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 38bedd19415f..54468ab91cb5 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -31,9 +31,9 @@ struct SwPosition;
 class IntlWrapper;
 
 /// FlyAnchors
-class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem
 {
-    ::boost::scoped_ptr<SwPosition> m_pCntntAnchor; /**< 0 for page-bound frames.
+    ::boost::scoped_ptr<SwPosition> m_pContentAnchor; /**< 0 for page-bound frames.
                                                      Index for paragraph-bound frames.
                                                      Position for character-bound frames. */
     RndStdIds  nAnchorId;
@@ -44,11 +44,11 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
     static sal_uInt32 mnOrderCounter;
 
 public:
-    SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
-    SwFmtAnchor( const SwFmtAnchor &rCpy );
-    virtual ~SwFmtAnchor();
+    SwFormatAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
+    SwFormatAnchor( const SwFormatAnchor &rCpy );
+    virtual ~SwFormatAnchor();
 
-    SwFmtAnchor &operator=( const SwFmtAnchor& );
+    SwFormatAnchor &operator=( const SwFormatAnchor& );
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -64,7 +64,7 @@ public:
 
     RndStdIds GetAnchorId() const { return nAnchorId; }
     sal_uInt16 GetPageNum() const { return nPageNum; }
-    const SwPosition *GetCntntAnchor() const { return m_pCntntAnchor.get(); }
+    const SwPosition *GetContentAnchor() const { return m_pContentAnchor.get(); }
     // #i28701#
     sal_uInt32 GetOrder() const { return mnOrder;}
 
@@ -75,10 +75,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const
-    { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
+inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
+    { return static_cast<const SwFormatAnchor&>(Get(RES_ANCHOR, bInP)); }
 
- inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const
+ inline const SwFormatAnchor &SwFormat::GetAnchor(bool bInP) const
      { return m_aSet.GetAnchor(bInP); }
 
 #endif
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index e7816237226c..048307c15c2b 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,21 +23,21 @@
 #include <format.hxx>
 #include <memory>
 
-class SwFmtAutoFmt: public SfxPoolItem
+class SwFormatAutoFormat: public SfxPoolItem
 {
     std::shared_ptr<SfxItemSet> mpHandle;
 
 public:
-    SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
+    SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
 
     /// single argument ctors shall be explicit.
-    virtual ~SwFmtAutoFmt();
+    virtual ~SwFormatAutoFormat();
 
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtAutoFmt( const SwFmtAutoFmt& rAttr );
+    SwFormatAutoFormat( const SwFormatAutoFormat& rAttr );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION;
+    SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index e7371a468fe4..cd4a34ab2768 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -25,10 +25,10 @@
 #include "swdllapi.h"
 
 /// If text in multi-column sections should be evenly distributed.
-class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatNoBalancedColumns : public SfxBoolItem
 {
 public:
-    SwFmtNoBalancedColumns( bool bFlag = false )
+    SwFormatNoBalancedColumns( bool bFlag = false )
         : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
 
     /// "pure virtual methods" of SfxPoolItem
@@ -36,10 +36,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
-    { return static_cast<const SwFmtNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
+inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
+    { return static_cast<const SwFormatNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
 
-inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const
+inline const SwFormatNoBalancedColumns &SwFormat::GetBalancedColumns(bool bInP) const
     { return m_aSet.GetBalancedColumns( bInP ); }
 
 #endif
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 267d54190e63..18f25baa75ee 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -68,7 +68,7 @@ enum SwColLineAdj
     COLADJ_BOTTOM
 };
 
-class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatCol : public SfxPoolItem
 {
     editeng::SvxBorderStyle m_eLineStyle;     ///< style of the separator line
     sal_uLong   m_nLineWidth;                 ///< Width of the separator line.
@@ -92,14 +92,14 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
     SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
 
 public:
-    SwFmtCol();
-    SwFmtCol( const SwFmtCol& );
-    virtual ~SwFmtCol();
+    SwFormatCol();
+    SwFormatCol( const SwFormatCol& );
+    virtual ~SwFormatCol();
     //#i120133#
     sal_Int16 GetAdjustValue() const { return m_aWidthAdjustValue; }
     void SetAdjustValue( const sal_Int16& n ) { m_aWidthAdjustValue = n; }
 
-    SwFmtCol& operator=( const SwFmtCol& );
+    SwFormatCol& operator=( const SwFormatCol& );
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -166,10 +166,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const
-    { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); }
+inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
+    { return static_cast<const SwFormatCol&>(Get( RES_COL,bInP)); }
 
-inline const SwFmtCol &SwFmt::GetCol(bool bInP) const
+inline const SwFormatCol &SwFormat::GetCol(bool bInP) const
     { return m_aSet.GetCol(bInP); }
 
 #endif
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 9c908b18893b..ce848e2ae4b9 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -28,16 +28,16 @@
 class IntlWrapper;
 
 /// Connection (text flow) between two FlyFrms.
-class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
 {
-    SwClient aPrev, ///< Previous SwFlyFrmFmt (if existent).
-             aNext; ///< Next SwFlyFrmFmt (if existent).
+    SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
+             aNext; ///< Next SwFlyFrameFormat (if existent).
 
 public:
-    SwFmtChain() : SfxPoolItem( RES_CHAIN ) {}
-    SwFmtChain( const SwFmtChain &rCpy );
+    SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
+    SwFormatChain( const SwFormatChain &rCpy );
 
-    inline SwFmtChain &operator=( const SwFmtChain& );
+    inline SwFormatChain &operator=( const SwFormatChain& );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -50,24 +50,24 @@ public:
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
 
-    SwFlyFrmFmt* GetPrev() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aPrev.GetRegisteredIn())); }
-    SwFlyFrmFmt* GetNext() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aNext.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
 
-    void SetPrev( SwFlyFrmFmt *pFmt );
-    void SetNext( SwFlyFrmFmt *pFmt );
+    void SetPrev( SwFlyFrameFormat *pFormat );
+    void SetNext( SwFlyFrameFormat *pFormat );
 };
 
-SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
+SwFormatChain &SwFormatChain::operator=( const SwFormatChain &rCpy )
 {
     SetPrev( rCpy.GetPrev() );
     SetNext( rCpy.GetNext() );
     return *this;
 }
 
-inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const
-    { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); }
+inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const
+    { return static_cast<const SwFormatChain&>(Get( RES_CHAIN,bInP)); }
 
-inline const SwFmtChain &SwFmt::GetChain(bool bInP) const
+inline const SwFormatChain &SwFormat::GetChain(bool bInP) const
     { return m_aSet.GetChain(bInP); }
 
 #endif
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index b11c160a3f02..77c33f9eaeaa 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -26,33 +26,33 @@
 class SwNodeIndex;
 class SwStartNode;
 
-/// Cntnt, content of frame (header, footer, fly).
-class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
+/// Content, content of frame (header, footer, fly).
+class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
 {
     SwNodeIndex *pStartNode;
 
-    SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION;
+    SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtCntnt( const SwStartNode* pStartNode = 0 );
-    SwFmtCntnt( const SwFmtCntnt &rCpy );
-    virtual ~SwFmtCntnt();
+    SwFormatContent( const SwStartNode* pStartNode = 0 );
+    SwFormatContent( const SwFormatContent &rCpy );
+    virtual ~SwFormatContent();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
-    void SetNewCntntIdx( const SwNodeIndex *pIdx );
+    const SwNodeIndex *GetContentIdx() const { return pStartNode; }
+    void SetNewContentIdx( const SwNodeIndex *pIdx );
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const
-    { return static_cast<const SwFmtCntnt&>(Get( RES_CNTNT,bInP)); }
+inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
+    { return static_cast<const SwFormatContent&>(Get( RES_CNTNT,bInP)); }
 
-inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const
-    { return m_aSet.GetCntnt(bInP); }
+inline const SwFormatContent &SwFormat::GetContent(bool bInP) const
+    { return m_aSet.GetContent(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 4d4b047c9897..b3529802206c 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -28,33 +28,33 @@
 class SwDoc;
 namespace sw{ class DocumentStylePoolManager; }
 
-class SwFmtColl : public SwFmt
+class SwFormatColl : public SwFormat
 {
 protected:
-    SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName,
-                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
-                sal_uInt16 nFmtWhich )
-          : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+    SwFormatColl( SwAttrPool& rPool, const sal_Char* pFormatName,
+                const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+                sal_uInt16 nFormatWhich )
+          : SwFormat( rPool, pFormatName, pWhichRanges, pDerFrom, nFormatWhich )
     { SetAuto( false ); }
 
-    SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName,
-                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
-                sal_uInt16 nFmtWhich )
-          : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+    SwFormatColl( SwAttrPool& rPool, const OUString &rFormatName,
+                const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+                sal_uInt16 nFormatWhich )
+          : SwFormat( rPool, rFormatName, pWhichRanges, pDerFrom, nFormatWhich )
     { SetAuto( false ); }
 
 private:
-    SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION;
-    const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION;
+    SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION;
+    const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION;
 };
 
 /// Represents the style of a paragraph.
-class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
+class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
 {
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 
-    SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION;
+    SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION;
 
     bool mbStayAssignedToListLevelOfOutlineStyle;
 
@@ -62,26 +62,26 @@ protected:
 
     bool mbAssignedToOutlineStyle;
 
-    SwTxtFmtColl *pNextTxtFmtColl;
+    SwTextFormatColl *pNextTextFormatColl;
 
-    SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                    SwTxtFmtColl* pDerFrom = 0,
-                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
-        : SwFmtColl(rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+    SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                    SwTextFormatColl* pDerFrom = 0,
+                    sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+        : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
         , mbStayAssignedToListLevelOfOutlineStyle(false)
         , mbAssignedToOutlineStyle(false)
     {
-        pNextTxtFmtColl = this;
+        pNextTextFormatColl = this;
     }
 
-    SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                    SwTxtFmtColl* pDerFrom = 0,
-                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
-        : SwFmtColl(rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+    SwTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                    SwTextFormatColl* pDerFrom = 0,
+                    sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+        : SwFormatColl(rPool, rFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
         , mbStayAssignedToListLevelOfOutlineStyle(false)
         , mbAssignedToOutlineStyle(false)
     {
-        pNextTxtFmtColl = this;
+        pNextTextFormatColl = this;
     }
 
     /// To get UL- / LR- / FontHeight-changes.
@@ -91,8 +91,8 @@ public:
 
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
-    SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
+    inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
+    SwTextFormatColl& GetNextTextFormatColl() const { return *pNextTextFormatColl; }
 
     bool IsAtDocNodeSet() const;
 
@@ -117,12 +117,12 @@ public:
 
     /** Override to recognize changes on the <SwNumRuleItem> and register/unregister
      the paragragh style at the corresponding <SwNumRule> instance. */
-    virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
-    virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
-    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
+    virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
+    virtual bool SetFormatAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
 
-    /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
-    virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE;
+    /// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style.
+    virtual sal_uInt16 ResetAllFormatAttr() SAL_OVERRIDE;
 
     inline bool StayAssignedToListLevelOfOutlineStyle() const
     {
@@ -134,19 +134,19 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwGrfFmtColl: public SwFmtColl
+class SwGrfFormatColl: public SwFormatColl
 {
     friend class SwDoc;
 protected:
-    SwGrfFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                    SwGrfFmtColl* pDerFrom = 0 )
-        : SwFmtColl( rPool, pFmtCollName, aGrfFmtCollSetRange,
+    SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                    SwGrfFormatColl* pDerFrom = 0 )
+        : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange,
                     pDerFrom, RES_GRFFMTCOLL )
     {}
 
-    SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                    SwGrfFmtColl* pDerFrom = 0 )
-        : SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange,
+    SwGrfFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                    SwGrfFormatColl* pDerFrom = 0 )
+        : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange,
                     pDerFrom, RES_GRFFMTCOLL )
     {}
 
@@ -178,15 +178,15 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
     union
     {
         sal_uLong nSubCondition;
-        OUString* pFldExpression;
+        OUString* pFieldExpression;
     } aSubCondition;
 
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+    SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                     sal_uLong nSubCond = 0 );
-    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+    SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                     const OUString& rSubExp );
     virtual ~SwCollCondition();
 
@@ -203,50 +203,50 @@ public:
 
     sal_uLong GetCondition() const      { return nCondition; }
     sal_uLong GetSubCondition() const   { return aSubCondition.nSubCondition; }
-    const OUString* GetFldExpression() const
-                                    { return aSubCondition.pFldExpression; }
+    const OUString* GetFieldExpression() const
+                                    { return aSubCondition.pFieldExpression; }
 
     void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
-    SwTxtFmtColl* GetTxtFmtColl() const     { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); }
-    void RegisterToFormat( SwFmt& );
+    SwTextFormatColl* GetTextFormatColl() const     { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); }
+    void RegisterToFormat( SwFormat& );
 };
 
-class SwFmtCollConditions : public boost::ptr_vector<SwCollCondition> {};
+class SwFormatCollConditions : public boost::ptr_vector<SwCollCondition> {};
 
-class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl
+class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl
 {
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 protected:
-    SwFmtCollConditions aCondColls;
+    SwFormatCollConditions aCondColls;
 
-    SwConditionTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                            SwTxtFmtColl* pDerFrom = 0 )
-        : SwTxtFmtColl( rPool, pFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+    SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                            SwTextFormatColl* pDerFrom = 0 )
+        : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
     {}
-    SwConditionTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                            SwTxtFmtColl* pDerFrom = 0 )
-        : SwTxtFmtColl( rPool, rFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+    SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                            SwTextFormatColl* pDerFrom = 0 )
+        : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
     {}
 
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    virtual ~SwConditionTxtFmtColl();
+    virtual ~SwConditionTextFormatColl();
 
     const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
-    const SwFmtCollConditions& GetCondColls() const     { return aCondColls; }
+    const SwFormatCollConditions& GetCondColls() const     { return aCondColls; }
     void InsertCondition( const SwCollCondition& rCond );
     bool RemoveCondition( const SwCollCondition& rCond );
 
-    void SetConditions( const SwFmtCollConditions& );
+    void SetConditions( const SwFormatCollConditions& );
 };
 
 // FEATURE::CONDCOLL
 /// Inline implementations.
-inline void SwTxtFmtColl::SetNextTxtFmtColl( SwTxtFmtColl& rNext )
+inline void SwTextFormatColl::SetNextTextFormatColl( SwTextFormatColl& rNext )
 {
-    pNextTxtFmtColl = &rNext;
+    pNextTextFormatColl = &rNext;
 }
 #endif
 
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index e8b4771908c9..e6b12d0ef61b 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SW_INC_FMTCOLFUNC_HXX
 #define INCLUDED_SW_INC_FMTCOLFUNC_HXX
 
-class SwFmt;
+class SwFormat;
 class SwNumRuleItem;
 
-// namespace <TxtFmtCollFunc> for functions and procedures working on
-// paragraph styles (instances of <SwTxtFmtColl>
-namespace TxtFmtCollFunc
+// namespace <TextFormatCollFunc> for functions and procedures working on
+// paragraph styles (instances of <SwTextFormatColl>
+namespace TextFormatCollFunc
 {
     /** Checks, if assignment of paragraph style to list level of outline style
         has to be deleted, and deletes the assignment, if needed.
@@ -36,43 +36,43 @@ namespace TxtFmtCollFunc
 
         @author OD
     */
-    void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
-                                    SwFmt* pFmt,
+    void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
+                                    SwFormat* pFormat,
                                     const SwNumRuleItem* pNewNumRuleItem = 0L );
 
     /** determines the list style, which directly set at the given paragraph style
 
         @author OD
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style for which the list style should be retrieved
 
         @return pointer to <SwNumRule> instance, if the given paragraph style
         has directly set a list style, 0 otherwise
     */
-    SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl );
+    SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl );
 
     /** adds the given paragraph style at the directly set list style
 
         Note: If the given paragraph style has no directly set list style, nothing happens
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style which is added to its directly set list style
 
         @author OD
     */
-    void AddToNumRule( SwTxtFmtColl& rTxtFmtColl );
+    void AddToNumRule( SwTextFormatColl& rTextFormatColl );
 
     /** removes te given paragraph style from the directly set list style
 
         Note: If the given paragraph style has no directly set list style, nothing happens
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style which is removed from its directly set list style
 
         @author OD
     */
-    void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl );
+    void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl );
 }
 #endif
 
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 6c4045ca1994..6d2625579bd5 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatEditInReadonly : public SfxBoolItem
 {
 public:
-    SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
+    SwFormatEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
                      bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {}
 
     /// "pure virtual methos" of SfxPoolItem
@@ -42,10 +42,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
-    { return static_cast<const SwFmtEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
+inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
+    { return static_cast<const SwFormatEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
 
-inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const
+inline const SwFormatEditInReadonly &SwFormat::GetEditInReadonly(bool bInP) const
     { return m_aSet.GetEditInReadonly(bInP); }
 
 #endif
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 136038d69209..64115f61d5eb 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -21,33 +21,33 @@
 
 #include <svl/poolitem.hxx>
 
-class SwFrmFmt;
-class SwTxtFlyCnt;
+class SwFrameFormat;
+class SwTextFlyCnt;
 
 /**
  * Format of a fly content.
  *
  * A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.)
  */
-class SwFmtFlyCnt : public SfxPoolItem
+class SwFormatFlyCnt : public SfxPoolItem
 {
-    friend class SwTxtFlyCnt;
-    SwTxtFlyCnt* pTxtAttr;
-    SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format.
-    SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
+    friend class SwTextFlyCnt;
+    SwTextFlyCnt* pTextAttr;
+    SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
+    SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
+    SwFormatFlyCnt( SwFrameFormat *pFrameFormat );
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwFrmFmt *GetFrmFmt() const { return pFmt; }
+    inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
     /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object.
-    inline void SetFlyFmt( SwFrmFmt* pNew = 0 )   { pFmt = pNew; }
+    inline void SetFlyFormat( SwFrameFormat* pNew = 0 )   { pFormat = pNew; }
 
-    const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
-          SwTxtFlyCnt *GetTxtFlyCnt()       { return pTxtAttr; }
+    const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
+          SwTextFlyCnt *GetTextFlyCnt()       { return pTextAttr; }
 
     bool Sw3ioExportAllowed() const;
 };
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index c4f5e973a5d6..0d4f86bf58f1 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -31,27 +31,27 @@
 #include <calbck.hxx>
 
 class SwField;
-class SwTxtFld;
+class SwTextField;
 class SwView;
 class SwFieldType;
 
 // ATT_FLD
-class SW_DLLPUBLIC SwFmtFld
+class SW_DLLPUBLIC SwFormatField
     : public SfxPoolItem
     , public SwModify
     , public SfxBroadcaster
 {
     friend void _InitCore();
-    SwFmtFld( sal_uInt16 nWhich ); // for default-Attibute
+    SwFormatField( sal_uInt16 nWhich ); // for default-Attibute
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextField> m_wXTextField;
 
     SwField* mpField;
-    SwTxtFld* mpTxtFld; // the TextAttribute
+    SwTextField* mpTextField; // the TextAttribute
 
     // @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION;
+    SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION;
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
@@ -61,12 +61,12 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// Single argument constructors shall be explicit.
-    explicit SwFmtFld( const SwField &rFld );
+    explicit SwFormatField( const SwField &rField );
 
     /// @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFmtFld( const SwFmtFld& rAttr );
+    SwFormatField( const SwFormatField& rAttr );
 
-    virtual ~SwFmtFld();
+    virtual ~SwFormatField();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -94,19 +94,19 @@ public:
      */
     void SetField( SwField * pField );
 
-    const SwTxtFld* GetTxtFld() const
+    const SwTextField* GetTextField() const
     {
-        return mpTxtFld;
+        return mpTextField;
     }
-    SwTxtFld* GetTxtFld()
+    SwTextField* GetTextField()
     {
-        return mpTxtFld;
+        return mpTextField;
     }
-    void SetTxtFld( SwTxtFld& rTxtFld );
-    void ClearTxtFld();
+    void SetTextField( SwTextField& rTextField );
+    void ClearTextField();
 
     void RegisterToFieldType( SwFieldType& );
-    bool IsFldInDoc() const;
+    bool IsFieldInDoc() const;
     bool IsProtect() const;
 
     SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
@@ -117,7 +117,7 @@ public:
             { m_wXTextField = xTextField; }
 };
 
-enum class SwFmtFldHintWhich
+enum class SwFormatFieldHintWhich
 {
     INSERTED   = 1,
     REMOVED    = 2,
@@ -126,21 +126,21 @@ enum class SwFmtFldHintWhich
     LANGUAGE   = 5
 };
 
-class SW_DLLPUBLIC SwFmtFldHint : public SfxHint
+class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint
 {
-    const SwFmtFld*   pFld;
-    SwFmtFldHintWhich nWhich;
+    const SwFormatField*   pField;
+    SwFormatFieldHintWhich nWhich;
     const SwView*     pView;
 
 public:
-    SwFmtFldHint( const SwFmtFld* p, SwFmtFldHintWhich n, const SwView* pV = 0)
-        : pFld(p)
+    SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = 0)
+        : pField(p)
         , nWhich(n)
         , pView(pV)
     {}
 
-    const SwFmtFld* GetField() const { return pFld; }
-    SwFmtFldHintWhich Which() const { return nWhich; }
+    const SwFormatField* GetField() const { return pField; }
+    SwFormatFieldHintWhich Which() const { return nWhich; }
     const SwView* GetView() const { return pView; }
 };
 
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 7152b7f0f764..431eb4d3fddd 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
 {
 public:
-    SwFmtFollowTextFlow( bool bFlag = false )
+    SwFormatFollowTextFlow( bool bFlag = false )
         : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
 
     TYPEINFO_OVERRIDE();
@@ -45,10 +45,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
-    { return static_cast<const SwFmtFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
+inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
+    { return static_cast<const SwFormatFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
 
-inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const
+inline const SwFormatFollowTextFlow &SwFormat::GetFollowTextFlow(bool bInP) const
     { return m_aSet.GetFollowTextFlow( bInP ); }
 
 #endif
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 4c9fd044afa0..259a5dc7c9da 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -33,11 +33,11 @@ enum SwFillOrder
     SW_FILL_ORDER_END
 };
 
-class SwFmtFillOrder: public SfxEnumItem
+class SwFormatFillOrder: public SfxEnumItem
 {
 public:
-    SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN );
-    inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
+    SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN );
+    inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -46,16 +46,16 @@ public:
     SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
 };
 
-inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
+inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy )
 {
     SetValue( rCpy.GetValue() );
     return *this;
 }
 
-inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
-    { return static_cast<const SwFmtFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
+inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
+    { return static_cast<const SwFormatFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
 
-inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const
+inline const SwFormatFillOrder &SwFormat::GetFillOrder(bool bInP) const
     { return m_aSet.GetFillOrder(bInP); }
 
 #endif
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index c448feee7701..2a5cf5558c29 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -38,7 +38,7 @@ enum SwFrmSize
                          (can be exceeded but not be less). */
 };
 
-class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem
 {
     Size      m_aSize;
     SwFrmSize m_eFrmHeightType;
@@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
     // minus borders in BrowseView if the environment is the page.
 
 public:
-    SwFmtFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
+    SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
                   SwTwips nWidth = 0, SwTwips nHeight = 0 );
-    SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy );
+    SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -101,10 +101,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
-    { return static_cast<const SwFmtFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
+inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
+    { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
 
-inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const
+inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const
     { return m_aSet.GetFrmSize(bInP); }
 
 #endif
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 51e6a215919c..2e6a78894ee1 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -31,28 +31,28 @@ namespace com { namespace sun { namespace star {
 } } }
 
 class SwDoc;
-class SwTxtFtn;
+class SwTextFootnote;
 
 // ATT_FTN
 
-class SW_DLLPUBLIC SwFmtFtn
+class SW_DLLPUBLIC SwFormatFootnote
     : public SfxPoolItem
     , public SwModify
 {
-    friend class SwTxtFtn;
-    SwTxtFtn* m_pTxtAttr;   ///< My TextAttribute.
+    friend class SwTextFootnote;
+    SwTextFootnote* m_pTextAttr;   ///< My TextAttribute.
     OUString m_aNumber;     ///< User-defined 'Number'.
     sal_uInt16 m_nNumber;   ///< Automatische Nummerierung
     bool    m_bEndNote;     ///< Is it an End note?
 
     css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
 
-    SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION;
-    SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION;
+    SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION;
+    SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtFtn( bool bEndNote = false );
-    virtual ~SwFmtFtn();
+    SwFormatFootnote( bool bEndNote = false );
+    virtual ~SwFormatFootnote();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -72,16 +72,16 @@ public:
     void SetNumber( sal_uInt16 nNo )       { m_nNumber = nNo; }
     void SetEndNote( bool b );
 
-    void SetNumber( const SwFmtFtn& rFtn )
+    void SetNumber( const SwFormatFootnote& rFootnote )
     {
-        m_nNumber = rFtn.m_nNumber;
-        m_aNumber = rFtn.m_aNumber;
+        m_nNumber = rFootnote.m_nNumber;
+        m_aNumber = rFootnote.m_aNumber;
     }
 
-    const SwTxtFtn *GetTxtFtn() const   { return m_pTxtAttr; }
-          SwTxtFtn *GetTxtFtn()         { return m_pTxtAttr; }
+    const SwTextFootnote *GetTextFootnote() const   { return m_pTextAttr; }
+          SwTextFootnote *GetTextFootnote()         { return m_pTextAttr; }
 
-    void GetFtnText( OUString& rStr ) const;
+    void GetFootnoteText( OUString& rStr ) const;
 
     /// Returns string to be displayed of footnote / endnote.
     OUString GetViewNumStr( const SwDoc& rDoc, bool bInclStrs = false ) const;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 48ec7c6b286a..cfb7c7346d46 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -25,7 +25,7 @@
 #include <numrule.hxx>
 #include "swdllapi.h"
 
-enum SwFtnEndPosEnum
+enum SwFootnoteEndPosEnum
 {
     FTNEND_ATPGORDOCEND,                ///< at page or document end
     FTNEND_ATTXTEND,                    ///< at end of the current text end
@@ -34,20 +34,20 @@ enum SwFtnEndPosEnum
     FTNEND_ATTXTEND_END
 };
 
-class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
+class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem
 {
     OUString sPrefix;
     OUString sSuffix;
-    SvxNumberType aFmt;
+    SvxNumberType aFormat;
     sal_uInt16      nOffset;
 
 protected:
-    SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos )
+    SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
         : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 )
     {}
-    SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr )
+    SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr )
         : SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
-        sSuffix( rAttr.sSuffix ), aFmt( rAttr.aFmt ),
+        sSuffix( rAttr.sSuffix ), aFormat( rAttr.aFormat ),
         nOffset( rAttr.nOffset )
     {}
 
@@ -67,12 +67,12 @@ public:
 
     inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
 
-    SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
+    SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
 
-    sal_Int16 GetNumType() const        { return aFmt.GetNumberingType(); }
-    void SetNumType( sal_Int16 eType )  { aFmt.SetNumberingType(eType); }
+    sal_Int16 GetNumType() const        { return aFormat.GetNumberingType(); }
+    void SetNumType( sal_Int16 eType )  { aFormat.SetNumberingType(eType); }
 
-    const SvxNumberType& GetSwNumType() const   { return aFmt; }
+    const SvxNumberType& GetSwNumType() const   { return aFormat; }
 
     sal_uInt16 GetOffset() const                { return nOffset; }
     void SetOffset( sal_uInt16 nOff )           { nOffset = nOff; }
@@ -84,21 +84,21 @@ public:
     void SetSuffix(const OUString& rSet)   { sSuffix = rSet; }
 };
 
-class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
 {
 public:
-    SwFmtFtnAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
-        : SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos )
+    SwFormatFootnoteAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+        : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos )
     {}
 
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd
 {
 public:
-    SwFmtEndAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
-        : SwFmtFtnEndAtTxtEnd( RES_END_AT_TXTEND, ePos )
+    SwFormatEndAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+        : SwFormatFootnoteEndAtTextEnd( RES_END_AT_TXTEND, ePos )
     {
         SetNumType( SVX_NUM_ROMAN_LOWER );
     }
@@ -106,15 +106,15 @@ public:
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(bool bInP) const
-    { return static_cast<const SwFmtFtnAtTxtEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
-inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const
-    { return static_cast<const SwFmtEndAtTxtEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
+inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const
+    { return static_cast<const SwFormatFootnoteAtTextEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
+inline const SwFormatEndAtTextEnd &SwAttrSet::GetEndAtTextEnd(bool bInP) const
+    { return static_cast<const SwFormatEndAtTextEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
 
-inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const
-    { return m_aSet.GetFtnAtTxtEnd(bInP); }
-inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const
-    { return m_aSet.GetEndAtTxtEnd(bInP); }
+inline const SwFormatFootnoteAtTextEnd &SwFormat::GetFootnoteAtTextEnd(bool bInP) const
+    { return m_aSet.GetFootnoteAtTextEnd(bInP); }
+inline const SwFormatEndAtTextEnd &SwFormat::GetEndAtTextEnd(bool bInP) const
+    { return m_aSet.GetEndAtTextEnd(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 84caf2e15c27..2130ac1db86b 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -26,21 +26,21 @@
 #include <frmfmt.hxx>
 
 class IntlWrapper;
-class SwFmt;
+class SwFormat;
 
  /** Header, for PageFormats
- Client of FrmFmt describing the header. */
+ Client of FrameFormat describing the header. */
 
-class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
 {
     bool bActive;       ///< Only for controlling (creation of content).
 
 public:
-    SwFmtHeader( bool bOn = false );
-    SwFmtHeader( SwFrmFmt *pHeaderFmt );
-    SwFmtHeader( const SwFmtHeader &rCpy );
-    virtual ~SwFmtHeader();
-    SwFmtHeader& operator=( const SwFmtHeader &rCpy );
+    SwFormatHeader( bool bOn = false );
+    SwFormatHeader( SwFrameFormat *pHeaderFormat );
+    SwFormatHeader( const SwFormatHeader &rCpy );
+    virtual ~SwFormatHeader();
+    SwFormatHeader& operator=( const SwFormatHeader &rCpy );
 
     TYPEINFO_OVERRIDE();
 
@@ -53,27 +53,27 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetHeaderFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
-          SwFrmFmt *GetHeaderFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+    const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+          SwFrameFormat *GetHeaderFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
     bool IsActive() const { return bActive; }
     void SetActive( bool bNew = true ) { bActive = bNew; }
 };
 
  /**Footer, for pageformats
- Client of FrmFmt describing the footer */
+ Client of FrameFormat describing the footer */
 
-class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
 {
     bool bActive;       // Only for controlling (creation of content).
 
 public:
-    SwFmtFooter( bool bOn = false );
-    SwFmtFooter( SwFrmFmt *pFooterFmt );
-    SwFmtFooter( const SwFmtFooter &rCpy );
-    virtual ~SwFmtFooter();
-    SwFmtFooter& operator=( const SwFmtFooter &rCpy );
+    SwFormatFooter( bool bOn = false );
+    SwFormatFooter( SwFrameFormat *pFooterFormat );
+    SwFormatFooter( const SwFormatFooter &rCpy );
+    virtual ~SwFormatFooter();
+    SwFormatFooter& operator=( const SwFormatFooter &rCpy );
 
     TYPEINFO_OVERRIDE();
 
@@ -86,22 +86,22 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetFooterFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
-          SwFrmFmt *GetFooterFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+    const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+          SwFrameFormat *GetFooterFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
     bool IsActive() const { return bActive; }
     void SetActive( bool bNew = true ) { bActive = bNew; }
 };
 
-inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const
-    { return static_cast<const SwFmtHeader&>(Get( RES_HEADER,bInP)); }
-inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const
-    { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); }
+inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
+    { return static_cast<const SwFormatHeader&>(Get( RES_HEADER,bInP)); }
+inline const SwFormatFooter &SwAttrSet::GetFooter(bool bInP) const
+    { return static_cast<const SwFormatFooter&>(Get( RES_FOOTER,bInP)); }
 
-inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const
+inline const SwFormatHeader &SwFormat::GetHeader(bool bInP) const
     { return m_aSet.GetHeader(bInP); }
-inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const
+inline const SwFormatFooter &SwFormat::GetFooter(bool bInP) const
     { return m_aSet.GetFooter(bInP); }
 
 #endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index d3c4d6b8b48f..35d7a7dc88ec 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -24,29 +24,29 @@
 
 class SvxMacro;
 class SvxMacroTableDtor;
-class SwTxtINetFmt;
+class SwTextINetFormat;
 class IntlWrapper;
 
 // ATT_INETFMT
 
-class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatINetFormat: public SfxPoolItem
 {
-    friend class SwTxtINetFmt;
+    friend class SwTextINetFormat;
 
     OUString msURL;                  ///< URL.
     OUString msTargetFrame;          ///< Target frame for URL.
-    OUString msINetFmtName;
-    OUString msVisitedFmtName;
+    OUString msINetFormatName;
+    OUString msVisitedFormatName;
     OUString msHyperlinkName;        ///< Name of the link.
-    SvxMacroTableDtor* mpMacroTbl;
-    SwTxtINetFmt* mpTxtAttr;         ///< My TextAttribute.
-    sal_uInt16 mnINetFmtId;
-    sal_uInt16 mnVisitedFmtId;
+    SvxMacroTableDtor* mpMacroTable;
+    SwTextINetFormat* mpTextAttr;         ///< My TextAttribute.
+    sal_uInt16 mnINetFormatId;
+    sal_uInt16 mnVisitedFormatId;
 public:
-    SwFmtINetFmt( const OUString& rURL, const OUString& rTarget );
-    SwFmtINetFmt( const SwFmtINetFmt& rAttr );
-    SwFmtINetFmt();                     ///< For TypeInfo.
-    virtual ~SwFmtINetFmt();
+    SwFormatINetFormat( const OUString& rURL, const OUString& rTarget );
+    SwFormatINetFormat( const SwFormatINetFormat& rAttr );
+    SwFormatINetFormat();                     ///< For TypeInfo.
+    virtual ~SwFormatINetFormat();
 
     TYPEINFO_OVERRIDE();
 
@@ -64,13 +64,13 @@ public:
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    const SwTxtINetFmt* GetTxtINetFmt() const
+    const SwTextINetFormat* GetTextINetFormat() const
     {
-        return mpTxtAttr;
+        return mpTextAttr;
     }
-    SwTxtINetFmt* GetTxtINetFmt()
+    SwTextINetFormat* GetTextINetFormat()
     {
-        return mpTxtAttr;
+        return mpTextAttr;
     }
 
     const OUString& GetValue() const
@@ -92,47 +92,47 @@ public:
         return msTargetFrame;
     }
 
-    void SetINetFmtAndId(
+    void SetINetFormatAndId(
             const OUString& rNm,
             const sal_uInt16 nId )
     {
-        msINetFmtName = rNm;
-        mnINetFmtId = nId;
+        msINetFormatName = rNm;
+        mnINetFormatId = nId;
     }
 
-    const OUString& GetINetFmt() const
+    const OUString& GetINetFormat() const
     {
-        return msINetFmtName;
+        return msINetFormatName;
     }
 
-    sal_uInt16 GetINetFmtId() const
+    sal_uInt16 GetINetFormatId() const
     {
-        return mnINetFmtId;
+        return mnINetFormatId;
     }
 
-    void SetVisitedFmtAndId(
+    void SetVisitedFormatAndId(
             const OUString& rNm,
             const sal_uInt16 nId )
     {
-        msVisitedFmtName = rNm;
-        mnVisitedFmtId = nId;
+        msVisitedFormatName = rNm;
+        mnVisitedFormatId = nId;
     }
 
-    const OUString& GetVisitedFmt() const
+    const OUString& GetVisitedFormat() const
     {
-        return msVisitedFmtName;
+        return msVisitedFormatName;
     }
 
-    sal_uInt16 GetVisitedFmtId() const
+    sal_uInt16 GetVisitedFormatId() const
     {
-        return mnVisitedFmtId;
+        return mnVisitedFormatId;
     }
 
     /// Set a new MacroTable or clear the current one.
-    void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
-    const SvxMacroTableDtor* GetMacroTbl() const
+    void SetMacroTable( const SvxMacroTableDtor* pTable = 0 );
+    const SvxMacroTableDtor* GetMacroTable() const
     {
-        return mpMacroTbl;
+        return mpMacroTable;
     }
 
     /// Macro getter and setter.
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index cd5d85e3d605..e6373b137502 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -26,14 +26,14 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem
 {
     sal_uLong nStartValue   :24; ///< Starting value for the paragraph. 0 == no starting value.
     bool      bCountLines   :1;  ///< Also count lines of paragraph.
 
 public:
-    SwFmtLineNumber();
-    virtual ~SwFmtLineNumber();
+    SwFormatLineNumber();
+    virtual ~SwFormatLineNumber();
 
     TYPEINFO_OVERRIDE();
 
@@ -55,8 +55,8 @@ public:
     void SetCountLines( bool b )     { bCountLines = b;    }
 };
 
-inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
-    { return static_cast<const SwFmtLineNumber&>(Get( RES_LINENUMBER,bInP)); }
+inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
+    { return static_cast<const SwFormatLineNumber&>(Get( RES_LINENUMBER,bInP)); }
 
 #endif
 
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 1a1f94104795..d08dd84fe6d0 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatLayoutSplit : public SfxBoolItem
 {
 public:
-    SwFmtLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
+    SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
 
     /// "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
-    { return static_cast<const SwFmtLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
+inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
+    { return static_cast<const SwFormatLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
 
-inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const
+inline const SwFormatLayoutSplit &SwFormat::GetLayoutSplit(bool bInP) const
     { return m_aSet.GetLayoutSplit(bInP); }
 
 #endif
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index d79a5808b16e..f73ec36f3a53 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -39,8 +39,8 @@ namespace com { namespace sun { namespace star {
 /**
  * The classes that make up a meta entity are:
  * <dl>
- *   <dt>SwTxtMeta</dt><dd>the text hint</dd>
- *   <dt>SwFmtMeta</dt><dd>the pool item</dd>
+ *   <dt>SwTextMeta</dt><dd>the text hint</dd>
+ *   <dt>SwFormatMeta</dt><dd>the pool item</dd>
  *   <dt>sw::Meta</dt><dd>the metadatable entity itself</dd>
  *   <dt>SwXMeta</dt><dd>the UNO wrapper object</dd>
  * </dl>
@@ -74,47 +74,47 @@ namespace com { namespace sun { namespace star {
  * </ol>
  */
 
-class SwTxtMeta;
+class SwTextMeta;
 class SwXMeta;
 class SwXMetaField;
-class SwTxtNode;
+class SwTextNode;
 namespace sw {
     class Meta;
     class MetaFieldManager;
 }
 
-class SwFmtMeta
+class SwFormatMeta
     : public SfxPoolItem
 {
 private:
-    friend class SwTxtMeta; ///< needs SetTxtAttr, DoCopy
-    friend class ::sw::Meta; ///< needs m_pTxtAttr
+    friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
+    friend class ::sw::Meta; ///< needs m_pTextAttr
 
     ::boost::shared_ptr< ::sw::Meta > m_pMeta;
-    SwTxtMeta * m_pTxtAttr;
+    SwTextMeta * m_pTextAttr;
 
-    SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; }
-    void SetTxtAttr(SwTxtMeta * const i_pTxtAttr);
+    SwTextMeta * GetTextAttr() { return m_pTextAttr; }
+    void SetTextAttr(SwTextMeta * const i_pTextAttr);
 
     /// this method <em>must</em> be called when the hint is actually copied
     void DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
-        SwTxtNode & i_rTargetTxtNode);
+        SwTextNode & i_rTargetTextNode);
 
-    explicit SwFmtMeta( const sal_uInt16 i_nWhich );
+    explicit SwFormatMeta( const sal_uInt16 i_nWhich );
 
 public:
     /// takes ownership
-    explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+    explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
                         const sal_uInt16 i_nWhich );
-    virtual ~SwFmtMeta();
+    virtual ~SwFormatMeta();
 
     /// SfxPoolItem
     virtual bool             operator==( const SfxPoolItem & ) const SAL_OVERRIDE;
     virtual SfxPoolItem *    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
     /// notify clients registered at m_pMeta that this meta is being (re-)moved
-    void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
-    static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
+    void NotifyChangeTextNode(SwTextNode *const pTextNode);
+    static SwFormatMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
     ::sw::Meta * GetMeta() { return m_pMeta.get(); }
 };
 
@@ -125,23 +125,23 @@ class Meta
     , public SwModify
 {
 protected:
-    friend class ::SwFmtMeta; ///< SetFmtMeta, NotifyChangeTxtNode
-    friend class ::SwXMeta;   ///< GetTxtNode, GetTxtAttr, Get/SetXMeta
+    friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode
+    friend class ::SwXMeta;   ///< GetTextNode, GetTextAttr, Get/SetXMeta
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::rdf::XMetadatable> m_wXMeta;
 
-    SwFmtMeta * m_pFmt;
-    SwTxtNode * m_pTxtNode;
+    SwFormatMeta * m_pFormat;
+    SwTextNode * m_pTextNode;
 
-    SwTxtMeta * GetTxtAttr() const;
-    SwTxtNode * GetTxtNode() const { return m_pTxtNode;} ///< @return 0 if not in document (undo)
+    SwTextMeta * GetTextAttr() const;
+    SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo)
 
-    SwFmtMeta * GetFmtMeta() const { return m_pFmt; }
-    void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; };
+    SwFormatMeta * GetFormatMeta() const { return m_pFormat; }
+    void SetFormatMeta( SwFormatMeta * const i_pFormat ) { m_pFormat = i_pFormat; };
 
-    void NotifyChangeTxtNodeImpl();
-    void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
+    void NotifyChangeTextNodeImpl();
+    void NotifyChangeTextNode(SwTextNode *const pTextNode);
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const
@@ -154,7 +154,7 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
 
 public:
-    explicit Meta(SwFmtMeta * const i_pFmt = 0);
+    explicit Meta(SwFormatMeta * const i_pFormat = 0);
     virtual ~Meta();
 
     /// sfx2::Metadatable
@@ -170,7 +170,7 @@ class MetaField
     : public Meta
 {
 private:
-    friend class ::SwFmtMeta;
+    friend class ::SwFormatMeta;
     friend class ::SwXMetaField;
     friend class ::sw::MetaFieldManager;
 
@@ -182,7 +182,7 @@ private:
     bool IsFixedLanguage() const    { return m_bIsFixedLanguage; }
     void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; }
 
-    explicit MetaField(SwFmtMeta * const i_pFmt = 0,
+    explicit MetaField(SwFormatMeta * const i_pFormat = 0,
             const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
             const bool bIsFixedLanguage = false );
 
@@ -203,7 +203,7 @@ private:
 public:
     MetaFieldManager();
     ::boost::shared_ptr<MetaField> makeMetaField(
-                SwFmtMeta * const i_pFmt = 0,
+                SwFormatMeta * const i_pFormat = 0,
                 const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
                 const bool bIsFixedLanguage = false );
     /// get all meta fields
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index cde5b958d595..87b9f8f4977c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -30,16 +30,16 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem
 {
     SwTwips         m_nYPos;  ///< Contains *always* the current RelPos.
     sal_Int16       m_eOrient;
     sal_Int16       m_eRelation;
 public:
     TYPEINFO_OVERRIDE();
-    SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
+    SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
                      sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA );
-    inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy );
+    inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -66,7 +66,7 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
 {
     SwTwips         m_nXPos;              ///< Contains *always* the current RelPos.
     sal_Int16       m_eOrient;
@@ -74,9 +74,9 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
     bool            m_bPosToggle : 1; ///< Flip position on even pages.
 public:
     TYPEINFO_OVERRIDE();
-    SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
+    SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
         sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false );
-    inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
+    inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -103,14 +103,14 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy )
+inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy )
 {
     m_nYPos = rCpy.GetPos();
     m_eOrient = rCpy.GetVertOrient();
     m_eRelation = rCpy.GetRelationOrient();
     return *this;
 }
-inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy )
+inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrient &rCpy )
 {
     m_nXPos = rCpy.GetPos();
     m_eOrient = rCpy.GetHoriOrient();
@@ -119,14 +119,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy
     return *this;
 }
 
-inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
-    { return static_cast<const SwFmtVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
-inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
-    { return static_cast<const SwFmtHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
+inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
+    { return static_cast<const SwFormatVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
+inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
+    { return static_cast<const SwFormatHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
 
-inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const
+inline const SwFormatVertOrient &SwFormat::GetVertOrient(bool bInP) const
     { return m_aSet.GetVertOrient(bInP); }
-inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const
+inline const SwFormatHoriOrient &SwFormat::GetHoriOrient(bool bInP) const
     { return m_aSet.GetHoriOrient(bInP); }
 
 #endif
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index f4d6de755c09..0195015709b8 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -36,7 +36,7 @@ class SwEndNoteInfo;
 /** Pagedescriptor
  Client of SwPageDesc that is "described" by the attribute. */
 
-class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient
 {
     /** This "Doc"-function is made friend in order to be able
      to set the auto-flag after copying!! */
@@ -45,16 +45,16 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
     ::boost::optional<sal_uInt16> oNumOffset;          ///< Offset page number.
     sal_uInt16 nDescNameIdx;        ///< SW3-Reader: stringpool-index of style name.
     SwModify* pDefinedIn;       /**< Points to the object in which the
-                                 attribute was set (CntntNode/Format). */
+                                 attribute was set (ContentNode/Format). */
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE;
 
 public:
-    SwFmtPageDesc( const SwPageDesc *pDesc = 0 );
-    SwFmtPageDesc( const SwFmtPageDesc &rCpy );
-    SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy );
-    virtual ~SwFmtPageDesc();
+    SwFormatPageDesc( const SwPageDesc *pDesc = 0 );
+    SwFormatPageDesc( const SwFormatPageDesc &rCpy );
+    SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy );
+    virtual ~SwFormatPageDesc();
 
     TYPEINFO_OVERRIDE();
 
@@ -84,10 +84,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
-    { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); }
+inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
+    { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); }
 
-inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const
+inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const
     { return m_aSet.GetPageDesc(bInP); }
 
 #endif
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index cfa8efd67d8f..8e054f660859 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -29,26 +29,26 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextContent; }
 } } }
 
-class SwTxtRefMark;
+class SwTextRefMark;
 
 // ATT_REFMARK
 
-class SwFmtRefMark
+class SwFormatRefMark
     : public SfxPoolItem
     , public SwModify
 {
-    friend class SwTxtRefMark;
-    SwTxtRefMark* pTxtAttr;
+    friend class SwTextRefMark;
+    SwTextRefMark* pTextAttr;
 
-    SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION;
+    SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION;
     OUString aRefName;
 
     css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
 
 public:
-    SwFmtRefMark( const OUString& rTxt );
-    SwFmtRefMark( const SwFmtRefMark& rRefMark );
-    virtual ~SwFmtRefMark( );
+    SwFormatRefMark( const OUString& rText );
+    SwFormatRefMark( const SwFormatRefMark& rRefMark );
+    virtual ~SwFormatRefMark( );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -60,8 +60,8 @@ public:
 
     void InvalidateRefMark();
 
-    const SwTxtRefMark *GetTxtRefMark() const   { return pTxtAttr; }
-    SwTxtRefMark *GetTxtRefMark()               { return pTxtAttr; }
+    const SwTextRefMark *GetTextRefMark() const   { return pTextAttr; }
+    SwTextRefMark *GetTextRefMark()               { return pTextAttr; }
 
     inline       OUString &GetRefName()       { return aRefName; }
     inline const OUString &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 5ac88cca87e0..dd2dceebecd8 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatRowSplit : public SfxBoolItem
 {
 public:
-    SwFmtRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
+    SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
 
     // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
-    { return static_cast<const SwFmtRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
+inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
+    { return static_cast<const SwFormatRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
 
-inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const
+inline const SwFormatRowSplit &SwFormat::GetRowSplit(bool bInP) const
     { return m_aSet.GetRowSplit(bInP); }
 
 #endif
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index f0945e6227d1..219f3ddab687 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -21,25 +21,25 @@
 
 #include <svl/poolitem.hxx>
 
-class SwTxtRuby;
+class SwTextRuby;
 
-class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem
 {
-    friend class SwTxtRuby;
+    friend class SwTextRuby;
 
-    OUString sRubyTxt;                      ///< The ruby txt.
-    OUString sCharFmtName;                  ///< Name of the charformat.
-    SwTxtRuby* pTxtAttr;                    ///< The TextAttribute.
-    sal_uInt16 nCharFmtId;                  ///< PoolId of the charformat.
+    OUString sRubyText;                      ///< The ruby txt.
+    OUString sCharFormatName;                  ///< Name of the charformat.
+    SwTextRuby* pTextAttr;                    ///< The TextAttribute.
+    sal_uInt16 nCharFormatId;                  ///< PoolId of the charformat.
     sal_uInt16 nPosition;                   ///< Position of the Ruby-character.
     sal_uInt16 nAdjustment;                 ///< Specific adjustment of the Ruby-ch.
 
 public:
-    SwFmtRuby( const OUString& rRubyTxt );
-    SwFmtRuby( const SwFmtRuby& rAttr );
-    virtual ~SwFmtRuby();
+    SwFormatRuby( const OUString& rRubyText );
+    SwFormatRuby( const SwFormatRuby& rAttr );
+    virtual ~SwFormatRuby();
 
-    SwFmtRuby& operator=( const SwFmtRuby& rAttr );
+    SwFormatRuby& operator=( const SwFormatRuby& rAttr );
 
     // "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -56,17 +56,17 @@ public:
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    const SwTxtRuby* GetTxtRuby() const         { return pTxtAttr; }
-    SwTxtRuby* GetTxtRuby()                     { return pTxtAttr; }
+    const SwTextRuby* GetTextRuby() const         { return pTextAttr; }
+    SwTextRuby* GetTextRuby()                     { return pTextAttr; }
 
-    OUString GetText() const                    { return sRubyTxt; }
-    void SetText( const OUString& rTxt )        { sRubyTxt = rTxt; }
+    OUString GetText() const                    { return sRubyText; }
+    void SetText( const OUString& rText )        { sRubyText = rText; }
 
-    OUString GetCharFmtName() const             { return sCharFmtName; }
-    void SetCharFmtName( const OUString& rNm )  { sCharFmtName = rNm; }
+    OUString GetCharFormatName() const             { return sCharFormatName; }
+    void SetCharFormatName( const OUString& rNm )  { sCharFormatName = rNm; }
 
-    sal_uInt16 GetCharFmtId() const                 { return nCharFmtId; }
-    void SetCharFmtId( sal_uInt16 nNew )            { nCharFmtId = nNew; }
+    sal_uInt16 GetCharFormatId() const                 { return nCharFormatId; }
+    void SetCharFormatId( sal_uInt16 nNew )            { nCharFormatId = nNew; }
 
     sal_uInt16 GetPosition() const                  { return nPosition; }
     void SetPosition( sal_uInt16 nNew )             { nPosition = nNew; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 23009806fb35..5b933e99b287 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -27,16 +27,16 @@
 #include <fmtsrndenum.hxx>
 class IntlWrapper;
 
-// SwFmtSurround: How document content under the frame shall behave.
-class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem
+// SwFormatSurround: How document content under the frame shall behave.
+class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
 {
     bool    bAnchorOnly :1;
     bool    bContour    :1;
     bool    bOutside    :1;
 public:
-    SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL );
-    SwFmtSurround( const SwFmtSurround & );
-    inline SwFmtSurround &operator=( const SwFmtSurround &rCpy );
+    SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL );
+    SwFormatSurround( const SwFormatSurround & );
+    inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
 
     // "Pure virtual Methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -62,7 +62,7 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
+inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy )
 {
     bAnchorOnly = rCpy.IsAnchorOnly();
     bContour = rCpy.IsContour();
@@ -71,10 +71,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
     return *this;
 }
 
-inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const
-    { return static_cast<const SwFmtSurround&>(Get( RES_SURROUND,bInP)); }
+inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const
+    { return static_cast<const SwFormatSurround&>(Get( RES_SURROUND,bInP)); }
 
-inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const
+inline const SwFormatSurround &SwFormat::GetSurround(bool bInP) const
     { return m_aSet.GetSurround(bInP); }
 
 #endif
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 766b59d4f8f2..bdcf92f8283e 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -29,7 +29,7 @@ class IntlWrapper;
 
 // URL, ServerMap und ClientMap
 
-class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
 {
     OUString  sTargetFrameName; ///< Target frame for URL.
     OUString  sURL;             ///< Simple URL.
@@ -38,15 +38,15 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
 
     bool      bIsServerMap;     ///< A ServerSideImageMap with the URL.
 
-    SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION;
+    SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtURL();
+    SwFormatURL();
 
     /// @@@ copy construction allowed, but assigment is not? @@@
-    SwFmtURL( const SwFmtURL& );
+    SwFormatURL( const SwFormatURL& );
 
-    virtual ~SwFmtURL();
+    virtual ~SwFormatURL();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -73,10 +73,10 @@ public:
     void SetName( const OUString& rNm )     { sName = rNm; }
 };
 
-inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const
-    { return static_cast<const SwFmtURL&>(Get( RES_URL,bInP)); }
+inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const
+    { return static_cast<const SwFormatURL&>(Get( RES_URL,bInP)); }
 
-inline const SwFmtURL &SwFmt::GetURL(bool bInP) const
+inline const SwFormatURL &SwFormat::GetURL(bool bInP) const
     { return m_aSet.GetURL(bInP); }
 
 #endif
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index ff6dc2315e20..88e86a2c46d4 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -24,7 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 
-class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatWrapInfluenceOnObjPos: public SfxPoolItem
 {
 private:
     sal_Int16 mnWrapInfluenceOnPosition;
@@ -33,15 +33,15 @@ public:
     TYPEINFO_OVERRIDE();
 
     // #i35017# - constant name has changed
-    SwFmtWrapInfluenceOnObjPos(
+    SwFormatWrapInfluenceOnObjPos(
             sal_Int16 _nWrapInfluenceOnPosition =
             com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
-    SwFmtWrapInfluenceOnObjPos(
-            const SwFmtWrapInfluenceOnObjPos& _rCpy );
-    virtual ~SwFmtWrapInfluenceOnObjPos();
+    SwFormatWrapInfluenceOnObjPos(
+            const SwFormatWrapInfluenceOnObjPos& _rCpy );
+    virtual ~SwFormatWrapInfluenceOnObjPos();
 
-    SwFmtWrapInfluenceOnObjPos& operator=(
-            const SwFmtWrapInfluenceOnObjPos& _rSource );
+    SwFormatWrapInfluenceOnObjPos& operator=(
+            const SwFormatWrapInfluenceOnObjPos& _rSource );
 
     /// pure virtual methods of class <SfxPoolItem>
     virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE;
@@ -60,10 +60,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
-    { return static_cast<const SwFmtWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
+inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
+    { return static_cast<const SwFormatWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
 
- inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const
+ inline const SwFormatWrapInfluenceOnObjPos& SwFormat::GetWrapInfluenceOnObjPos(bool bInP) const
     { return m_aSet.GetWrapInfluenceOnObjPos(bInP); }
 
 #endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 63bb3bb13472..11ed94319e81 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -41,39 +41,39 @@ namespace drawinglayer { namespace attribute {
 }}
 
 /// Base class for various Writer styles.
-class SW_DLLPUBLIC SwFmt : public SwModify
+class SW_DLLPUBLIC SwFormat : public SwModify
 {
-    OUString m_aFmtName;
+    OUString m_aFormatName;
     SwAttrSet m_aSet;
 
     sal_uInt16 m_nWhichId;
-    sal_uInt16 m_nPoolFmtId;        /**< Id for "automatically" created formats.
+    sal_uInt16 m_nPoolFormatId;        /**< Id for "automatically" created formats.
                                        (is not hard attribution!!!) */
     sal_uInt16 m_nPoolHelpId;       ///< HelpId for this Pool-style.
     sal_uInt8 m_nPoolHlpFileId;     ///< FilePos to Doc to these style helps.
     bool   m_bWritten : 1;      ///< TRUE: already written.
-    bool   m_bAutoFmt : 1;      /**< FALSE: it is a template.
+    bool   m_bAutoFormat : 1;      /**< FALSE: it is a template.
                                        default is true! */
-    bool   m_bFmtInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
-                                       to recognize this in FmtChg-message!! */
-    bool   m_bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
+    bool   m_bFormatInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
+                                       to recognize this in FormatChg-message!! */
+    bool   m_bAutoUpdateFormat : 1;/**< TRUE: Set attributes of a whole paragraph
                                        at format (UI-side!). */
     bool m_bHidden : 1;
     std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
 
 protected:
-    SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-            const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
-    SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges,
-            SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
-    SwFmt( const SwFmt& rFmt );
+    SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+            const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+    SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges,
+            SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+    SwFormat( const SwFormat& rFormat );
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     ///< Already in base class Client.
 
-    virtual ~SwFmt();
-    SwFmt &operator=(const SwFmt&);
+    virtual ~SwFormat();
+    SwFormat &operator=(const SwFormat&);
 
     /// for Querying of Writer-functions.
     sal_uInt16 Which() const { return m_nWhichId; }
@@ -82,36 +82,36 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     /// Copy attributes even among documents.
-    void CopyAttrs( const SwFmt&, bool bReplace=true );
+    void CopyAttrs( const SwFormat&, bool bReplace=true );
 
-    /// Delete all attributes that are not in rFmt.
+    /// Delete all attributes that are not in rFormat.
     void DelDiffs( const SfxItemSet& rSet );
-    void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); }
+    void DelDiffs( const SwFormat& rFormat ) { DelDiffs( rFormat.GetAttrSet() ); }
 
     /// 0 is Default.
-    bool SetDerivedFrom(SwFmt *pDerivedFrom = 0);
+    bool SetDerivedFrom(SwFormat *pDerivedFrom = 0);
 
     /// If bInParents is FALSE, search only in this format for attribute.
     //UUUUinline
-    const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
+    const SfxPoolItem& GetFormatAttr( sal_uInt16 nWhich,
                                    bool bInParents = true ) const;
     //UUUUinline
     SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true,
                                     const SfxPoolItem **ppItem = 0 ) const;
     SfxItemState GetBackgroundState(SvxBrushItem &rItem,
                                     bool bSrchInParent = true) const;
-    virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual bool SetFmtAttr( const SfxItemSet& rSet );
-    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+    virtual bool SetFormatAttr( const SfxPoolItem& rAttr );
+    virtual bool SetFormatAttr( const SfxItemSet& rSet );
+    virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     /** Takes all hints from Delta-Array,
         @return count of deleted hints. */
-    virtual sal_uInt16 ResetAllFmtAttr();
+    virtual sal_uInt16 ResetAllFormatAttr();
 
-    inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+    inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
     inline bool IsDefault() const { return DerivedFrom() == 0; }
 
-    inline OUString GetName() const   { return m_aFmtName; }
+    inline OUString GetName() const   { return m_aFormatName; }
     void SetName( const OUString& rNewName, bool bBroadcast=false );
     inline void SetName( const sal_Char* pNewName,
                          bool bBroadcast=false);
@@ -145,8 +145,8 @@ public:
     IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
 
     /// Get and set Pool style IDs.
-    sal_uInt16 GetPoolFmtId() const { return m_nPoolFmtId; }
-    void SetPoolFmtId( sal_uInt16 nId ) { m_nPoolFmtId = nId; }
+    sal_uInt16 GetPoolFormatId() const { return m_nPoolFormatId; }
+    void SetPoolFormatId( sal_uInt16 nId ) { m_nPoolFormatId = nId; }
 
     /// Get and set Help-IDs for document templates.
     sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; }
@@ -162,9 +162,9 @@ public:
     /// Format-ID for reading/writing:
     void   ResetWritten()    { m_bWritten = false; }
 
-    /// Query / set AutoFmt-flag.
-    bool IsAuto() const                 { return m_bAutoFmt; }
-    void SetAuto( bool bNew = false )   { m_bAutoFmt = bNew; }
+    /// Query / set AutoFormat-flag.
+    bool IsAuto() const                 { return m_bAutoFormat; }
+    void SetAuto( bool bNew = false )   { m_bAutoFormat = bNew; }
 
     bool IsHidden() const                 { return m_bHidden; }
     void SetHidden( bool bValue = false ) { m_bHidden = bValue; }
@@ -172,11 +172,11 @@ public:
     void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
     void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
 
-    /// Query / set bAutoUpdateFmt-flag.
-    bool IsAutoUpdateFmt() const                { return m_bAutoUpdateFmt; }
-    void SetAutoUpdateFmt( bool bNew = true )   { m_bAutoUpdateFmt = bNew; }
+    /// Query / set bAutoUpdateFormat-flag.
+    bool IsAutoUpdateFormat() const                { return m_bAutoUpdateFormat; }
+    void SetAutoUpdateFormat( bool bNew = true )   { m_bAutoUpdateFormat = bNew; }
 
-    bool IsFmtInDTOR() const { return m_bFmtInDTOR; }
+    bool IsFormatInDTOR() const { return m_bFormatInDTOR; }
 
     /** GetMethods: Bool indicates whether to search only in Set (FALSE)
      or also in Parents.
@@ -227,48 +227,48 @@ public:
     inline const SvxShadowItem   &GetCharShadow( bool = true ) const;
 
     /// Frame-attributes - implemented in frmatr.hxx.
-    inline const SwFmtFillOrder           &GetFillOrder( bool = true ) const;
-    inline const SwFmtFrmSize             &GetFrmSize( bool = true ) const;
-    inline const SwFmtHeader          &GetHeader( bool = true ) const;
-    inline const SwFmtFooter          &GetFooter( bool = true ) const;
-    inline const SwFmtSurround            &GetSurround( bool = true ) const;
-    inline const SwFmtHoriOrient      &GetHoriOrient( bool = true ) const;
-    inline const SwFmtAnchor          &GetAnchor( bool = true ) const;
-    inline const SwFmtCol                 &GetCol( bool = true ) const;
+    inline const SwFormatFillOrder           &GetFillOrder( bool = true ) const;
+    inline const SwFormatFrmSize             &GetFrmSize( bool = true ) const;
+    inline const SwFormatHeader          &GetHeader( bool = true ) const;
+    inline const SwFormatFooter          &GetFooter( bool = true ) const;
+    inline const SwFormatSurround            &GetSurround( bool = true ) const;
+    inline const SwFormatHoriOrient      &GetHoriOrient( bool = true ) const;
+    inline const SwFormatAnchor          &GetAnchor( bool = true ) const;
+    inline const SwFormatCol                 &GetCol( bool = true ) const;
     inline const SvxPaperBinItem      &GetPaperBin( bool = true ) const;
     inline const SvxLRSpaceItem           &GetLRSpace( bool = true ) const;
     inline const SvxULSpaceItem           &GetULSpace( bool = true ) const;
-    inline const SwFmtCntnt           &GetCntnt( bool = true ) const;
+    inline const SwFormatContent           &GetContent( bool = true ) const;
     inline const SvxPrintItem             &GetPrint( bool = true ) const;
     inline const SvxOpaqueItem            &GetOpaque( bool = true ) const;
     inline const SvxProtectItem           &GetProtect( bool = true ) const;
-    inline const SwFmtVertOrient      &GetVertOrient( bool = true ) const;
+    inline const SwFormatVertOrient      &GetVertOrient( bool = true ) const;
     inline const SvxBoxItem               &GetBox( bool = true ) const;
-    inline const SvxFmtKeepItem         &GetKeep( bool = true ) const;
+    inline const SvxFormatKeepItem         &GetKeep( bool = true ) const;
 
     //UUUU Create SvxBrushItem for Background fill (partially for backwards compatibility)
     SvxBrushItem makeBackgroundBrushItem( bool = true ) const;
 
     inline const SvxShadowItem            &GetShadow( bool = true ) const;
-    inline const SwFmtPageDesc            &GetPageDesc( bool = true ) const;
-    inline const SvxFmtBreakItem      &GetBreak( bool = true ) const;
+    inline const SwFormatPageDesc            &GetPageDesc( bool = true ) const;
+    inline const SvxFormatBreakItem      &GetBreak( bool = true ) const;
     inline const SvxMacroItem             &GetMacro( bool = true ) const;
-    inline const SwFmtURL             &GetURL( bool = true ) const;
-    inline const SwFmtEditInReadonly  &GetEditInReadonly( bool = true ) const;
-    inline const SwFmtLayoutSplit     &GetLayoutSplit( bool = true ) const;
-    inline const SwFmtRowSplit          &GetRowSplit( bool = true ) const;
-    inline const SwFmtChain               &GetChain( bool = true ) const;
-    inline const SwFmtLineNumber      &GetLineNumber( bool = true ) const;
-    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( bool = true ) const;
-    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( bool = true ) const;
-    inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const;
+    inline const SwFormatURL             &GetURL( bool = true ) const;
+    inline const SwFormatEditInReadonly  &GetEditInReadonly( bool = true ) const;
+    inline const SwFormatLayoutSplit     &GetLayoutSplit( bool = true ) const;
+    inline const SwFormatRowSplit          &GetRowSplit( bool = true ) const;
+    inline const SwFormatChain               &GetChain( bool = true ) const;
+    inline const SwFormatLineNumber      &GetLineNumber( bool = true ) const;
+    inline const SwFormatFootnoteAtTextEnd     &GetFootnoteAtTextEnd( bool = true ) const;
+    inline const SwFormatEndAtTextEnd     &GetEndAtTextEnd( bool = true ) const;
+    inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
     inline const SvxFrameDirectionItem    &GetFrmDir( bool = true ) const;
     inline const SwTextGridItem         &GetTextGrid( bool = true ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
     // #i18732#
-    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(bool = true) const;
+    inline const SwFormatFollowTextFlow    &GetFollowTextFlow(bool = true) const;
     // #i28701#
-    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+    inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
     inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
 
     /// Graphics-attributes - implemented in grfatr.hxx
@@ -288,14 +288,14 @@ public:
     /// Paragraph-attributes - implemented in paratr.hxx.
     inline const SvxLineSpacingItem       &GetLineSpacing( bool = true ) const;
     inline const SvxAdjustItem            &GetAdjust( bool = true ) const;
-    inline const SvxFmtSplitItem      &GetSplit( bool = true ) const;
+    inline const SvxFormatSplitItem      &GetSplit( bool = true ) const;
     inline const SwRegisterItem           &GetRegister( bool = true ) const;
     inline const SwNumRuleItem            &GetNumRule( bool = true ) const;
     inline const SvxWidowsItem            &GetWidows( bool = true ) const;
     inline const SvxOrphansItem           &GetOrphans( bool = true ) const;
     inline const SvxTabStopItem           &GetTabStops( bool = true ) const;
     inline const SvxHyphenZoneItem        &GetHyphenZone( bool = true ) const;
-    inline const SwFmtDrop                &GetDrop( bool = true ) const;
+    inline const SwFormatDrop                &GetDrop( bool = true ) const;
     inline const SvxScriptSpaceItem       &GetScriptSpace(bool = true) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const;
     inline const SvxForbiddenRuleItem     &GetForbiddenRule(bool = true) const;
@@ -304,11 +304,11 @@ public:
     inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
 
     /// TableBox attributes - implemented in cellatr.hxx.
-    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( bool = true ) const;
-    inline  const SwTblBoxFormula       &GetTblBoxFormula( bool = true ) const;
-    inline  const SwTblBoxValue         &GetTblBoxValue( bool = true ) const;
+    inline  const SwTableBoxNumFormat     &GetTableBoxNumFormat( bool = true ) const;
+    inline  const SwTableBoxFormula       &GetTableBoxFormula( bool = true ) const;
+    inline  const SwTableBoxValue         &GetTableBoxValue( bool = true ) const;
 
-    /** SwFmt::IsBackgroundTransparent
+    /** SwFormat::IsBackgroundTransparent
 
         Virtual method to determine, if background of format is transparent.
         Default implementation returns false. Thus, subclasses have to override
@@ -325,7 +325,7 @@ public:
     virtual bool supportsFullDrawingLayerFillAttributeSet() const;
 };
 
-inline void SwFmt::SetName( const sal_Char* pNewName,
+inline void SwFormat::SetName( const sal_Char* pNewName,
                              bool bBroadcast )
 {
     SetName(OUString::createFromAscii(pNewName), bBroadcast);
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 4a68855a734b..4685e24ddbd1 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -53,14 +53,14 @@ inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const
     { return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); }
 inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const
     { return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); }
-inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const
-    { return static_cast<const SvxFmtKeepItem&>(Get( RES_KEEP,bInP)); }
+inline const SvxFormatKeepItem &SwAttrSet::GetKeep(bool bInP) const
+    { return static_cast<const SvxFormatKeepItem&>(Get( RES_KEEP,bInP)); }
 inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const
     { return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); }
 inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const
     { return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); }
-inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const
-    { return static_cast<const SvxFmtBreakItem&>(Get( RES_BREAK,bInP)); }
+inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const
+    { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); }
 inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
     { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
 inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
@@ -68,32 +68,32 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
 inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
     { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
 
-// Implementation of FrameAttribute methods of SwFmt.
-inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const
+// Implementation of FrameAttribute methods of SwFormat.
+inline const SvxPaperBinItem &SwFormat::GetPaperBin(bool bInP) const
     { return m_aSet.GetPaperBin(bInP); }
-inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const
+inline const SvxLRSpaceItem &SwFormat::GetLRSpace(bool bInP) const
     { return m_aSet.GetLRSpace(bInP); }
-inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const
+inline const SvxULSpaceItem &SwFormat::GetULSpace(bool bInP) const
     { return m_aSet.GetULSpace(bInP); }
-inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const
+inline const SvxPrintItem &SwFormat::GetPrint(bool bInP) const
     { return m_aSet.GetPrint(bInP); }
-inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const
+inline const SvxOpaqueItem &SwFormat::GetOpaque(bool bInP) const
     { return m_aSet.GetOpaque(bInP); }
-inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const
+inline const SvxProtectItem &SwFormat::GetProtect(bool bInP) const
     { return m_aSet.GetProtect(bInP); }
-inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const
+inline const SvxBoxItem &SwFormat::GetBox(bool bInP) const
     { return m_aSet.GetBox(bInP); }
-inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const
+inline const SvxFormatKeepItem &SwFormat::GetKeep(bool bInP) const
     { return m_aSet.GetKeep(bInP); }
-inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const
+inline const SvxShadowItem &SwFormat::GetShadow(bool bInP) const
     { return m_aSet.GetShadow(bInP); }
-inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const
+inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const
     { return m_aSet.GetBreak(bInP); }
-inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const
+inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const
     { return m_aSet.GetMacro(bInP); }
-inline const SvxFrameDirectionItem  &SwFmt::GetFrmDir(bool bInP) const
+inline const SvxFrameDirectionItem  &SwFormat::GetFrmDir(bool bInP) const
     { return m_aSet.GetFrmDir(bInP); }
-inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const
+inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const
     { return m_aSet.GetTextVertAdjust(bInP); }
 
 #endif // INCLUDED_SW_INC_FRMATR_HXX
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 33a16b2019c8..2b88accce81f 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -36,7 +36,7 @@ class SdrObject;
 namespace sw { class DocumentLayoutManager; }
 
 /// Style of a layout element.
-class SW_DLLPUBLIC SwFrmFmt: public SwFmt
+class SW_DLLPUBLIC SwFrameFormat: public SwFormat
 {
     friend class SwDoc;
     friend class SwPageDesc;    ///< Is allowed to call protected CTor.
@@ -49,25 +49,25 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
 protected:
-    SwFrmFmt(
+    SwFrameFormat(
         SwAttrPool& rPool,
-        const sal_Char* pFmtNm,
-        SwFrmFmt *pDrvdFrm,
-        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const sal_Char* pFormatNm,
+        SwFrameFormat *pDrvdFrm,
+        sal_uInt16 nFormatWhich = RES_FRMFMT,
         const sal_uInt16* pWhichRange = 0);
 
-    SwFrmFmt(
+    SwFrameFormat(
         SwAttrPool& rPool,
-        const OUString &rFmtNm,
-        SwFrmFmt *pDrvdFrm,
-        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const OUString &rFormatNm,
+        SwFrameFormat *pDrvdFrm,
+        sal_uInt16 nFormatWhich = RES_FRMFMT,
         const sal_uInt16* pWhichRange = 0);
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     ///< Already in base class Client.
-    virtual ~SwFrmFmt();
+    virtual ~SwFrameFormat();
 
     /// Destroys all Frms in aDepend (Frms are identified via PTR_CAST).
     virtual void DelFrms();
@@ -95,21 +95,21 @@ public:
        The UserCall knows its SdrObject. */
           SwContact *FindContactObj();
     const SwContact *FindContactObj() const
-        { return const_cast<SwFrmFmt*>(this)->FindContactObj(); }
+        { return const_cast<SwFrameFormat*>(this)->FindContactObj(); }
 
     /** @return the SdrObject, that is connected to the ContactObject.
-       Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts
+       Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats
        are connected to a Master and all FlyFrms has the "real SdrObject".
        "Real SdrObject" has position and a Z-order. */
           SdrObject *FindSdrObject();
     const SdrObject *FindSdrObject() const
-        { return const_cast<SwFrmFmt*>(this)->FindSdrObject(); }
+        { return const_cast<SwFrameFormat*>(this)->FindSdrObject(); }
 
           SdrObject *FindRealSdrObject();
     const SdrObject *FindRealSdrObject() const
-        { return const_cast<SwFrmFmt*>(this)->FindRealSdrObject(); }
+        { return const_cast<SwFrameFormat*>(this)->FindRealSdrObject(); }
 
-    bool IsLowerOf( const SwFrmFmt& rFmt ) const;
+    bool IsLowerOf( const SwFrameFormat& rFormat ) const;
 
     enum tLayoutDir
     {
@@ -119,8 +119,8 @@ public:
         VERT_L2R    ///< Not supported yet.
     };
 
-    virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
-    virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
+    virtual SwFrameFormat::tLayoutDir GetLayoutDir() const;
+    virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir );
 
     virtual sal_Int16 GetPositionLayoutDir() const;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
@@ -134,8 +134,8 @@ public:
                     ::com::sun::star::uno::XInterface> const& xObject)
             { m_wXObject = xObject; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt)
-    void RegisterToFormat( SwFmt& rFmt );
+    DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat)
+    void RegisterToFormat( SwFormat& rFormat );
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
@@ -146,7 +146,7 @@ public:
 
 // The FlyFrame-Format
 
-class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat
 {
     friend class SwDoc;
     OUString msTitle;
@@ -158,22 +158,22 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
        when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
     Point   m_aLastFlyFrmPrtRectPos;
 
-    SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
-    SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
 
 protected:
-    SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+    SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT )
     {}
-    SwFlyFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+    SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT )
     {}
 
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SwFlyFrmFmt();
+    virtual ~SwFlyFrameFormat();
 
     /// Creates the views.
     virtual void MakeFrms() SAL_OVERRIDE;
@@ -193,7 +193,7 @@ public:
     OUString GetObjDescription() const;
     void SetObjDescription( const OUString& rDescription, bool bBroadcast = false );
 
-    /** SwFlyFrmFmt::IsBackgroundTransparent
+    /** SwFlyFrameFormat::IsBackgroundTransparent
 
         Override virtual method and its default implementation,
         because format of fly frame provides transparent backgrounds.
@@ -206,7 +206,7 @@ public:
     */
     virtual bool IsBackgroundTransparent() const SAL_OVERRIDE;
 
-    /** SwFlyFrmFmt::IsBackgroundBrushInherited
+    /** SwFlyFrameFormat::IsBackgroundBrushInherited
 
         Method to determine, if the brush for drawing the
         background is "inherited" from its parent/grandparent.
@@ -222,45 +222,45 @@ public:
     const Point & GetLastFlyFrmPrtRectPos() const       { return m_aLastFlyFrmPrtRectPos; }
     void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
 };
 
 //The DrawFrame-Format
 
-class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
 {
     friend class SwDoc;
 
     mutable const SdrObject * pSdrObjCached;
     mutable OUString sSdrObjCachedComment;
 
-    SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
-    SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
 
-    SwFrmFmt::tLayoutDir meLayoutDir;
+    SwFrameFormat::tLayoutDir meLayoutDir;
 
     sal_Int16 mnPositionLayoutDir;
 
     bool mbPosAttrSet;
 
 protected:
-    SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+    SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
 
-          meLayoutDir( SwFrmFmt::HORI_L2R ),
+          meLayoutDir( SwFrameFormat::HORI_L2R ),
 
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
 
           mbPosAttrSet( false )
 
     {}
-    SwDrawFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+    SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
-          meLayoutDir( SwFrmFmt::HORI_L2R ),
+          meLayoutDir( SwFrameFormat::HORI_L2R ),
 
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
 
@@ -269,7 +269,7 @@ protected:
 
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SwDrawFrmFmt();
+    virtual ~SwDrawFrameFormat();
 
     /** DrawObjects are removed from the arrays at the layout.
      The DrawObjects are marked as deleted. */
@@ -281,8 +281,8 @@ public:
 
     virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
 
-    virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
-    virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
+    virtual SwFrameFormat::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
+    virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
 
     virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE;
@@ -297,10 +297,10 @@ public:
 
     virtual OUString GetDescription() const SAL_OVERRIDE;
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt);
+    DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat);
 };
 
-SW_DLLPUBLIC bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt);
+SW_DLLPUBLIC bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat);
 
 #endif
 
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index ee695e18ff06..b79a57e72980 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -23,44 +23,44 @@
 #include <sal/types.h>
 #include <o3tl/sorted_vector.hxx>
 
-class SwTxtFtn;
+class SwTextFootnote;
 class SwNodeIndex;
 class SwSectionNode;
 
 // Everywhere where NodeIndex is used, the header files missing here
 // are already included. Therefore put here as defines only and
 // not as inline methods (saves compile time).
-#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex())
+#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
 
-struct CompareSwFtnIdxs
+struct CompareSwFootnoteIdxs
 {
-    bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const;
+    bool operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const;
 };
 
-class SwFtnIdxs : public o3tl::sorted_vector<SwTxtFtn*, CompareSwFtnIdxs>
+class SwFootnoteIdxs : public o3tl::sorted_vector<SwTextFootnote*, CompareSwFootnoteIdxs>
 {
 public:
-    SwFtnIdxs() {}
+    SwFootnoteIdxs() {}
 
-    void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos.
-    void UpdateAllFtn();                       // Update all footnotes.
+    void UpdateFootnote( const SwNodeIndex& rStt ); // Update all from pos.
+    void UpdateAllFootnote();                       // Update all footnotes.
 
-    SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
+    SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
 };
 
-class SwUpdFtnEndNtAtEnd
+class SwUpdFootnoteEndNtAtEnd
 {
-    std::vector<const SwSectionNode*> aFtnSects, aEndSects;
-    std::vector<sal_uInt16> aFtnNums, aEndNums;
+    std::vector<const SwSectionNode*> aFootnoteSects, aEndSects;
+    std::vector<sal_uInt16> aFootnoteNums, aEndNums;
 
 public:
-    SwUpdFtnEndNtAtEnd() : aFtnSects(), aEndSects() {}
+    SwUpdFootnoteEndNtAtEnd() : aFootnoteSects(), aEndSects() {}
 
     static const SwSectionNode* FindSectNdWithEndAttr(
-                                            const SwTxtFtn& rTxtFtn );
+                                            const SwTextFootnote& rTextFootnote );
 
-    sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd );
-    sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn );
+    sal_uInt16 GetNumber( const SwTextFootnote& rTextFootnote, const SwSectionNode& rNd );
+    sal_uInt16 ChkNumber( const SwTextFootnote& rTextFootnote );
 };
 
 #endif // INCLUDED_SW_INC_FTNIDX_HXX
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 2b250287892b..fc5a4e5f0bb7 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -25,15 +25,15 @@
 #include <editeng/numitem.hxx>
 #include <fmtcol.hxx>
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwPageDesc;
-class SwCharFmt;
+class SwCharFormat;
 class SwDoc;
 
 class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
 {
     SwDepend    aPageDescDep;
-    SwDepend    aCharFmtDep, aAnchorCharFmtDep;
+    SwDepend    aCharFormatDep, aAnchorCharFormatDep;
     OUString sPrefix;
     OUString sSuffix;
 protected:
@@ -41,29 +41,29 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
-    SvxNumberType aFmt;
-    sal_uInt16    nFtnOffset;
+    SvxNumberType aFormat;
+    sal_uInt16    nFootnoteOffset;
 
     void        ChgPageDesc( SwPageDesc *pDesc );
     SwPageDesc* GetPageDesc( SwDoc &rDoc ) const;
     bool        KnowsPageDesc() const;
     bool        DependsOn( const SwPageDesc* ) const;
 
-    void SetFtnTxtColl(SwTxtFmtColl& rColl);
-    SwTxtFmtColl* GetFtnTxtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } // can be 0.
+    void SetFootnoteTextColl(SwTextFormatColl& rColl);
+    SwTextFormatColl* GetFootnoteTextColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } // can be 0.
 
-    SwCharFmt* GetCharFmt(SwDoc &rDoc) const;
-    void SetCharFmt( SwCharFmt* );
-    SwClient   *GetCharFmtDep() const { return (SwClient*)&aCharFmtDep; }
+    SwCharFormat* GetCharFormat(SwDoc &rDoc) const;
+    void SetCharFormat( SwCharFormat* );
+    SwClient   *GetCharFormatDep() const { return (SwClient*)&aCharFormatDep; }
 
-    SwCharFmt* GetAnchorCharFmt(SwDoc &rDoc) const;
-    void SetAnchorCharFmt( SwCharFmt* );
-    SwClient   *GetAnchorCharFmtDep() const { return (SwClient*)&aAnchorCharFmtDep; }
+    SwCharFormat* GetAnchorCharFormat(SwDoc &rDoc) const;
+    void SetAnchorCharFormat( SwCharFormat* );
+    SwClient   *GetAnchorCharFormatDep() const { return (SwClient*)&aAnchorCharFormatDep; }
 
     SwEndNoteInfo & operator=(const SwEndNoteInfo&);
     bool operator==( const SwEndNoteInfo &rInf ) const;
 
-    SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
+    SwEndNoteInfo( SwTextFormatColl *pTextColl = 0);
     SwEndNoteInfo(const SwEndNoteInfo&);
 
     const OUString& GetPrefix() const  { return sPrefix; }
@@ -74,34 +74,34 @@ public:
     void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
 };
 
-enum SwFtnPos
+enum SwFootnotePos
 {
     // Momentarily only PAGE and CHAPTER. CHAPTER == document-endnotes.
     FTNPOS_PAGE = 1,
     FTNPOS_CHAPTER = 8
 };
 
-enum SwFtnNum
+enum SwFootnoteNum
 {
     FTNNUM_PAGE, FTNNUM_CHAPTER, FTNNUM_DOC
 };
 
-class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo
+class SW_DLLPUBLIC SwFootnoteInfo: public SwEndNoteInfo
 {
     using SwEndNoteInfo::operator ==;
 
 public:
     OUString  aQuoVadis;
     OUString  aErgoSum;
-    SwFtnPos  ePos;
-    SwFtnNum  eNum;
+    SwFootnotePos  ePos;
+    SwFootnoteNum  eNum;
 
-    SwFtnInfo& operator=(const SwFtnInfo&);
+    SwFootnoteInfo& operator=(const SwFootnoteInfo&);
 
-    bool operator==( const SwFtnInfo &rInf ) const;
+    bool operator==( const SwFootnoteInfo &rInf ) const;
 
-    SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
-    SwFtnInfo(const SwFtnInfo&);
+    SwFootnoteInfo(SwTextFormatColl* pTextColl = 0);
+    SwFootnoteInfo(const SwFootnoteInfo&);
 };
 
 #endif
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 2f09cb190435..3b7fed9b6df6 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -314,30 +314,30 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const
 inline const SwDrawModeGrf      &SwAttrSet::GetDrawModeGrf(bool bInP) const
     { return static_cast<const SwDrawModeGrf&>(Get( RES_GRFATR_DRAWMODE,bInP)); }
 
-// Implementation of graphics attributes methods of SwFmt
-inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const
+// Implementation of graphics attributes methods of SwFormat
+inline const SwMirrorGrf &SwFormat::GetMirrorGrf(bool bInP) const
     { return m_aSet.GetMirrorGrf(bInP); }
-inline const SwCropGrf   &SwFmt::GetCropGrf(bool bInP) const
+inline const SwCropGrf   &SwFormat::GetCropGrf(bool bInP) const
     { return m_aSet.GetCropGrf(bInP); }
-inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const
+inline const SwRotationGrf &SwFormat::GetRotationGrf(bool bInP) const
     { return m_aSet.GetRotationGrf(bInP); }
-inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const
+inline const SwLuminanceGrf &SwFormat::GetLuminanceGrf(bool bInP) const
     { return m_aSet.GetLuminanceGrf( bInP); }
-inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const
+inline const SwContrastGrf &SwFormat::GetContrastGrf(bool bInP) const
     { return m_aSet.GetContrastGrf( bInP); }
-inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const
+inline const SwChannelRGrf &SwFormat::GetChannelRGrf(bool bInP) const
     { return m_aSet.GetChannelRGrf( bInP); }
-inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const
+inline const SwChannelGGrf &SwFormat::GetChannelGGrf(bool bInP) const
     { return m_aSet.GetChannelGGrf( bInP); }
-inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const
+inline const SwChannelBGrf &SwFormat::GetChannelBGrf(bool bInP) const
     { return m_aSet.GetChannelBGrf( bInP); }
-inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const
+inline const SwGammaGrf &SwFormat::GetGammaGrf(bool bInP) const
     { return m_aSet.GetGammaGrf( bInP); }
-inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const
+inline const SwInvertGrf &SwFormat::GetInvertGrf(bool bInP) const
     { return m_aSet.GetInvertGrf( bInP); }
-inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const
+inline const SwTransparencyGrf &SwFormat::GetTransparencyGrf(bool bInP) const
     { return m_aSet.GetTransparencyGrf( bInP); }
-inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const
+inline const SwDrawModeGrf &SwFormat::GetDrawModeGrf(bool bInP) const
     { return m_aSet.GetDrawModeGrf(bInP); }
 
 #endif // INCLUDED_SW_INC_GRFATR_HXX
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index fe1a417d6d95..f648b84083b9 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -43,7 +43,7 @@ public:
 inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
     { return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); }
 
-inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const
+inline const SwHeaderAndFooterEatSpacingItem &SwFormat::GetHeaderAndFooterEatSpacing(bool bInP) const
     { return m_aSet.GetHeaderAndFooterEatSpacing(bInP); }
 
 #endif
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 43c1e326f53c..61c8c437558f 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
     sal_uInt16      m_nPageStart;     ///< first checked page
 
     bool        m_bIsDrawObj;
-    bool        m_bIsOtherCntnt;
+    bool        m_bIsOtherContent;
     bool        m_bStartChk;
     bool        m_bIsSelection;       ///< true if only the selected text should be converted
     bool        m_bStartDone;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index f98b10389497..93af3fba2a0e 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -24,7 +24,7 @@
 #include <svx/xdef.hxx>
 #include "swdllapi.h"
 
-// For SwTxtHints without end index the following char is added:
+// For SwTextHints without end index the following char is added:
 
 #define CH_TXTATR_BREAKWORD     ((sal_Unicode)0x01)
 #define CH_TXTATR_INWORD        ((sal_Unicode)0xFFF9)
@@ -109,7 +109,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
 
 /** text attributes with start and end.
    #i105453#:
-   Hints (SwTxtAttr) with the same start and end position are sorted by
+   Hints (SwTextAttr) with the same start and end position are sorted by
    WhichId, i.e., the TXTATR constants defined here.
    The text formatting (SwAttrIter) poses some requirements on TXTATR order:
    - AUTOFMT must precede CHARFMT, so that auto style can overwrite char style.
@@ -118,7 +118,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
       hints on insertion, but on exporting to ODF. if CHARFMT would precede
       INETFMT, then exporting and importing will effectively change precedence)
 
-   Nesting hints (SwTxtAttrNesting) also have requirements on TXTATR order,
+   Nesting hints (SwTextAttrNesting) also have requirements on TXTATR order,
    to ensure proper nesting (because CJK_RUBY and INETFMT have no CH_TXTATR):
    - INETFMT should precede CJK_RUBY (for UNO API it does not matter...)
    - META and METAFIELD must precede CJK_RUBY and INETFMT
@@ -438,35 +438,35 @@ SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript
 // This function returns
 //      CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default)
 //      CH_TXTATR_INWORD    for Textattribute which dont breaks a word
-class SwTxtAttr;
-sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
+class SwTextAttr;
+sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr );
 
 // all Sets defined in init.cxx
 
 // AttrSet-Range for the 3 Break-Attribute
 extern sal_uInt16 aBreakSetRange[];
-// AttrSet-Range for TxtFmtColl
-extern sal_uInt16 aTxtFmtCollSetRange[];
-// AttrSet-Range for GrfFmtColl
-extern sal_uInt16 aGrfFmtCollSetRange[];
+// AttrSet-Range for TextFormatColl
+extern sal_uInt16 aTextFormatCollSetRange[];
+// AttrSet-Range for GrfFormatColl
+extern sal_uInt16 aGrfFormatCollSetRange[];
 // AttrSet-Range for TextNode
-SW_DLLPUBLIC extern sal_uInt16 aTxtNodeSetRange[];
-// AttrSet-Range for NoTxtNode
-extern sal_uInt16 aNoTxtNodeSetRange[];
+SW_DLLPUBLIC extern sal_uInt16 aTextNodeSetRange[];
+// AttrSet-Range for NoTextNode
+extern sal_uInt16 aNoTextNodeSetRange[];
 // AttrSet-Range for SwTable
 extern sal_uInt16 aTableSetRange[];
 // AttrSet-Range for SwTableLine
 extern sal_uInt16 aTableLineSetRange[];
 // AttrSet-Range for SwTableBox
 extern sal_uInt16 aTableBoxSetRange[];
-// AttrSet-Range for SwFrmFmt
-SW_DLLPUBLIC extern sal_uInt16 aFrmFmtSetRange[];
-// AttrSet-Range for SwCharFmt
-extern sal_uInt16 aCharFmtSetRange[];
+// AttrSet-Range for SwFrameFormat
+SW_DLLPUBLIC extern sal_uInt16 aFrameFormatSetRange[];
+// AttrSet-Range for SwCharFormat
+extern sal_uInt16 aCharFormatSetRange[];
 // AttrSet-Range for the autostyles
-extern sal_uInt16 aCharAutoFmtSetRange[];
-// AttrSet-Range for SwPageDescFmt
-extern sal_uInt16 aPgFrmFmtSetRange[];
+extern sal_uInt16 aCharAutoFormatSetRange[];
+// AttrSet-Range for SwPageDescFormat
+extern sal_uInt16 aPgFrameFormatSetRange[];
 
 // check if ID is InRange of AttrSet-Ids
 bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 92a5744bbb7f..5920b042f270 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -23,15 +23,15 @@
 #include <vcl/vclptr.hxx>
 #include <vector>
 
-class SwFmt;
+class SwFormat;
 class OutputDevice;
 class SwTable;
 class SwNode;
 class SwNodes;
-class SwCntntNode;
+class SwContentNode;
 class SwPageFrm;
 class SwFrm;
-class SwTxtNode;
+class SwTextNode;
 class SwHistory;
 
 // Base class for all Message-Hints:
@@ -59,23 +59,23 @@ public:
 };
 
 /*
- * SwFmtChg is sent when a format has changed to another format. 2 Hints are always sent
+ * SwFormatChg is sent when a format has changed to another format. 2 Hints are always sent
  * the old and the new format
  */
-class SwFmtChg: public SwMsgPoolItem
+class SwFormatChg: public SwMsgPoolItem
 {
 public:
-    SwFmt *pChangedFmt;
-    SwFmtChg( SwFmt *pFmt );
+    SwFormat *pChangedFormat;
+    SwFormatChg( SwFormat *pFormat );
 };
 
-class SwInsTxt: public SwMsgPoolItem
+class SwInsText: public SwMsgPoolItem
 {
 public:
     sal_Int32 nPos;
     sal_Int32 nLen;
 
-    SwInsTxt( sal_Int32 nP, sal_Int32 nL );
+    SwInsText( sal_Int32 nP, sal_Int32 nL );
 };
 
 class SwDelChr: public SwMsgPoolItem
@@ -86,13 +86,13 @@ public:
     SwDelChr( sal_Int32 nP );
 };
 
-class SwDelTxt: public SwMsgPoolItem
+class SwDelText: public SwMsgPoolItem
 {
 public:
     sal_Int32 nStart;
     sal_Int32 nLen;
 
-    SwDelTxt( sal_Int32 nS, sal_Int32 nL );
+    SwDelText( sal_Int32 nS, sal_Int32 nL );
 };
 
 class SwUpdateAttr : public SwMsgPoolItem
@@ -101,7 +101,7 @@ private:
     sal_Int32 nStart;
     sal_Int32 nEnd;
     sal_uInt16 nWhichAttr;
-    std::vector<sal_uInt16> aWhichFmtAttr; // attributes changed inside RES_TXTATR_AUTOFMT
+    std::vector<sal_uInt16> aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT
 
 public:
     SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
@@ -121,16 +121,16 @@ public:
         return nWhichAttr;
     }
 
-    const std::vector<sal_uInt16>& getFmtAttr() const
+    const std::vector<sal_uInt16>& getFormatAttr() const
     {
-        return aWhichFmtAttr;
+        return aWhichFormatAttr;
     }
 };
 
-/** SwRefMarkFldUpdate is sent when the referencemarks should be updated.
+/** SwRefMarkFieldUpdate is sent when the referencemarks should be updated.
      To determine Page- / chapternumbers the current frame has to be asked.
       For this we need the current outputdevice */
-class SwRefMarkFldUpdate : public SwMsgPoolItem
+class SwRefMarkFieldUpdate : public SwMsgPoolItem
 {
 public:
     VclPtr<OutputDevice> pOut; ///< pointer to the current output device
@@ -139,7 +139,7 @@ public:
         To get the page/chapter number, the frame has to be asked. For that we need
         the current OutputDevice.
     */
-    SwRefMarkFldUpdate( OutputDevice* );
+    SwRefMarkFieldUpdate( OutputDevice* );
 };
 
 /** SwDocPosUpdate is sent to signal that only the frames from or to a specified document-global position
@@ -151,39 +151,39 @@ public:
     SwDocPosUpdate( const long nDocPos );
 };
 
-/// SwTableFmlUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
-enum TableFmlUpdtFlags { TBL_CALC = 0,
+/// SwTableFormulaUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
+enum TableFormulaUpdateFlags { TBL_CALC = 0,
                          TBL_BOXNAME,
                          TBL_BOXPTR,
                          TBL_RELBOXNAME,
                          TBL_MERGETBL,
                          TBL_SPLITTBL
                        };
-class SwTableFmlUpdate : public SwMsgPoolItem
+class SwTableFormulaUpdate : public SwMsgPoolItem
 {
 public:
-    const SwTable* pTbl;         ///< Pointer to the current table
+    const SwTable* pTable;         ///< Pointer to the current table
     union {
-        const SwTable* pDelTbl;  ///< Merge: Pointer to the table to be removed
-        const OUString* pNewTblNm; ///< Split: the name of the new table
+        const SwTable* pDelTable;  ///< Merge: Pointer to the table to be removed
+        const OUString* pNewTableNm; ///< Split: the name of the new table
     } DATA;
     SwHistory* pHistory;
     sal_uInt16 nSplitLine;       ///< Split: from this BaseLine on will be splitted
-    TableFmlUpdtFlags eFlags;
+    TableFormulaUpdateFlags eFlags;
     bool bModified : 1;
     bool bBehindSplitLine : 1;
 
     /** Is sent if a table should be recalculated */
-    SwTableFmlUpdate( const SwTable* );
+    SwTableFormulaUpdate( const SwTable* );
 };
 
-class SwAutoFmtGetDocNode: public SwMsgPoolItem
+class SwAutoFormatGetDocNode: public SwMsgPoolItem
 {
 public:
-    const SwCntntNode* pCntntNode;
+    const SwContentNode* pContentNode;
     const SwNodes* pNodes;
 
-    SwAutoFmtGetDocNode( const SwNodes* pNds );
+    SwAutoFormatGetDocNode( const SwNodes* pNds );
 };
 
 /*
@@ -219,8 +219,8 @@ public:
 class SwCondCollCondChg: public SwMsgPoolItem
 {
 public:
-    SwFmt *pChangedFmt;
-    SwCondCollCondChg( SwFmt *pFmt );
+    SwFormat *pChangedFormat;
+    SwCondCollCondChg( SwFormat *pFormat );
 };
 
 class SwVirtPageNumInfo: public SwMsgPoolItem
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 27cb7bc2e94e..928ae53023d6 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -30,7 +30,7 @@ class SwTableBox;
 class SwTable;
 class SwHTMLTableLayout;
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 
 #define HTMLTABLE_RESIZE_NOW (ULONG_MAX)
 
@@ -239,7 +239,7 @@ class SwHTMLTableLayout
     void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
 
     const SwStartNode *GetAnyBoxStartNode() const;
-    SwFrmFmt *FindFlyFrmFmt() const;
+    SwFrameFormat *FindFlyFrameFormat() const;
     const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); }
 
     void ClearPass1Info() { nMin = nMax = 0; }
@@ -251,7 +251,7 @@ class SwHTMLTableLayout
     static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc );
 public:
 
-    SwHTMLTableLayout( const SwTable *pSwTbl,
+    SwHTMLTableLayout( const SwTable *pSwTable,
                        sal_uInt16 nRows, sal_uInt16 nCols, bool bColsOpt, bool ColTgs,
                        sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt,
                        sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index f5a6f3c22a92..a1e2695dcf2f 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -23,7 +23,7 @@
 #include <editeng/numitem.hxx>
 #include "swdllapi.h"
 
-class SwCharFmt;
+class SwCharFormat;
 class IDocumentStylePoolAccess;
 
 enum LineNumberPosition
@@ -59,8 +59,8 @@ public:
     SwLineNumberInfo& operator=(const SwLineNumberInfo&);
     bool operator==( const SwLineNumberInfo& rInf ) const;
 
-    SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const;
-    void SetCharFmt( SwCharFmt* );
+    SwCharFormat *GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const;
+    void SetCharFormat( SwCharFormat* );
 
     const SvxNumberType &GetNumType() const             { return aType; }
     void                SetNumType( SvxNumberType aNew ){ aType = aNew; }
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index ca4dcf4c7943..1e21326cdcd2 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -54,7 +54,7 @@ void EnableCmdInterface(bool bEnable = true);
 void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
 
 // Read ChgMode for tables from configuration.
-TblChgMode GetTblChgDefaultMode();
+TableChgMode GetTableChgDefaultMode();
 
 bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
 
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 7088f2784fe9..06fc3f1412f5 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -36,7 +36,7 @@ class SwModuleOptions;
 class InsCaptionOpt;
 
 // text format for the sending of messages ------------------------------
-enum class MailTxtFormats
+enum class MailTextFormats
 {
     NONE      = 0x00,
     ASCII     = 0x01,
@@ -46,7 +46,7 @@ enum class MailTxtFormats
 };
 namespace o3tl
 {
-    template<> struct typed_flags<MailTxtFormats> : is_typed_flags<MailTxtFormats, 0x0f> {};
+    template<> struct typed_flags<MailTextFormats> : is_typed_flags<MailTextFormats, 0x0f> {};
 }
 
 
@@ -122,7 +122,7 @@ class SwInsertConfig : public utl::ConfigItem
     bool            bInsWithCaption;       //Insert/Caption/Automatic
     bool            bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
 
-    SwInsertTableOptions    aInsTblOpts;
+    SwInsertTableOptions    aInsTableOpts;
     bool            bIsWeb;
 
     const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -142,15 +142,15 @@ class SwTableConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
-    sal_uInt16      nTblHMove;          //int Table/Shift/Row
-    sal_uInt16      nTblVMove;          //int Table/Shift/Column
-    sal_uInt16      nTblHInsert;        //int Table/Insert/Row
-    sal_uInt16      nTblVInsert;        //int Table/Insert/Column
-    TblChgMode  eTblChgMode;        //int Table/Change/Effect
+    sal_uInt16      nTableHMove;          //int Table/Shift/Row
+    sal_uInt16      nTableVMove;          //int Table/Shift/Column
+    sal_uInt16      nTableHInsert;        //int Table/Insert/Row
+    sal_uInt16      nTableVInsert;        //int Table/Insert/Column
+    TableChgMode  eTableChgMode;        //int Table/Change/Effect
 
-    bool    bInsTblFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
-    bool    bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
-    bool    bInsTblAlignNum;        // Table/Input/Alignment                // Align numbers.
+    bool    bInsTableFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
+    bool    bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
+    bool    bInsTableAlignNum;        // Table/Input/Alignment                // Align numbers.
 
     static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
@@ -177,7 +177,7 @@ class SwMiscConfig : public utl::ConfigItem
     bool        bSinglePrintJob;            // FormLetter/PrintOutput/SinglePrintJobs
     bool        bIsNameFromColumn;          // FormLetter/FileOutput/FileName/Generation
     bool        bAskForMailMergeInPrint;    // Ask if documents containing fields should be 'mailmerged'
-    MailTxtFormats nMailingFormats;            // FormLetter/MailingOutput/Formats
+    MailTextFormats nMailingFormats;            // FormLetter/MailingOutput/Formats
     OUString    sNameFromColumn;            // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
     OUString    sMailingPath;               // FormLetter/FileOutput/Path
     OUString    sMailName;                  // FormLetter/FileOutput/FileName/FromManualSetting (string!)
@@ -214,24 +214,24 @@ class SW_DLLPUBLIC SwModuleOptions
 public:
     SwModuleOptions();
 
-    TblChgMode  GetTblMode() const { return aTableConfig.eTblChgMode;}
-    void        SetTblMode( TblChgMode  eSet ) { aTableConfig.eTblChgMode = eSet;
+    TableChgMode  GetTableMode() const { return aTableConfig.eTableChgMode;}
+    void        SetTableMode( TableChgMode  eSet ) { aTableConfig.eTableChgMode = eSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblHMove() const { return aTableConfig.nTblHMove;}
-    void        SetTblHMove( sal_uInt16 nSet ) {    aTableConfig.nTblHMove = nSet;
+    sal_uInt16      GetTableHMove() const { return aTableConfig.nTableHMove;}
+    void        SetTableHMove( sal_uInt16 nSet ) {    aTableConfig.nTableHMove = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblVMove() const { return aTableConfig.nTblVMove;}
-    void        SetTblVMove( sal_uInt16 nSet ) {    aTableConfig.nTblVMove = nSet;
+    sal_uInt16      GetTableVMove() const { return aTableConfig.nTableVMove;}
+    void        SetTableVMove( sal_uInt16 nSet ) {    aTableConfig.nTableVMove = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblHInsert() const {return aTableConfig.nTblHInsert;}
-    void        SetTblHInsert( sal_uInt16 nSet ) {  aTableConfig.nTblHInsert = nSet;
+    sal_uInt16      GetTableHInsert() const {return aTableConfig.nTableHInsert;}
+    void        SetTableHInsert( sal_uInt16 nSet ) {  aTableConfig.nTableHInsert = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblVInsert() const {return aTableConfig.nTblVInsert;}
-    void        SetTblVInsert( sal_uInt16 nSet ) {  aTableConfig.nTblVInsert = nSet;
+    sal_uInt16      GetTableVInsert() const {return aTableConfig.nTableVInsert;}
+    void        SetTableVInsert( sal_uInt16 nSet ) {  aTableConfig.nTableVInsert = nSet;
                                                 aTableConfig.SetModified();}
 
     const AuthorCharAttr    &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; }
@@ -271,28 +271,28 @@ public:
                     }
                 }
 
-    bool        IsInsTblFormatNum(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; }
-    void        SetInsTblFormatNum( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b);
+    bool        IsInsTableFormatNum(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableFormatNum : aTableConfig.bInsTableFormatNum; }
+    void        SetInsTableFormatNum( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableFormatNum = b) : (aTableConfig.bInsTableFormatNum = b);
                       bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    bool        IsInsTblChangeNumFormat(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; }
-    void        SetInsTblChangeNumFormat( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b);
+    bool        IsInsTableChangeNumFormat(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableChangeNumFormat : aTableConfig.bInsTableChangeNumFormat; }
+    void        SetInsTableChangeNumFormat( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableChangeNumFormat = b) : (aTableConfig.bInsTableChangeNumFormat = b);
                       bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    bool        IsInsTblAlignNum(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; }
-    void        SetInsTblAlignNum( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b);
+    bool        IsInsTableAlignNum(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableAlignNum : aTableConfig.bInsTableAlignNum; }
+    void        SetInsTableAlignNum( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableAlignNum = b) : (aTableConfig.bInsTableAlignNum = b);
                         bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    SwInsertTableOptions GetInsTblFlags(bool bHTML) const
-                    { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;}
-    void        SetInsTblFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
-                    bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts);
+    SwInsertTableOptions GetInsTableFlags(bool bHTML) const
+                    { return bHTML ? aWebInsertConfig.aInsTableOpts : aInsertConfig.aInsTableOpts;}
+    void        SetInsTableFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
+                    bHTML ? (aWebInsertConfig.aInsTableOpts = rOpts) : (aInsertConfig.aInsTableOpts = rOpts);
                     bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();}
 
     const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId);
@@ -302,8 +302,8 @@ public:
     void        SetGrfToGalleryAsLnk( bool b )  { aMiscConfig.bGrfToGalleryAsLnk = b;
                                                   aMiscConfig.SetModified();}
 
-    MailTxtFormats GetMailingFormats() const               { return aMiscConfig.nMailingFormats;}
-    void           SetMailingFormats( MailTxtFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
+    MailTextFormats GetMailingFormats() const               { return aMiscConfig.nMailingFormats;}
+    void           SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
                                                             aMiscConfig.SetModified();}
 
     bool        IsSinglePrintJob() const        { return aMiscConfig.bSinglePrintJob; }
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 386b536b50dc..15bf06052554 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -25,7 +25,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <vector>
 
-class SwTxtNode;
+class SwTextNode;
 
 /** Some helpers for converting model strings to view strings.
 
@@ -36,7 +36,7 @@ class SwTxtNode;
     helper functions are provided to convert model positions to view positions
     and vice versa.
 
-           CH_TXTATR_BREAKWORD -> SwTxtNode will have field attributes associated with these
+           CH_TXTATR_BREAKWORD -> SwTextNode will have field attributes associated with these
                 .       .
                 .       .
                 .       .
@@ -125,7 +125,7 @@ public:
         ModelPosition() : mnPos(0), mnSubPos(0), mbIsField(false) {}
     };
 
-    ModelToViewHelper(const SwTxtNode &rNode,
+    ModelToViewHelper(const SwTextNode &rNode,
             // defaults are appropriate for spell/grammar checking
             ExpandMode eMode = ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     ModelToViewHelper() //pass through filter, view == model
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 158b8dc2d0a8..4ff30a8749be 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -38,9 +38,9 @@ class Graphic;
 class GraphicObject;
 class SwAttrSet;
 class SfxItemSet;
-class SwCntntNode;
+class SwContentNode;
 class SwDoc;
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwGrfNode;
 class SwHistory;
 class SwNode;
@@ -50,20 +50,20 @@ class SwOLENode;
 class SwOutlineNodes;
 class SwPaM;
 class SwSectionData;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
-class SwTableBoxFmt;
-class SwTableFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
 class SwTableLine;
-class SwTableLineFmt;
+class SwTableLineFormat;
 class SwTableNode;
-class SwTblToTxtSaves;
-class SwTxtFmtColl;
-class SwTxtNode;
-class SwUndoTblToTxt;
-class SwUndoTxtToTbl;
+class SwTableToTextSaves;
+class SwTextFormatColl;
+class SwTextNode;
+class SwUndoTableToText;
+class SwUndoTextToTable;
 struct SwPosition;
 
 namespace sw { class DocumentContentOperationsManager; }
@@ -123,10 +123,10 @@ class SW_DLLPUBLIC SwNodes
     void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize,
                   SwNodeIndex& rInsPos, bool bNewFrms );
 
-    void UpdtOutlineIdx( const SwNode& );   ///< Update all OutlineNodes starting from Node.
+    void UpdateOutlineIdx( const SwNode& );   ///< Update all OutlineNodes starting from Node.
 
     void _CopyNodes( const SwNodeRange&, const SwNodeIndex&,
-                    bool bNewFrms = true, bool bTblInsDummyNode = false ) const;
+                    bool bNewFrms = true, bool bTableInsDummyNode = false ) const;
     void _DelDummyNodes( const SwNodeRange& rRg );
 
 protected:
@@ -186,19 +186,19 @@ public:
     static void GoStartOfSection(SwNodeIndex *);
     static void GoEndOfSection(SwNodeIndex *);
 
-    SwCntntNode* GoNext(SwNodeIndex *) const;
-    static SwCntntNode* GoPrevious(SwNodeIndex *);
+    SwContentNode* GoNext(SwNodeIndex *) const;
+    static SwContentNode* GoPrevious(SwNodeIndex *);
 
-    /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist.
+    /** Go to next/previous Content/Table-node for which LayoutFrames exist.
      While doing this do not leave Header/Footer/Frame etc. */
     SwNode* GoNextWithFrm(SwNodeIndex *) const;
     SwNode* GoPreviousWithFrm(SwNodeIndex *) const;
 
     /** Go to next content-node that is not protected or hidden
        (Both set FALSE ==> GoNext/GoPrevious!!!). */
-    SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden  = true,
+    SwContentNode* GoNextSection( SwNodeIndex *, bool bSkipHidden  = true,
                                            bool bSkipProtect = true ) const;
-    static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
+    static SwContentNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
                                            bool bSkipProtect = true );
 
     /** Create an empty section of Start- and EndNote. It may be called
@@ -208,35 +208,35 @@ public:
                                     SwStartNodeType = SwNormalStartNode );
 
     /// Implementations of "Make...Node" are in the given .cxx-files.
-    SwTxtNode *MakeTxtNode( const SwNodeIndex & rWhere,
-                            SwTxtFmtColl *pColl,
+    SwTextNode *MakeTextNode( const SwNodeIndex & rWhere,
+                            SwTextFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndtxt.cxx
     SwStartNode* MakeTextSection( const SwNodeIndex & rWhere,
                             SwStartNodeType eSttNdTyp,
-                            SwTxtFmtColl *pColl,
+                            SwTextFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 );
 
     static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const OUString& rGrfName,
                             const OUString& rFltName,
                             const Graphic* pGraphic,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0,
                             bool bDelayed = false );    ///< in ndgrf.cxx
 
     static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const GraphicObject& rGrfObj,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx
 
     SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
                             const svt::EmbeddedObjectRef&,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx
     SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
                             const OUString &rName,
                             sal_Int64 nAspect,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr ); ///< in ndole.cxx
 
     /// Array of all OutlineNodes.
@@ -250,46 +250,46 @@ public:
 
        New parameter pAttrSet: If pAttrSet is non-null and contains an
        adjust item it is propagated to the table cells. If there is an
-       adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
+       adjust in pContentTextColl or pHeadlineTextColl this adjust item
        overrides the item in pAttrSet. */
 
     static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx,
-                        sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl,
+                        sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl,
                         sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0,
-                        SwTxtFmtColl* pHeadlineTxtColl = 0,
+                        SwTextFormatColl* pHeadlineTextColl = 0,
                         const SwAttrSet * pAttrSet = 0);
 
     /// Create balanced table from selected range.
     SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
-                                SwTableFmt* pTblFmt,
-                                SwTableLineFmt* pLineFmt,
-                                SwTableBoxFmt* pBoxFmt,
-                                SwTxtFmtColl* pTxtColl,
-                                SwUndoTxtToTbl* pUndo = 0 );
+                                SwTableFormat* pTableFormat,
+                                SwTableLineFormat* pLineFormat,
+                                SwTableBoxFormat* pBoxFormat,
+                                SwTextFormatColl* pTextColl,
+                                SwUndoTextToTable* pUndo = 0 );
 
     static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
 
     /// create a table from a vector of NodeRanges - API support
     SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
-                                SwTableFmt* pTblFmt,
-                                SwTableLineFmt* pLineFmt,
-                                SwTableBoxFmt* pBoxFmt,
-                                SwTxtFmtColl* pTxtColl
+                                SwTableFormat* pTableFormat,
+                                SwTableLineFormat* pLineFormat,
+                                SwTableBoxFormat* pBoxFormat,
+                                SwTextFormatColl* pTextColl
                                 /*, SwUndo... pUndo*/ );
 
     /// Create regular text from what was table.
     bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
-                        SwUndoTblToTxt* = 0 );
+                        SwUndoTableToText* = 0 );
     /// Is in untbl.cxx and may called only by Undo-object.
     SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd,
-                        const SwTblToTxtSaves& rSavedData );
+                        const SwTableToTextSaves& rSavedData );
 
     /** Insert a new box in the line before InsPos. Its format
        is taken from the following one (or from the previous one if we are
        at the end). In the line there must be a box already. */
-    bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*,
+    bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*,
                         /// Formats for TextNode of box.
-                        SwTxtFmtColl*, const SfxItemSet* pAutoAttr,
+                        SwTextFormatColl*, const SfxItemSet* pAutoAttr,
                         sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 );
     /** Splits a table at the base-line which contains the index.
        All base lines behind it are moved to a new table/ -node.
@@ -305,7 +305,7 @@ public:
 
     /// Insert a new SwSection.
     SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx,
-                                SwSectionFmt& rSectionFmt,
+                                SwSectionFormat& rSectionFormat,
                                 SwSectionData const&,
                                 SwTOXBase const*const pTOXBase,
                                 SwNodeIndex const*const pEnde,
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index bdf9e77961f3..668c5f5ecc61 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -27,13 +27,13 @@
 #include <boost/weak_ptr.hpp>
 class SwAsyncRetrieveInputStreamThreadConsumer;
 
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwDoc;
 class GraphicAttr;
 class SotStorage;
 
 // SwGrfNode
-class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
+class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
 {
     friend class SwNodes;
 
@@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
     SwGrfNode( const SwNodeIndex& rWhere,
                const OUString& rGrfName, const OUString& rFltName,
                const Graphic* pGraphic,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
     ///< Ctor for reading (SW/G) without graphics.
     SwGrfNode( const SwNodeIndex& rWhere,
                const OUString& rGrfName, const OUString& rFltName,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
     SwGrfNode( const SwNodeIndex& rWhere,
                const GraphicObject& rGrfObj,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
 
     void InsertLink( const OUString& rGrfName, const OUString& rFltName );
@@ -125,7 +125,7 @@ public:
     const Graphic&          GetGrf(bool bWait = false) const;
     const GraphicObject&    GetGrfObj(bool bWait = false) const;
     const GraphicObject* GetReplacementGrfObj() const;
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
 
     /// isolated only way to set GraphicObject to allow more actions when doing so
     void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
@@ -157,7 +157,7 @@ public:
     void SetScaleImageMap( bool b )      { bScaleImageMap = b; }
 
     /// in ndcopy.cxx
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
     /** Re-read in case graphic was not OK. The current one
        gets replaced by the new one. */
@@ -206,7 +206,7 @@ public:
     bool IsAsyncRetrieveInputStreamPossible() const;
 };
 
-// Inline methods from Node.hxx - it is only now that we know TxtNode!!
+// Inline methods from Node.hxx - it is only now that we know TextNode!!
 inline       SwGrfNode   *SwNode::GetGrfNode()
 {
      return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0;
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 86e7fd452ff8..44c853b98f1f 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -24,10 +24,10 @@
 
 #include "swtypes.hxx"
 
-class SwTxtNode;
+class SwTextNode;
 class SwRegHistory;                 // Is in RolBck.hxx.
-class SwTxtAttr;
-class SwTxtAttrNesting;
+class SwTextAttr;
+class SwTextAttrNesting;
 
 class SfxPoolItem;
 class SfxItemSet;
@@ -38,28 +38,28 @@ typedef enum {
     NEW  = int(false),
 } CopyOrNew_t;
 
-/// if COPY then pTxtNode must be given!
-SwTxtAttr * MakeTxtAttr(
+/// if COPY then pTextNode must be given!
+SwTextAttr * MakeTextAttr(
     SwDoc & rDoc,
     SfxPoolItem & rNew,
     sal_Int32 const nStt,
     sal_Int32 const nEnd,
     CopyOrNew_t const bIsCopy = NEW,
-    SwTxtNode *const pTxtNode = 0 );
+    SwTextNode *const pTextNode = 0 );
 
-SwTxtAttr * MakeTxtAttr(
+SwTextAttr * MakeTextAttr(
     SwDoc & rDoc,
     const SfxItemSet & rSet,
     sal_Int32 nStt,
     sal_Int32 nEnd );
 
 /// create redline dummy text hint that must not be inserted into hints array
-SwTxtAttr* MakeRedlineTxtAttr(
+SwTextAttr* MakeRedlineTextAttr(
     SwDoc & rDoc,
     SfxPoolItem& rAttr );
 
 /** Class SwpHints is derived indirectly via SwpHts, because only the
-   class SwTxtNode should be allowed to insert and remove attributes.
+   class SwTextNode should be allowed to insert and remove attributes.
    Other classes like the Frames are given only reading access via
    the index-operator.
    Size when created is 1 because an array is created only if
@@ -69,16 +69,16 @@ SwTxtAttr* MakeRedlineTxtAttr(
 
 struct CompareSwpHtStart
 {
-    bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+    bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
 };
-class SwpHtStart : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtStart,
+class SwpHtStart : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtStart,
     o3tl::find_partialorder_ptrequals> {};
 
 struct CompareSwpHtEnd
 {
-    bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+    bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
 };
-class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd,
+class SwpHtEnd : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtEnd,
     o3tl::find_partialorder_ptrequals> {};
 
 /// Class SwpHintsArr
@@ -97,31 +97,31 @@ protected:
 
     //FIXME: why are the non-const methods public?
 public:
-    void Insert( const SwTxtAttr *pHt );
+    void Insert( const SwTextAttr *pHt );
     void DeleteAtPos( const size_t nPosInStart );
     void Resort();
-    SwTxtAttr * Cut( const size_t nPosInStart )
+    SwTextAttr * Cut( const size_t nPosInStart )
     {
-        SwTxtAttr *pHt = GetTextHint(nPosInStart);
+        SwTextAttr *pHt = GetTextHint(nPosInStart);
         DeleteAtPos( nPosInStart );
         return pHt;
     }
-    const SwTxtAttr * GetStart( const size_t nPos ) const
+    const SwTextAttr * GetStart( const size_t nPos ) const
     {
         assert(nPos < m_HintStarts.size());
         return m_HintStarts[nPos];
     }
-    const SwTxtAttr * GetEnd( const size_t nPos ) const
+    const SwTextAttr * GetEnd( const size_t nPos ) const
     {
         assert(nPos < m_HintEnds.size());
         return m_HintEnds[nPos];
     }
-    SwTxtAttr * GetStart( const size_t nPos )
+    SwTextAttr * GetStart( const size_t nPos )
     {
         assert(nPos < m_HintStarts.size());
         return m_HintStarts[nPos];
     }
-    SwTxtAttr * GetEnd( const size_t nPos )
+    SwTextAttr * GetEnd( const size_t nPos )
     {
         assert(nPos < m_HintEnds.size());
         return m_HintEnds[nPos];
@@ -130,10 +130,10 @@ public:
     size_t GetEndCount()   const { return m_HintEnds.size(); }
     size_t GetStartCount() const { return m_HintStarts.size(); }
 
-    size_t GetStartOf( const SwTxtAttr *pHt ) const
+    size_t GetStartOf( const SwTextAttr *pHt ) const
     {
         SwpHtStart::const_iterator const it =
-            m_HintStarts.find(const_cast<SwTxtAttr*>(pHt));
+            m_HintStarts.find(const_cast<SwTextAttr*>(pHt));
         if ( it == m_HintStarts.end() )
         {
             return SAL_MAX_SIZE;
@@ -141,13 +141,13 @@ public:
         return it - m_HintStarts.begin();
     }
 
-    bool Contains( const SwTxtAttr *pHt ) const;
+    bool Contains( const SwTextAttr *pHt ) const;
 
-    const SwTxtAttr * GetTextHint( const size_t nIdx ) const
+    const SwTextAttr * GetTextHint( const size_t nIdx ) const
         { return GetStart(nIdx); }
-    SwTxtAttr * GetTextHint( const size_t nIdx )
+    SwTextAttr * GetTextHint( const size_t nIdx )
         { return GetStart(nIdx); }
-    const SwTxtAttr * operator[]( const size_t nIdx ) const
+    const SwTextAttr * operator[]( const size_t nIdx ) const
         { return GetStart(nIdx); }
     size_t Count() const { return GetStartCount(); }
 
@@ -169,22 +169,22 @@ private:
     bool m_bInSplitNode         : 1;
     /// m_bHasHiddenParaField is invalid, call CalcHiddenParaField()
     bool m_bCalcHiddenParaField : 1;
-    bool m_bHasHiddenParaField  : 1;   ///< HiddenParaFld
+    bool m_bHasHiddenParaField  : 1;   ///< HiddenParaField
     bool m_bFootnote            : 1;   ///< footnotes
     bool m_bDDEFields           : 1;   ///< the TextNode has DDE fields
 
     /// records a new attibute in m_pHistory.
-    void NoteInHistory( SwTxtAttr *pAttr, const bool bNew = false );
+    void NoteInHistory( SwTextAttr *pAttr, const bool bNew = false );
 
     void CalcFlags( );
 
     /** Delete methods may only be called by the TextNode!
        Because the TextNode also guarantees removal of the Character for
        attributes without an end. */
-    friend class SwTxtNode;
+    friend class SwTextNode;
     void DeleteAtPos( const size_t nPos );
     /// Delete the given Hint. The Hint must actually be in the array!
-    void Delete( SwTxtAttr* pTxtHt );
+    void Delete( SwTextAttr* pTextHt );
 
     void SetInSplitNode(bool bInSplit) { m_bInSplitNode = bInSplit; }
     void SetCalcHiddenParaField() { m_bCalcHiddenParaField = true; }
@@ -198,11 +198,11 @@ private:
         return m_bHasHiddenParaField;
     }
 
-    void InsertNesting(SwTxtAttrNesting & rNewHint);
-    bool TryInsertNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNewHint);
-    void BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
+    void InsertNesting(SwTextAttrNesting & rNewHint);
+    bool TryInsertNesting(SwTextNode & rNode, SwTextAttrNesting & rNewHint);
+    void BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint,
             const SetAttrMode nMode );
-    bool MergePortions( SwTxtNode& rNode );
+    bool MergePortions( SwTextNode& rNode );
 
 public:
     SwpHints();
@@ -217,10 +217,10 @@ public:
 
     /// try to insert the hint
     /// @return true iff hint successfully inserted
-    bool TryInsertHint( SwTxtAttr * const pHint, SwTxtNode & rNode,
+    bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode,
             const SetAttrMode nMode = SetAttrMode::DEFAULT );
 
-    bool HasFtn() const          { return m_bFootnote; }
+    bool HasFootnote() const          { return m_bFootnote; }
     bool IsInSplitNode() const   { return m_bInSplitNode; }
 
     /// calc current value of m_bHasHiddenParaField, returns true iff changed
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 584fd5c24baa..ec0f494f6112 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -23,12 +23,12 @@
 
 namespace tools { class PolyPolygon; }
 
-// SwNoTxtNode
+// SwNoTextNode
 
-class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
+class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
 {
     friend class SwNodes;
-    friend class SwNoTxtFrm;
+    friend class SwNoTextFrm;
 
     tools::PolyPolygon *pContour;
     bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -38,22 +38,22 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
     bool bPixelContour : 1;     // contour map mode is invalid and pixel.
 
     // Creates for all derivations an AttrSet with ranges for frame- and
-    // graphics-attributes (only called by SwCntntNode).
+    // graphics-attributes (only called by SwContentNode).
     virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
 
-    SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
-    SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
+    SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
+    SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
 
 protected:
-    SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
-                SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
+    SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
+                SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
 
 public:
-    virtual ~SwNoTxtNode();
+    virtual ~SwNoTextNode();
 
-    virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+    virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
 
-    inline SwGrfFmtColl *GetGrfColl() const { return const_cast<SwGrfFmtColl*>(static_cast<const SwGrfFmtColl*>(GetRegisteredIn())); }
+    inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
 
     virtual Size GetTwipSize() const = 0;
 
@@ -90,14 +90,14 @@ public:
     Graphic GetGraphic() const;
 };
 
-// Inline methods from Node.hxx - we know TxtNode only here!!
-inline SwNoTxtNode *SwNode::GetNoTxtNode()
+// Inline methods from Node.hxx - we know TextNode only here!!
+inline SwNoTextNode *SwNode::GetNoTextNode()
 {
-    return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTxtNode*>(this) : 0;
+    return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTextNode*>(this) : 0;
 }
-inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
+inline const SwNoTextNode *SwNode::GetNoTextNode() const
 {
-    return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTxtNode*>(this) : 0;
+    return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTextNode*>(this) : 0;
 }
 
 #endif // INCLUDED_SW_INC_NDNOTXT_HXX
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 3091cc03abf9..b2787a393f78 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -23,7 +23,7 @@
 
 #include <svtools/embedhlp.hxx>
 
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwDoc;
 class SwOLENode;
 
@@ -66,11 +66,11 @@ public:
 
 // SwOLENode
 
-class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
+class SW_DLLPUBLIC SwOLENode: public SwNoTextNode
 {
     friend class SwNodes;
     mutable SwOLEObj aOLEObj;
-    OUString sChartTblName;     ///< with chart objects: name of referenced table.
+    OUString sChartTableName;     ///< with chart objects: name of referenced table.
     bool   bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify
                                    (e.g. copied). Is not persistent. */
 
@@ -79,28 +79,28 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
 
     SwOLENode(  const SwNodeIndex &rWhere,
                 const svt::EmbeddedObjectRef&,
-                SwGrfFmtColl *pGrfColl,
+                SwGrfFormatColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
     SwOLENode(  const SwNodeIndex &rWhere,
                 const OUString &rName,
                 sal_Int64 nAspect,
-                SwGrfFmtColl *pGrfColl,
+                SwGrfFormatColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
     SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
 
-    using SwNoTxtNode::GetGraphic;
+    using SwNoTextNode::GetGraphic;
 
 public:
     const SwOLEObj& GetOLEObj() const { return aOLEObj; }
           SwOLEObj& GetOLEObj()       { return aOLEObj; }
     virtual ~SwOLENode();
 
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
 
     /// Is in ndcopy.cxx.
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
     virtual Size GetTwipSize() const SAL_OVERRIDE;
 
@@ -133,8 +133,8 @@ public:
     // #i99665#
     bool IsChart() const;
 
-    OUString GetChartTblName() const { return sChartTblName; }
-    void SetChartTblName( const OUString& rNm ) { sChartTblName = rNm; }
+    OUString GetChartTableName() const { return sChartTableName; }
+    void SetChartTableName( const OUString& rNm ) { sChartTableName = rNm; }
 };
 
 /// Inline methods from Node.hxx
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 87a29ec1bd7d..94ffd6a7401b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -44,10 +44,10 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-class SwTxtFmtColl;
-class SwCntntFrm;
-class SwTxtFld;
-class SwTxtInputFld;
+class SwTextFormatColl;
+class SwContentFrm;
+class SwTextField;
+class SwTextInputField;
 class SfxItemSet;
 class SwUndoTransliterate;
 struct SwSpellArgs;
@@ -69,14 +69,14 @@ namespace com { namespace sun { namespace star {
 
 typedef std::set< sal_Int32 > SwSoftPageBreakList;
 
-/// SwTxtNode is a paragraph in the document model.
-class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
+/// SwTextNode is a paragraph in the document model.
+class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
 {
-    friend class SwCntntNode;
+    friend class SwContentNode;
     /// For creating the first TextNode.
-    friend class SwDoc;         ///< CTOR and AppendTxtNode()
+    friend class SwDoc;         ///< CTOR and AppendTextNode()
     friend class SwNodes;
-    friend class SwTxtFrm;
+    friend class SwTextFrm;
     friend class SwScriptInfo;
 
     /** May be 0. It is only then not 0 if it contains hard attributes.
@@ -118,22 +118,22 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
-    SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
+    SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl,
                              const SfxItemSet* pAutoAttr = 0 );
 
     /// Copies the attributes at nStart to pDest.
-    SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
+    SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
 
-    SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, bool bNext = true,
+    SAL_DLLPRIVATE SwTextNode* _MakeNewTextNode( const SwNodeIndex&, bool bNext = true,
                                 bool bChgFollow = true );
 
     SAL_DLLPRIVATE void CutImpl(
-          SwTxtNode * const pDest, const SwIndex & rDestStart,
+          SwTextNode * const pDest, const SwIndex & rDestStart,
           const SwIndex & rStart, /*const*/ sal_Int32 nLen,
           const bool bUpdate = true );
 
     /// Move all comprising hard attributes to the AttrSet of the paragraph.
-    SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet();  // Called by SplitNode.
+    SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet();  // Called by SplitNode.
 
     /// Create the specific AttrSet.
     SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
@@ -177,11 +177,11 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     inline void TryDeleteSwpHints();
 
-    SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
+    SAL_DLLPRIVATE void impl_FormatToTextAttr(const SfxItemSet& i_rAttrSet);
 
-    const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const;
+    const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const;
 
-    void DelFrms_TxtNodePart();
+    void DelFrms_TextNodePart();
 
 public:
     bool IsWordCountDirty() const;
@@ -206,14 +206,14 @@ public:
     /// End: Data collected during idle time
 
 protected:
-    /// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
+    /// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
 
 public:
-    using SwCntntNode::GetAttr;
+    using SwContentNode::GetAttr;
 
-    const OUString& GetTxt() const { return m_Text; }
+    const OUString& GetText() const { return m_Text; }
 
     // returns the maximum number of characters that can still be added to the node
     inline sal_Int32 GetSpaceLeft() const;
@@ -226,7 +226,7 @@ public:
     inline       bool   HasHints() const { return m_pSwpHints != nullptr; }
     inline       SwpHints &GetOrCreateSwpHints();
 
-    virtual ~SwTxtNode();
+    virtual ~SwTextNode();
 
     virtual sal_Int32 Len() const SAL_OVERRIDE;
 
@@ -270,7 +270,7 @@ public:
         only the ones which have exactly same range. Don't delete the ones
         which are simply included in the range.
      */
-    void RstTxtAttr(
+    void RstTextAttr(
         const SwIndex &rIdx,
         const sal_Int32 nLen,
         const sal_uInt16 nWhich = 0,
@@ -280,7 +280,7 @@ public:
     void    GCAttr();
 
     // Delete text attribute (needs to be deregistered at Pool!)
-    void    DestroyAttr( SwTxtAttr* pAttr );
+    void    DestroyAttr( SwTextAttr* pAttr );
 
     // delete all attributes from SwpHintsArray.
     void    ClearSwpHintsArr( bool bDelFields );
@@ -289,16 +289,16 @@ public:
     void    FileLoadedInitHints();
 
     /// Insert pAttr into hints array. @return true iff inserted successfully
-    bool    InsertHint( SwTxtAttr * const pAttr,
+    bool    InsertHint( SwTextAttr * const pAttr,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
     /// create new text attribute from rAttr and insert it
     /// @return     inserted hint; 0 if not sure the hint is inserted
-    SwTxtAttr* InsertItem( SfxPoolItem& rAttr,
+    SwTextAttr* InsertItem( SfxPoolItem& rAttr,
                   const sal_Int32 nStart, const sal_Int32 nEnd,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
 
     /** Set these attributes at TextNode. If the whole range is comprised
-       set them only in AutoAttrSet (SwCntntNode::SetAttr). */
+       set them only in AutoAttrSet (SwContentNode::SetAttr). */
     bool SetAttr( const SfxItemSet& rSet,
                   sal_Int32 nStt, sal_Int32 nEnd,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
@@ -306,38 +306,38 @@ public:
        Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
        If <bMergeIndentValuesOfNumRule> == true, the indent attributes of
        the corresponding list level of an applied list style is merged into
-       the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == false,
+       the requested item set as a LR-SPACE item, if <bOnlyTextAttr> == false,
        corresponding node has not its own indent attributes and the
        position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */
     bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
-                  const bool bOnlyTxtAttr  = false,
-                  const bool bGetFromChrFmt = true,
+                  const bool bOnlyTextAttr  = false,
+                  const bool bGetFromChrFormat = true,
                   const bool bMergeIndentValuesOfNumRule = false ) const;
 
-    /// Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray.
-    void FmtToTxtAttr( SwTxtNode* pNd );
+    /// Convey attributes of an AttrSet (AutoFormat) to SwpHintsArray.
+    void FormatToTextAttr( SwTextNode* pNd );
 
     /// delete all attributes of type nWhich at nStart (opt. end nEnd)
     void DeleteAttributes( const sal_uInt16 nWhich,
                   const sal_Int32 nStart, const sal_Int32 nEnd = 0 );
-    /// delete the attribute pTxtAttr
-    void DeleteAttribute ( SwTxtAttr * const pTxtAttr );
+    /// delete the attribute pTextAttr
+    void DeleteAttribute ( SwTextAttr * const pTextAttr );
 
     /** Actions on text and attributes.
        introduce optional parameter to control, if all attributes have to be copied. */
-    void CopyText( SwTxtNode * const pDest,
+    void CopyText( SwTextNode * const pDest,
                const SwIndex &rStart,
                const sal_Int32 nLen,
                const bool bForceCopyOfAllAttrs = false );
-    void CopyText( SwTxtNode * const pDest,
+    void CopyText( SwTextNode * const pDest,
                const SwIndex &rDestStart,
                const SwIndex &rStart,
                sal_Int32 nLen,
                const bool bForceCopyOfAllAttrs = false );
 
-    void        CutText(SwTxtNode * const pDest,
+    void        CutText(SwTextNode * const pDest,
                     const SwIndex & rStart, const sal_Int32 nLen);
-    inline void CutText(SwTxtNode * const pDest, const SwIndex &rDestStart,
+    inline void CutText(SwTextNode * const pDest, const SwIndex &rDestStart,
                     const SwIndex & rStart, const sal_Int32 nLen);
 
     /// replace nDelLen characters at rStart with rText
@@ -349,19 +349,19 @@ public:
             const OUString& rText,
             const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
 
-    /// Virtual methods from CntntNode.
-    virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
-    virtual SwCntntNode *JoinNext() SAL_OVERRIDE;
-    virtual SwCntntNode *JoinPrev() SAL_OVERRIDE;
+    /// Virtual methods from ContentNode.
+    virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *JoinNext() SAL_OVERRIDE;
+    virtual SwContentNode *JoinPrev() SAL_OVERRIDE;
 
-    SwCntntNode *AppendNode( const SwPosition & );
+    SwContentNode *AppendNode( const SwPosition & );
 
     /// When appropriate set DontExpand-flag at INet or character styles respectively.
-    bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
-                        bool bFmtToTxtAttributes = true );
+    bool DontExpandFormat( const SwIndex& rIdx, bool bFlag = true,
+                        bool bFormatToTextAttributes = true );
 
-    enum GetTxtAttrMode {
+    enum GetTextAttrMode {
         DEFAULT,    /// DEFAULT: (Start <= nIndex <  End)
         EXPAND,     /// EXPAND : (Start <  nIndex <= End)
         PARENT,     /// PARENT : (Start <  nIndex <  End)
@@ -369,25 +369,25 @@ public:
 
     /** get the innermost text attribute covering position nIndex.
         @param nWhich   only attribute with this id is returned.
-        @param eMode    the predicate for matching (@see GetTxtAttrMode).
+        @param eMode    the predicate for matching (@see GetTextAttrMode).
 
         ATTENTION: this function is not well-defined for those
         hints of which several may cover a single position, like
         RES_TXTATR_CHARFMT, RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK
      */
-    SwTxtAttr *GetTxtAttrAt(
+    SwTextAttr *GetTextAttrAt(
         sal_Int32 const nIndex,
         RES_TXTATR const nWhich,
-        enum GetTxtAttrMode const eMode = DEFAULT ) const;
+        enum GetTextAttrMode const eMode = DEFAULT ) const;
 
     /** get the innermost text attributes covering position nIndex.
         @param nWhich   only attributes with this id are returned.
-        @param eMode    the predicate for matching (@see GetTxtAttrMode).
+        @param eMode    the predicate for matching (@see GetTextAttrMode).
      */
-    ::std::vector<SwTxtAttr *> GetTxtAttrsAt(
+    ::std::vector<SwTextAttr *> GetTextAttrsAt(
         sal_Int32 const nIndex,
         RES_TXTATR const nWhich,
-        enum GetTxtAttrMode const eMode = DEFAULT ) const;
+        enum GetTextAttrMode const eMode = DEFAULT ) const;
 
     /** get the text attribute at position nIndex which owns
         the dummy character CH_TXTATR_* at that position, if one exists.
@@ -396,27 +396,27 @@ public:
                         attribute with given which id
         @return the text attribute at nIndex of type nWhich, if it exists
     */
-    SwTxtAttr *GetTxtAttrForCharAt(
+    SwTextAttr *GetTextAttrForCharAt(
         const sal_Int32 nIndex,
         const RES_TXTATR nWhich = RES_TXTATR_END ) const;
 
-    SwTxtFld* GetFldTxtAttrAt(
+    SwTextField* GetFieldTextAttrAt(
         const sal_Int32 nIndex,
-        const bool bIncludeInputFldAtStart = false ) const;
+        const bool bIncludeInputFieldAtStart = false ) const;
 
     OUString GetCurWord(sal_Int32) const;
     bool Spell(SwSpellArgs*);
     bool Convert( SwConversionArgs & );
 
-    inline SwTxtFmtColl *GetTxtColl() const;
-    virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE;
-    void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld,
-                                const SwTxtFmtColl* pNew );
+    inline SwTextFormatColl *GetTextColl() const;
+    virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE;
+    void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld,
+                                const SwTextFormatColl* pNew );
 
     /** Copy collection with all auto formats to dest-node.
         The latter might be in an other document!
        (Method in ndcopy.cxx!!). */
-    void CopyCollFmt( SwTxtNode& rDestNd );
+    void CopyCollFormat( SwTextNode& rDestNd );
 
     // BEGIN OF BULLET/NUMBERING/OUTLINE STUFF:
 
@@ -473,11 +473,11 @@ public:
     /**
        Returns the additional indents of this text node and its numbering.
 
-       @param bTxtLeft  ???
+       @param bTextLeft  ???
 
        @return additional indents
      */
-     long GetLeftMarginWithNum( bool bTxtLeft = false ) const;
+     long GetLeftMarginWithNum( bool bTextLeft = false ) const;
 
     /**
        Returns the combined first line indent of this text node and
@@ -529,7 +529,7 @@ public:
         This node is numbered if it has a SwNodeNum and it has a
         numbering rule and has not a hidden SwNodeNum.
 
-        ATTENTION: Returns true even if the SwNumFmt has type
+        ATTENTION: Returns true even if the SwNumFormat has type
         SVX_NUM_NUMBER_NONE.
 
         @retval true      This node is numbered.
@@ -579,7 +579,7 @@ public:
        Otherwise the text node has no outline level (NO_NUMBERING).
 
        NOTE: The outline level of text nodes is subject to change. The
-       plan is to have an SwTxtNode::nOutlineLevel member that is
+       plan is to have an SwTextNode::nOutlineLevel member that is
        updated from a paragraph style upon appliance of that paragraph
        style.
 
@@ -670,9 +670,9 @@ public:
 
     /// in ndcopy.cxx
     bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
-    /// Interactive hyphenation: we find TxtFrm and call its CalcHyph.
+    /// Interactive hyphenation: we find TextFrm and call its CalcHyph.
     bool Hyphenate( SwInterHyphInfo &rHyphInf );
     void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd );
 
@@ -682,20 +682,20 @@ public:
        add 5th optional parameter <bWithSpacesForLevel> indicating, if additional
        spaces are inserted in front of the expanded text string depending on
        the list level. */
-    OUString GetExpandTxt(  const sal_Int32 nIdx = 0,
+    OUString GetExpandText(  const sal_Int32 nIdx = 0,
                             const sal_Int32 nLen = -1,
                             const bool bWithNum = false,
                             const bool bAddSpaceAfterListLabelStr = false,
                             const bool bWithSpacesForLevel = false,
-                            const bool bWithFtn = true ) const;
-    bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0,
+                            const bool bWithFootnote = true ) const;
+    bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = 0,
                            sal_Int32 nIdx = 0, sal_Int32 nLen = -1,
-                           bool bWithNum = false, bool bWithFtn = true,
+                           bool bWithNum = false, bool bWithFootnote = true,
                            bool bReplaceTabsWithSpaces = false ) const;
 
-    OUString GetRedlineTxt( sal_Int32 nIdx = 0,
+    OUString GetRedlineText( sal_Int32 nIdx = 0,
                           sal_Int32 nLen = SAL_MAX_INT32,
-                          bool bExpandFlds = false,
+                          bool bExpandFields = false,
                           bool bWithNum = false ) const;
 
     /** @return actual count of initial chars for initial-function.
@@ -800,31 +800,31 @@ public:
     sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
     sal_uInt32 GetParRsid() const;
 
-    bool CompareRsid( const SwTxtNode &rTxtNode, sal_Int32 nStt1, sal_Int32 nStt2,
+    bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2,
             sal_Int32 nEnd1 = 0,  sal_Int32 nEnd2 = 0 ) const;
-    bool CompareParRsid( const SwTxtNode &rTxtNode ) const;
+    bool CompareParRsid( const SwTextNode &rTextNode ) const;
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
 
     /// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
-    static bool IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich);
+    static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
 };
 
-inline SwpHints & SwTxtNode::GetSwpHints()
+inline SwpHints & SwTextNode::GetSwpHints()
 {
     assert( m_pSwpHints );
     return *m_pSwpHints;
 }
-inline const SwpHints &SwTxtNode::GetSwpHints() const
+inline const SwpHints &SwTextNode::GetSwpHints() const
 {
     assert( m_pSwpHints );
     return *m_pSwpHints;
 }
 
-inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
+inline SwpHints& SwTextNode::GetOrCreateSwpHints()
 {
     if ( !m_pSwpHints )
     {
@@ -833,7 +833,7 @@ inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
     return *m_pSwpHints;
 }
 
-inline void SwTxtNode::TryDeleteSwpHints()
+inline void SwTextNode::TryDeleteSwpHints()
 {
     if ( m_pSwpHints && m_pSwpHints->CanBeDeleted() )
     {
@@ -841,30 +841,30 @@ inline void SwTxtNode::TryDeleteSwpHints()
     }
 }
 
-inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
+inline SwTextFormatColl* SwTextNode::GetTextColl() const
 {
-    return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn()));
+    return static_cast<SwTextFormatColl*>(const_cast<SwModify*>(GetRegisteredIn()));
 }
 
 /// Inline methods from Node.hxx
-inline SwTxtNode *SwNode::GetTxtNode()
+inline SwTextNode *SwNode::GetTextNode()
 {
-     return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0;
+     return ND_TEXTNODE == nNodeType ? static_cast<SwTextNode*>(this) : 0;
 }
 
-inline const SwTxtNode *SwNode::GetTxtNode() const
+inline const SwTextNode *SwNode::GetTextNode() const
 {
-     return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0;
+     return ND_TEXTNODE == nNodeType ? static_cast<const SwTextNode*>(this) : 0;
 }
 
 inline void
-SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart,
+SwTextNode::CutText(SwTextNode * const pDest, const SwIndex & rDestStart,
                     const SwIndex & rStart, const sal_Int32 nLen)
 {
     CutImpl( pDest, rDestStart, rStart, nLen, true );
 }
 
-inline sal_Int32 SwTxtNode::GetSpaceLeft() const
+inline sal_Int32 SwTextNode::GetSpaceLeft() const
 {
     // do not fill the String up to the max - need to be able to have a
     // SwPosition "behind" the last character, i.e., at index TXTNODE_MAX + 1
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index cbf71abfe00e..081ccadf1637 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -33,7 +33,7 @@ const sal_uInt8 ND_OLENODE      = 0x20;
 const sal_uInt8 ND_SECTIONNODE  = 0x40 | ND_STARTNODE; ///< SwSectionNode is derived from SwStartNode.
 const sal_uInt8 ND_PLACEHOLDER  = 0x80;
 
-// NoTxtNode (if any of the 2 bits are set).
+// NoTextNode (if any of the 2 bits are set).
 const sal_uInt8 ND_NOTXTNODE    = ND_GRFNODE | ND_OLENODE;
 // ContentNode (if any of the 3 bits are set).
 const sal_uInt8 ND_CONTENTNODE  = ND_TEXTNODE | ND_NOTXTNODE;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d27494db31ef..bc8f8d090a31 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -32,19 +32,19 @@
 #include <memory>
 #include <vector>
 
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
 class SwDoc;
 class SwEndNode;
 class SwFrm;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwGrfNode;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwNodeIndex;
 class SwOLENode;
 class SwRect;
 class SwSection;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
@@ -53,7 +53,7 @@ class SwRootFrm;
 class SwTable;
 class SwTableNode;
 class SwTableBox;
-class SwTxtNode;
+class SwTextNode;
 class SwPageDesc;
 class SwViewShell;
 struct SwPosition;
@@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwNode
     sal_uInt8 nNodeType;
 
     /// For text nodes: level of auto format. Was put here because we had still free bits.
-    sal_uInt8 nAFmtNumLvl : 3;
+    sal_uInt8 nAFormatNumLvl : 3;
     bool bSetNumLSpace : 1;         ///< For numbering: TRUE: set indent.
     bool bIgnoreDontExpand : 1;     ///< for Text Attributes - ignore the flag
 
@@ -94,10 +94,10 @@ class SW_DLLPUBLIC SwNode
     long m_nSerial;
 #endif
 
-    /// all SwFrmFmt that are anchored at the node
-    /// invariant: SwFrmFmt is in the list iff
-    /// SwFrmFmt::GetAnchor().GetCntntAnchor() points to this node
-    std::unique_ptr<std::vector<SwFrmFmt*>> m_pAnchoredFlys;
+    /// all SwFrameFormat that are anchored at the node
+    /// invariant: SwFrameFormat is in the list iff
+    /// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node
+    std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys;
 
 protected:
     SwStartNode* pStartOfSection;
@@ -126,8 +126,8 @@ public:
     inline const SwEndNode* EndOfSectionNode() const;
     inline         SwEndNode* EndOfSectionNode();
 
-    inline sal_uInt8 GetAutoFmtLvl() const     { return nAFmtNumLvl; }
-    inline void SetAutoFmtLvl( sal_uInt8 nVal )      { nAFmtNumLvl = nVal; }
+    inline sal_uInt8 GetAutoFormatLvl() const     { return nAFormatNumLvl; }
+    inline void SetAutoFormatLvl( sal_uInt8 nVal )      { nAFormatNumLvl = nVal; }
 
     inline bool IsSetNumLSpace() const  { return bSetNumLSpace; }
     inline void SetNumLSpace( bool bFlag )        { bSetNumLSpace = bFlag; }
@@ -139,16 +139,16 @@ public:
 
     inline       SwStartNode *GetStartNode();
     inline const SwStartNode *GetStartNode() const;
-    inline       SwCntntNode *GetCntntNode();
-    inline const SwCntntNode *GetCntntNode() const;
+    inline       SwContentNode *GetContentNode();
+    inline const SwContentNode *GetContentNode() const;
     inline       SwEndNode   *GetEndNode();
     inline const SwEndNode   *GetEndNode() const;
-    inline       SwTxtNode   *GetTxtNode();
-    inline const SwTxtNode   *GetTxtNode() const;
+    inline       SwTextNode   *GetTextNode();
+    inline const SwTextNode   *GetTextNode() const;
     inline       SwOLENode   *GetOLENode();
     inline const SwOLENode   *GetOLENode() const;
-    inline       SwNoTxtNode *GetNoTxtNode();
-    inline const SwNoTxtNode *GetNoTxtNode() const;
+    inline       SwNoTextNode *GetNoTextNode();
+    inline const SwNoTextNode *GetNoTextNode() const;
     inline       SwGrfNode   *GetGrfNode();
     inline const SwGrfNode   *GetGrfNode() const;
     inline       SwTableNode *GetTableNode();
@@ -157,13 +157,13 @@ public:
     inline const SwSectionNode *GetSectionNode() const;
 
     inline bool IsStartNode() const;
-    inline bool IsCntntNode() const;
+    inline bool IsContentNode() const;
     inline bool IsEndNode() const;
-    inline bool IsTxtNode() const;
+    inline bool IsTextNode() const;
     inline bool IsTableNode() const;
     inline bool IsSectionNode() const;
     inline bool IsOLENode() const;
-    inline bool IsNoTxtNode() const;
+    inline bool IsNoTextNode() const;
     inline bool IsGrfNode() const;
 
     /**
@@ -271,20 +271,20 @@ public:
     const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = 0 ) const;
 
     /// If node is in a fly return the respective format.
-    SwFrmFmt* GetFlyFmt() const;
+    SwFrameFormat* GetFlyFormat() const;
 
     /// If node is in a table return the respective table box.
-    SwTableBox* GetTblBox() const;
+    SwTableBox* GetTableBox() const;
 
     inline sal_uLong GetIndex() const { return GetPos(); }
 
-    const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
+    const SwTextNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
 
     sal_uInt8 HasPrevNextLayNode() const;
 
-    std::vector<SwFrmFmt *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
-    void AddAnchoredFly(SwFrmFmt *);
-    void RemoveAnchoredFly(SwFrmFmt *);
+    std::vector<SwFrameFormat *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
+    void AddAnchoredFly(SwFrameFormat *);
+    void RemoveAnchoredFly(SwFrameFormat *);
 
     /**
      * Dumps the node structure to the given destination (file nodes.xml in the current directory by default)
@@ -349,9 +349,9 @@ private:
     SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
-// SwCntntNode
+// SwContentNode
 
-class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg
+class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndexReg
 {
 
 //FEATURE::CONDCOLL
@@ -360,14 +360,14 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe
     mutable bool mbSetModifyAtAttr;
 
 protected:
-    SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
-                SwFmtColl *pFmtColl );
+    SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
+                SwFormatColl *pFormatColl );
     /** the = 0 forces the class to be an abstract base class, but the dtor can be still called
        from subclasses */
-    virtual ~SwCntntNode() = 0;
+    virtual ~SwContentNode() = 0;
 
-    /**  Attribute-set for all auto attributes of a CntntNode.
-      (e.g. TxtNode or NoTxtNode). */
+    /**  Attribute-set for all auto attributes of a ContentNode.
+      (e.g. TextNode or NoTextNode). */
     std::shared_ptr<const SfxItemSet> mpAttrSet;
 
     /// Make respective nodes create the specific AttrSets.
@@ -384,12 +384,12 @@ public:
 
     /** MakeFrm will be called for a certain layout
        pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */
-    virtual SwCntntFrm *MakeFrm( SwFrm* pSib ) = 0;
+    virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0;
 
-    virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0;
+    virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
 
-    virtual SwCntntNode *JoinNext();
-    virtual SwCntntNode *JoinPrev();
+    virtual SwContentNode *JoinNext();
+    virtual SwContentNode *JoinPrev();
     /** Is it possible to join two nodes?
        In pIdx the second position can be returned. */
     bool CanJoinNext( SwNodeIndex* pIdx =0 ) const;
@@ -402,7 +402,7 @@ public:
     bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
 
     /// Replacement for good old GetFrm(..):
-    SwCntntFrm *getLayoutFrm( const SwRootFrm*,
+    SwContentFrm *getLayoutFrm( const SwRootFrm*,
                         const Point* pDocPos = 0,
                         const SwPosition *pPos = 0,
                         const bool bCalcFrm = true ) const;
@@ -417,7 +417,7 @@ public:
 
     /** Method creates all views of document for given node. The content
        frames that are created are put in the respective layout. */
-    void MakeFrms( SwCntntNode& rNode );
+    void MakeFrms( SwContentNode& rNode );
 
     /** Method deletes all views of document for the node. The content-
         frames are removed from the respective layout.
@@ -430,7 +430,7 @@ public:
        There are differences between text node and formula node. */
     virtual sal_Int32 Len() const;
 
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
 
     /// Get information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -456,13 +456,13 @@ public:
     inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); }
     inline bool  HasSwAttrSet() const { return mpAttrSet != nullptr; }
 
-    virtual SwFmtColl* ChgFmtColl( SwFmtColl* );
-    SwFmtColl* GetFmtColl() const { return const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); }
+    virtual SwFormatColl* ChgFormatColl( SwFormatColl* );
+    SwFormatColl* GetFormatColl() const { return const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); }
 
 //FEATURE::CONDCOLL
-    inline SwFmtColl& GetAnyFmtColl() const;
-    void SetCondFmtColl( SwFmtColl* );
-    inline SwFmtColl* GetCondFmtColl() const;
+    inline SwFormatColl& GetAnyFormatColl() const;
+    void SetCondFormatColl( SwFormatColl* );
+    inline SwFormatColl* GetCondFormatColl() const;
 
     bool IsAnyCondition( SwCollCondition& rTmp ) const;
     void ChkCondColl();
@@ -480,14 +480,14 @@ public:
     inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
     inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
 
-    static SwOLENodes* CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize );
+    static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize );
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
 private:
-    SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
-    SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
+    SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
+    SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 // SwTableNode
@@ -544,7 +544,7 @@ protected:
 
 public:
     SwSectionNode(SwNodeIndex const&,
-        SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase);
+        SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase);
 
     const SwSection& GetSection() const { return *m_pSection; }
           SwSection& GetSection()       { return *m_pSection; }
@@ -572,7 +572,7 @@ public:
 
     /** Check for not hidden areas whether there is content that is not in
        a hidden sub-area. */
-    bool IsCntntHidden() const;
+    bool IsContentHidden() const;
 
 };
 
@@ -620,20 +620,20 @@ inline const SwSectionNode *SwNode::GetSectionNode() const
 {
      return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0;
 }
-inline       SwCntntNode *SwNode::GetCntntNode()
+inline       SwContentNode *SwNode::GetContentNode()
 {
-     return ND_CONTENTNODE & nNodeType ? static_cast<SwCntntNode*>(this) : 0;
+     return ND_CONTENTNODE & nNodeType ? static_cast<SwContentNode*>(this) : 0;
 }
-inline const SwCntntNode *SwNode::GetCntntNode() const
+inline const SwContentNode *SwNode::GetContentNode() const
 {
-     return ND_CONTENTNODE & nNodeType ? static_cast<const SwCntntNode*>(this) : 0;
+     return ND_CONTENTNODE & nNodeType ? static_cast<const SwContentNode*>(this) : 0;
 }
 
 inline bool SwNode::IsStartNode() const
 {
     return (ND_STARTNODE & nNodeType) != 0;
 }
-inline bool SwNode::IsCntntNode() const
+inline bool SwNode::IsContentNode() const
 {
     return (ND_CONTENTNODE & nNodeType) != 0;
 }
@@ -641,7 +641,7 @@ inline bool SwNode::IsEndNode() const
 {
     return ND_ENDNODE == nNodeType;
 }
-inline bool SwNode::IsTxtNode() const
+inline bool SwNode::IsTextNode() const
 {
     return ND_TEXTNODE == nNodeType;
 }
@@ -653,7 +653,7 @@ inline bool SwNode::IsSectionNode() const
 {
     return ND_SECTIONNODE == nNodeType;
 }
-inline bool SwNode::IsNoTxtNode() const
+inline bool SwNode::IsNoTextNode() const
 {
     return (ND_NOTXTNODE & nNodeType) != 0;
 }
@@ -716,26 +716,26 @@ inline const SwDoc* SwNode::GetDoc() const
     return GetNodes().GetDoc();
 }
 
-inline SwFmtColl* SwCntntNode::GetCondFmtColl() const
+inline SwFormatColl* SwContentNode::GetCondFormatColl() const
 {
-    return pCondColl ? static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) : 0;
+    return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0;
 }
 
-inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const
+inline SwFormatColl& SwContentNode::GetAnyFormatColl() const
 {
     return pCondColl && pCondColl->GetRegisteredIn()
-                ? *static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn())
-                : *const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn()));
+                ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn())
+                : *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn()));
 }
 
-inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const
+inline const SwAttrSet& SwContentNode::GetSwAttrSet() const
 {
-    return mpAttrSet ? *GetpSwAttrSet() : GetAnyFmtColl().GetAttrSet();
+    return mpAttrSet ? *GetpSwAttrSet() : GetAnyFormatColl().GetAttrSet();
 }
 
 //FEATURE::CONDCOLL
 
-inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich,
+inline const SfxPoolItem& SwContentNode::GetAttr( sal_uInt16 nWhich,
                                                 bool bInParents ) const
 {
     return GetSwAttrSet().Get( nWhich, bInParents );
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index c83d1de861f7..585937dfe188 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -33,7 +33,7 @@
 #include <vector>
 #include <charfmt.hxx>
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class IDocumentListsAccess;
 class SwNodeNum;
 namespace vcl { class Font; }
@@ -41,15 +41,15 @@ class SvxBrushItem;
 class SfxGrabBagItem;
 class SvxNumRule;
 class SwDoc;
-class SwFmtVertOrient;
-class SwTxtNode;
+class SwFormatVertOrient;
+class SwTextNode;
 class Size;
 
 const sal_Unicode cBulletChar = 0x2022; ///< Character for lists.
 
-class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
+class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
 {
-    SwFmtVertOrient* pVertOrient;
+    SwFormatVertOrient* pVertOrient;
     //For i120928,record the cp info of graphic within bullet
     sal_Unicode     cGrfBulletCP;
     SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
@@ -62,22 +62,22 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
-    SwNumFmt();
-    SwNumFmt( const SwNumFmt& );
-    SwNumFmt( const SvxNumberFormat&, SwDoc* pDoc);
+    SwNumFormat();
+    SwNumFormat( const SwNumFormat& );
+    SwNumFormat( const SvxNumberFormat&, SwDoc* pDoc);
 
-    virtual ~SwNumFmt();
+    virtual ~SwNumFormat();
 
-    SwNumFmt& operator=( const SwNumFmt& );
+    SwNumFormat& operator=( const SwNumFormat& );
 
-    bool operator==( const SwNumFmt& ) const;
-    bool operator!=( const SwNumFmt& r ) const { return !(*this == r); }
+    bool operator==( const SwNumFormat& ) const;
+    bool operator!=( const SwNumFormat& r ) const { return !(*this == r); }
 
-    SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
-    void       SetCharFmt( SwCharFmt* );
+    SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
+    void       SetCharFormat( SwCharFormat* );
 
-    void                    SetCharFmtName(const OUString& rSet);
-    virtual OUString        GetCharFmtName() const SAL_OVERRIDE;
+    void                    SetCharFormatName(const OUString& rSet);
+    virtual OUString        GetCharFormatName() const SAL_OVERRIDE;
 
     //For i120928,access the cp info of graphic within bullet
     void            SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
@@ -87,7 +87,7 @@ public:
 
     virtual void                SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE;
     virtual sal_Int16   GetVertOrient() const SAL_OVERRIDE;
-    const SwFmtVertOrient*      GetGraphicOrientation() const;
+    const SwFormatVertOrient*      GetGraphicOrientation() const;
 
     bool IsEnumeration() const; // #i22362#
     bool IsItemize() const; // #i29560#
@@ -99,8 +99,8 @@ class SW_DLLPUBLIC SwNumRule
 {
 
 public:
-    typedef std::vector< SwTxtNode* > tTxtNodeList;
-    typedef std::vector< SwTxtFmtColl* > tParagraphStyleList;
+    typedef std::vector< SwTextNode* > tTextNodeList;
+    typedef std::vector< SwTextFormatColl* > tParagraphStyleList;
 
     struct Extremities
     {
@@ -111,16 +111,16 @@ public:
 private:
     friend void _FinitCore();
 
-    static SwNumFmt* maBaseFmts [ RULE_END ][ MAXLEVEL ];
+    static SwNumFormat* maBaseFormats [ RULE_END ][ MAXLEVEL ];
     static const sal_uInt16 maDefNumIndents[ MAXLEVEL ];
     /// default list level properties for position-and-space mode LABEL_ALIGNMENT
-    static SwNumFmt* maLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ];
+    static SwNumFormat* maLabelAlignmentBaseFormats [ RULE_END ][ MAXLEVEL ];
     static sal_uInt16 mnRefCount;
 
-    SwNumFmt* maFmts[ MAXLEVEL ];
+    SwNumFormat* maFormats[ MAXLEVEL ];
 
     /** container for associated text nodes */
-    tTxtNodeList maTxtNodeList;
+    tTextNodeList maTextNodeList;
 
     /** container for associated paragraph styles */
     tParagraphStyleList maParagraphStyleList;
@@ -130,7 +130,7 @@ private:
 
     OUString msName;
     SwNumRuleType meRuleType;
-    sal_uInt16 mnPoolFmtId;      ///< Id-for NumRules created "automatically"
+    sal_uInt16 mnPoolFormatId;      ///< Id-for NumRules created "automatically"
     sal_uInt16 mnPoolHelpId;     ///< HelpId for this Pool-style.
     sal_uInt8 mnPoolHlpFileId;   ///< FilePos at Doc on style helps.
     bool mbAutoRuleFlag : 1;
@@ -158,14 +158,14 @@ public:
     bool operator==( const SwNumRule& ) const;
     bool operator!=( const SwNumRule& r ) const { return !(*this == r); }
 
-    const SwNumFmt* GetNumFmt( sal_uInt16 i ) const;
-    const SwNumFmt& Get( sal_uInt16 i ) const;
+    const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
+    const SwNumFormat& Get( sal_uInt16 i ) const;
 
     bool IsHidden( ) const { return mbHidden; }
     void SetHidden( bool bValue ) { mbHidden = bValue; }
 
-    void Set( sal_uInt16 i, const SwNumFmt* );
-    void Set( sal_uInt16 i, const SwNumFmt& );
+    void Set( sal_uInt16 i, const SwNumFormat* );
+    void Set( sal_uInt16 i, const SwNumFormat& );
     OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true,
                             bool bOnlyArabic = false ) const;
     /** - add optional parameter <_nRestrictToThisLevel> in order to
@@ -183,15 +183,15 @@ public:
 
        @return list of associated text nodes
     */
-    void GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const;
-    SwNumRule::tTxtNodeList::size_type GetTxtNodeListSize() const;
+    void GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const;
+    SwNumRule::tTextNodeList::size_type GetTextNodeListSize() const;
 
-    void AddTxtNode( SwTxtNode& rTxtNode );
-    void RemoveTxtNode( SwTxtNode& rTxtNode );
+    void AddTextNode( SwTextNode& rTextNode );
+    void RemoveTextNode( SwTextNode& rTextNode );
 
     SwNumRule::tParagraphStyleList::size_type GetParagraphStyleListSize() const;
-    void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
-    void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
+    void AddParagraphStyle( SwTextFormatColl& rTextFormatColl );
+    void RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl );
 
     inline void SetDefaultListId( const OUString& sDefaultListId )
     {
@@ -225,7 +225,7 @@ public:
 
     /** Tests whether the CharFormats are from the given doc
        and copies them if appropriate. */
-    void CheckCharFmts( SwDoc* pDoc );
+    void CheckCharFormats( SwDoc* pDoc );
 
     OUString GetName() const { return msName; }
 
@@ -250,8 +250,8 @@ public:
     void SetCountPhantoms(bool bCountPhantoms);
 
     /// Query and set PoolFormat IDs.
-    sal_uInt16 GetPoolFmtId() const         { return mnPoolFmtId; }
-    void SetPoolFmtId( sal_uInt16 nId )     { mnPoolFmtId = nId; }
+    sal_uInt16 GetPoolFormatId() const         { return mnPoolFormatId; }
+    void SetPoolFormatId( sal_uInt16 nId )     { mnPoolFormatId = nId; }
 
     /// Query and set Help-IDs for document styles.
     sal_uInt16 GetPoolHelpId() const        { return mnPoolHelpId; }
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b25e9af8ca11..5bdb73884dbf 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -28,11 +28,11 @@
 #include <editeng/borderline.hxx>
 
 class SfxPoolItem;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwNode;
 
 /// Separator line adjustment.
-enum SwFtnAdj
+enum SwFootnoteAdj
 {
     FTNADJ_LEFT,
     FTNADJ_CENTER,
@@ -40,7 +40,7 @@ enum SwFtnAdj
 };
 
 /// Footnote information.
-class SW_DLLPUBLIC SwPageFtnInfo
+class SW_DLLPUBLIC SwPageFootnoteInfo
 {
 private:
     SwTwips     m_nMaxHeight;   ///< maximum height of the footnote area.
@@ -48,7 +48,7 @@ private:
     editeng::SvxBorderStyle m_eLineStyle;  ///< Style of the separator line
     Color       m_LineColor;    ///< color of the separator line
     Fraction    m_Width;        ///< percentage width of the separator line.
-    SwFtnAdj    m_eAdjust;      ///< line adjustment.
+    SwFootnoteAdj    m_eAdjust;      ///< line adjustment.
     SwTwips     m_nTopDist;     ///< distance between body and separator.
     SwTwips     m_nBottomDist;  ///< distance between separator and first footnote
 
@@ -58,7 +58,7 @@ public:
     const Color& GetLineColor() const   { return m_LineColor;}
     editeng::SvxBorderStyle  GetLineStyle() const { return m_eLineStyle; }
     const Fraction& GetWidth() const    { return m_Width; }
-    SwFtnAdj    GetAdj() const          { return m_eAdjust; }
+    SwFootnoteAdj    GetAdj() const          { return m_eAdjust; }
     SwTwips     GetTopDist() const      { return m_nTopDist; }
     SwTwips     GetBottomDist() const   { return m_nBottomDist; }
 
@@ -67,19 +67,19 @@ public:
     void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;}
     void SetLineColor(const Color& rCol)    { m_LineColor = rCol;}
     void SetWidth(const Fraction & rNew)    { m_Width = rNew; }
-    void SetAdj(SwFtnAdj const eNew)        { m_eAdjust = eNew; }
+    void SetAdj(SwFootnoteAdj const eNew)        { m_eAdjust = eNew; }
     void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
     void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
-    SwPageFtnInfo();
-    SwPageFtnInfo( const SwPageFtnInfo& );
-    SwPageFtnInfo& operator=( const SwPageFtnInfo& );
+    SwPageFootnoteInfo();
+    SwPageFootnoteInfo( const SwPageFootnoteInfo& );
+    SwPageFootnoteInfo& operator=( const SwPageFootnoteInfo& );
 
-    bool operator ==( const SwPageFtnInfo& ) const;
+    bool operator ==( const SwPageFootnoteInfo& ) const;
 };
 
 /*
- *  Use of UseOnPage (m_eUse) and of FrmFmts
+ *  Use of UseOnPage (m_eUse) and of FrameFormats
  *
  *  RIGHT   - m_Master only for right hand (odd) pages, left hand (even) pages
  *            always empty.
@@ -134,11 +134,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
     OUString    m_StyleName;
     SvxNumberType m_NumType;
-    SwFrmFmt    m_Master;
-    SwFrmFmt    m_Left;
+    SwFrameFormat    m_Master;
+    SwFrameFormat    m_Left;
     // FIXME epicycles growing here - page margins need to be stored differently
-    SwFrmFmt    m_FirstMaster;
-    SwFrmFmt    m_FirstLeft;
+    SwFrameFormat    m_FirstMaster;
+    SwFrameFormat    m_FirstLeft;
     SwDepend    m_Depend; ///< Because of grid alignment (Registerhaltigkeit).
     SwPageDesc *m_pFollow;
     sal_uInt16  m_nRegHeight; ///< Sentence spacing and fontascent of style.
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
     bool        m_IsHidden;
 
     /// Footnote information.
-    SwPageFtnInfo m_IsFtnInfo;
+    SwPageFootnoteInfo m_IsFootnoteInfo;
 
     /** Called for mirroring of Chg (doc).
        No adjustment at any other place. */
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
     SAL_DLLPRIVATE void ResetAllAttr( bool bLeft );
 
-    SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
+    SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc );
 
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
@@ -172,9 +172,9 @@ public:
     const SvxNumberType &GetNumType() const { return m_NumType; }
     void  SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; }
 
-    const SwPageFtnInfo &GetFtnInfo() const { return m_IsFtnInfo; }
-          SwPageFtnInfo &GetFtnInfo()       { return m_IsFtnInfo; }
-    void  SetFtnInfo(const SwPageFtnInfo &rNew) { m_IsFtnInfo = rNew; }
+    const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_IsFootnoteInfo; }
+          SwPageFootnoteInfo &GetFootnoteInfo()       { return m_IsFootnoteInfo; }
+    void  SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_IsFootnoteInfo = rNew; }
 
     inline bool IsHeaderShared() const;
     inline bool IsFooterShared() const;
@@ -192,14 +192,14 @@ public:
     void      WriteUseOn(UseOnPage const eNew) { m_eUse = eNew; }
     UseOnPage ReadUseOn() const { return m_eUse; }
 
-          SwFrmFmt &GetMaster()      { return m_Master; }
-          SwFrmFmt &GetLeft()        { return m_Left; }
-          SwFrmFmt &GetFirstMaster() { return m_FirstMaster; }
-          SwFrmFmt &GetFirstLeft()   { return m_FirstLeft; }
-    const SwFrmFmt &GetMaster() const      { return m_Master; }
-    const SwFrmFmt &GetLeft()   const      { return m_Left; }
-    const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; }
-    const SwFrmFmt &GetFirstLeft()   const { return m_FirstLeft; }
+          SwFrameFormat &GetMaster()      { return m_Master; }
+          SwFrameFormat &GetLeft()        { return m_Left; }
+          SwFrameFormat &GetFirstMaster() { return m_FirstMaster; }
+          SwFrameFormat &GetFirstLeft()   { return m_FirstLeft; }
+    const SwFrameFormat &GetMaster() const      { return m_Master; }
+    const SwFrameFormat &GetLeft()   const      { return m_Left; }
+    const SwFrameFormat &GetFirstMaster() const { return m_FirstMaster; }
+    const SwFrameFormat &GetFirstLeft()   const { return m_FirstLeft; }
 
     /** Reset all attrs of the format but keep the ones a pagedesc
        cannot live without. */
@@ -208,10 +208,10 @@ public:
 
     /** Layout uses the following methods to obtain a format in order
        to be able to create a page. */
-           SwFrmFmt *GetRightFmt(bool const bFirst = false);
-    inline const SwFrmFmt *GetRightFmt(bool const bFirst = false) const;
-           SwFrmFmt *GetLeftFmt(bool const bFirst = false);
-    inline const SwFrmFmt *GetLeftFmt(bool const bFirst = false) const;
+           SwFrameFormat *GetRightFormat(bool const bFirst = false);
+    inline const SwFrameFormat *GetRightFormat(bool const bFirst = false) const;
+           SwFrameFormat *GetLeftFormat(bool const bFirst = false);
+    inline const SwFrameFormat *GetLeftFormat(bool const bFirst = false) const;
 
     sal_uInt16 GetRegHeight() const { return m_nRegHeight; }
     sal_uInt16 GetRegAscent() const { return m_nRegAscent; }
@@ -222,13 +222,13 @@ public:
     const SwPageDesc* GetFollow() const { return m_pFollow; }
           SwPageDesc* GetFollow() { return m_pFollow; }
 
-    void SetRegisterFmtColl( const SwTxtFmtColl* rFmt );
-    const SwTxtFmtColl* GetRegisterFmtColl() const;
+    void SetRegisterFormatColl( const SwTextFormatColl* rFormat );
+    const SwTextFormatColl* GetRegisterFormatColl() const;
     void RegisterChange();
 
     /// Query and set PoolFormat-Id.
-    sal_uInt16 GetPoolFmtId() const         { return m_Master.GetPoolFmtId(); }
-    void SetPoolFmtId(sal_uInt16 const nId) { m_Master.SetPoolFmtId(nId); }
+    sal_uInt16 GetPoolFormatId() const         { return m_Master.GetPoolFormatId(); }
+    void SetPoolFormatId(sal_uInt16 const nId) { m_Master.SetPoolFormatId(nId); }
     sal_uInt16 GetPoolHelpId() const        { return m_Master.GetPoolHelpId(); }
     void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); }
     sal_uInt8 GetPoolHlpFileId() const      { return m_Master.GetPoolHlpFileId(); }
@@ -237,7 +237,7 @@ public:
     /// Query information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
-    const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd,
+    const SwFrameFormat* GetPageFormatOfNode( const SwNode& rNd,
                                     bool bCheckForThisPgDc = true ) const;
     bool IsFollowNextPageOfNode( const SwNode& rNd ) const;
 
@@ -310,13 +310,13 @@ inline void SwPageDesc::ResetAllLeftAttr()
     ResetAllAttr( true );
 }
 
-inline const SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const
 {
-    return const_cast<SwPageDesc*>(this)->GetRightFmt(bFirst);
+    return const_cast<SwPageDesc*>(this)->GetRightFormat(bFirst);
 }
-inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst) const
 {
-    return const_cast<SwPageDesc*>(this)->GetLeftFmt(bFirst);
+    return const_cast<SwPageDesc*>(this)->GetLeftFormat(bFirst);
 }
 
 class SwPageDescExt
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 916e4e0a585e..451895460a67 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -30,12 +30,12 @@
 
 #include <iostream>
 
-class SwFmt;
+class SwFormat;
 class SfxPoolItem;
 class SfxItemSet;
 class SwDoc;
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class SwPaM;
 class Point;
 
@@ -53,10 +53,10 @@ struct SW_DLLPUBLIC SwPosition
     SwNodeIndex nNode;
     SwIndex nContent;
 
-    SwPosition( const SwNodeIndex &rNode, const SwIndex &rCntnt );
+    SwPosition( const SwNodeIndex &rNode, const SwIndex &rContent );
     explicit SwPosition( const SwNodeIndex &rNode );
     explicit SwPosition( const SwNode& rNode );
-    explicit SwPosition( SwCntntNode& rNode, const sal_Int32 nOffset = 0 );
+    explicit SwPosition( SwContentNode& rNode, const sal_Int32 nOffset = 0 );
 
     SwPosition( const SwPosition & );
     SwPosition &operator=(const SwPosition &);
@@ -147,10 +147,10 @@ typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove );
 SW_DLLPUBLIC extern SwGoInDoc fnGoDoc;
 extern SwGoInDoc fnGoSection;
 SW_DLLPUBLIC extern SwGoInDoc fnGoNode;
-SW_DLLPUBLIC extern SwGoInDoc fnGoCntnt; ///< SwPam::Move() default argument.
-extern SwGoInDoc fnGoCntntCells;
-extern SwGoInDoc fnGoCntntSkipHidden;
-extern SwGoInDoc fnGoCntntCellsSkipHidden;
+SW_DLLPUBLIC extern SwGoInDoc fnGoContent; ///< SwPam::Move() default argument.
+extern SwGoInDoc fnGoContentCells;
+extern SwGoInDoc fnGoContentSkipHidden;
+extern SwGoInDoc fnGoContentCellsSkipHidden;
 
 void _InitPam();
 
@@ -175,12 +175,12 @@ public:
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
     SwPaM( const SwNode& rMk, const SwNode& rPt,
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
-    SwPaM(  const SwNodeIndex& rMk, sal_Int32 nMkCntnt,
-            const SwNodeIndex& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM(  const SwNode& rMk, sal_Int32 nMkCntnt,
-            const SwNode& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM( const SwNode& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
-    SwPaM( const SwNodeIndex& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
+    SwPaM(  const SwNodeIndex& rMk, sal_Int32 nMkContent,
+            const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+    SwPaM(  const SwNode& rMk, sal_Int32 nMkContent,
+            const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+    SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
+    SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
     virtual ~SwPaM();
 
     /// this takes a second parameter, which indicates the Ring that
@@ -191,15 +191,15 @@ public:
 
     /// Movement of cursor.
     bool Move( SwMoveFn fnMove = fnMoveForward,
-                SwGoInDoc fnGo = fnGoCntnt );
+                SwGoInDoc fnGo = fnGoContent );
 
     /// Search.
     bool Find(  const com::sun::star::util::SearchOptions& rSearchOpt,
                 bool bSearchInNotes,
-                utl::TextSearch& rSTxt,
+                utl::TextSearch& rSText,
                 SwMoveFn fnMove = fnMoveForward,
                 const SwPaM *pPam =0, bool bInReadOnly = false);
-    bool Find(  const SwFmt& rFmt,
+    bool Find(  const SwFormat& rFormat,
                 SwMoveFn fnMove = fnMoveForward,
                 const SwPaM *pPam =0, bool bInReadOnly = false);
     bool Find(  const SfxPoolItem& rAttr, bool bValue = true,
@@ -209,9 +209,9 @@ public:
                 SwMoveFn fnMove,
                 const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst );
 
-    bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+    bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText,
                    SwMoveFn fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd,
-                   sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen, SwNode* pNode, SwPaM* pPam);
+                   sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam);
 
     inline bool IsInFrontOfLabel() const        { return m_bIsInFrontOfLabel; }
     inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; }
@@ -271,9 +271,9 @@ public:
     }
 
     /// @return current ContentNode at Point/Mark
-    SwCntntNode* GetCntntNode( bool bPoint = true ) const
+    SwContentNode* GetContentNode( bool bPoint = true ) const
     {
-        return GetNode(bPoint).GetCntntNode();
+        return GetNode(bPoint).GetContentNode();
     }
 
     /**
@@ -306,7 +306,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
-    OUString GetTxt() const;
+    OUString GetText() const;
     void InvalidatePaM();
     SwPaM* GetNext()
         { return GetNextInRing(); }
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6fbe6c99415d..d0a11094c25a 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -40,35 +40,35 @@
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/pgrditem.hxx>
 
-class SwCharFmt;
+class SwCharFormat;
 class IntlWrapper;
 
 #define DROP_WHOLEWORD ((sal_uInt16)0x0001)
 
-/** If SwFmtDrop is a Client, it is the CharFmt that describes the font for the
-   DropCaps. If it is not a Client, formatting uses the CharFmt of the paragraph.
-   If the CharFmt is modified, this change is propagated to the paragraphs
-   via the Modify of SwFmtDrop. */
-class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
+/** If SwFormatDrop is a Client, it is the CharFormat that describes the font for the
+   DropCaps. If it is not a Client, formatting uses the CharFormat of the paragraph.
+   If the CharFormat is modified, this change is propagated to the paragraphs
+   via the Modify of SwFormatDrop. */
+class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
 {
     SwModify* pDefinedIn;       /**< Modify-Object, that contains DropCaps.
-                                  Can only be TxtFmtCollection/TxtNode. */
+                                  Can only be TextFormatCollection/TextNode. */
     sal_uInt16 nDistance;       ///< Distance to beginning of text.
-    sal_uInt16 nReadFmt;        ///< For Sw3-Reader: CharFormat-Id (load Pool!).
+    sal_uInt16 nReadFormat;        ///< For Sw3-Reader: CharFormat-Id (load Pool!).
     sal_uInt8  nLines;          ///< Line count.
     sal_uInt8  nChars;          ///< Character count.
     bool   bWholeWord;      ///< First word with initials.
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class SwClient.
 
-    SwFmtDrop();
-    virtual ~SwFmtDrop();
+    SwFormatDrop();
+    virtual ~SwFormatDrop();
 
     // @@@ public copy ctor, but no copy assignment?
-    SwFmtDrop( const SwFmtDrop & );
+    SwFormatDrop( const SwFormatDrop & );
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION;
+    SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION;
 
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
@@ -98,9 +98,9 @@ public:
     inline sal_uInt16 GetDistance() const { return nDistance; }
     inline sal_uInt16 &GetDistance() { return nDistance; }
 
-    inline const SwCharFmt *GetCharFmt() const { return static_cast<const SwCharFmt*>(GetRegisteredIn()); }
-    inline SwCharFmt *GetCharFmt()       { return static_cast<SwCharFmt*>(GetRegisteredIn()); }
-    void SetCharFmt( SwCharFmt *pNew );
+    inline const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); }
+    inline SwCharFormat *GetCharFormat()       { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
+    void SetCharFormat( SwCharFormat *pNew );
     /// Get information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
@@ -207,8 +207,8 @@ inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const
     {   return static_cast<const SvxLineSpacingItem&>(Get( RES_PARATR_LINESPACING,bInP)); }
 inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const
     {   return static_cast<const SvxAdjustItem&>(Get( RES_PARATR_ADJUST,bInP)); }
-inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const
-    {   return static_cast<const SvxFmtSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
+inline const SvxFormatSplitItem &SwAttrSet::GetSplit(bool bInP) const
+    {   return static_cast<const SvxFormatSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
 inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const
     {   return static_cast<const SwRegisterItem&>(Get( RES_PARATR_REGISTER,bInP)); }
 inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const
@@ -219,8 +219,8 @@ inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const
     {   return static_cast<const SvxTabStopItem&>(Get( RES_PARATR_TABSTOP,bInP)); }
 inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const
     {   return static_cast<const SvxHyphenZoneItem&>(Get(RES_PARATR_HYPHENZONE,bInP)); }
-inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const
-    {   return static_cast<const SwFmtDrop&>(Get(RES_PARATR_DROP,bInP)); }
+inline const SwFormatDrop &SwAttrSet::GetDrop(bool bInP) const
+    {   return static_cast<const SwFormatDrop&>(Get(RES_PARATR_DROP,bInP)); }
 inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const
     {   return static_cast<const SwNumRuleItem&>(Get(RES_PARATR_NUMRULE,bInP)); }
 inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const
@@ -236,38 +236,38 @@ inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const
 inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const
     {   return static_cast<const SwParaConnectBorderItem&>(Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
-// Implementation of paragraph-attributes methods of SwFmt
-inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const
+// Implementation of paragraph-attributes methods of SwFormat
+inline const SvxLineSpacingItem &SwFormat::GetLineSpacing(bool bInP) const
     {   return m_aSet.GetLineSpacing(bInP); }
-inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const
+inline const SvxAdjustItem &SwFormat::GetAdjust(bool bInP) const
     {   return m_aSet.GetAdjust(bInP); }
-inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const
+inline const SvxFormatSplitItem &SwFormat::GetSplit(bool bInP) const
     {   return m_aSet.GetSplit(bInP); }
-inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const
+inline const SwRegisterItem &SwFormat::GetRegister(bool bInP) const
     {   return m_aSet.GetRegister(bInP); }
-inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const
+inline const SvxWidowsItem &SwFormat::GetWidows(bool bInP) const
     {   return m_aSet.GetWidows(bInP); }
-inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const
+inline const SvxOrphansItem &SwFormat::GetOrphans(bool bInP) const
     {   return m_aSet.GetOrphans(bInP); }
-inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const
+inline const SvxTabStopItem &SwFormat::GetTabStops(bool bInP) const
     {   return m_aSet.GetTabStops(bInP); }
-inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const
+inline const SvxHyphenZoneItem &SwFormat::GetHyphenZone(bool bInP) const
     {   return m_aSet.GetHyphenZone(bInP); }
-inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const
+inline const SwFormatDrop &SwFormat::GetDrop(bool bInP) const
     {   return m_aSet.GetDrop(bInP); }
-inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const
+inline const SwNumRuleItem &SwFormat::GetNumRule(bool bInP) const
     {   return m_aSet.GetNumRule(bInP); }
-inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const
+inline const SvxScriptSpaceItem& SwFormat::GetScriptSpace(bool bInP) const
     {   return m_aSet.GetScriptSpace(bInP) ; }
-inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const
+inline const SvxHangingPunctuationItem &SwFormat::GetHangingPunctuation(bool bInP) const
     {   return m_aSet.GetHangingPunctuation(bInP) ; }
-inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const
+inline const SvxForbiddenRuleItem &SwFormat::GetForbiddenRule(bool bInP) const
     {   return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
-inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const
+inline const SvxParaVertAlignItem &SwFormat::GetParaVertAlign(bool bInP) const
     {   return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
-inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const
+inline const SvxParaGridItem &SwFormat::GetParaGrid(bool bInP) const
     {   return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
-inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const
+inline const SwParaConnectBorderItem &SwFormat::GetParaConnectBorder(bool bInP) const
     {   return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
 #endif
diff --git a/sw/inc/poolfmt.awk b/sw/inc/poolfmt.awk
index 3c196fc8fe2d..58f758c94640 100644
--- a/sw/inc/poolfmt.awk
+++ b/sw/inc/poolfmt.awk
@@ -40,7 +40,7 @@ function Main() {
 	print
     print  "void main( int , char *[] ) {"
     sStr = "#define"
-    print  "    int nSize = (sizeof(ppPoolIds) / sizeof(PoolFmtIds)) - 1;"
+    print  "    int nSize = (sizeof(ppPoolIds) / sizeof(PoolFormatIds)) - 1;"
     print  "    for( int n = 0; n < nSize; n++ )"
     print  "        printf( \"" sStr " %s\\t%8d\\n\", ppPoolIds[ n ].pStr, ppPoolIds[ n ].nId );"
     print  "}"
@@ -48,8 +48,8 @@ function Main() {
 
 function TableHead() {
 	print
-    print "struct PoolFmtIds { int nId; const char* pStr; };"
-    print "static PoolFmtIds ppPoolIds[] = {"
+    print "struct PoolFormatIds { int nId; const char* pStr; };"
+    print "static PoolFormatIds ppPoolIds[] = {"
 }
 
 function TableTail() {
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index df029593b836..b80e0ed8e6a2 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -82,7 +82,7 @@ const sal_uInt16 POOLGRP_NUMRULE        = (3 << 11) + POOLGRP_NOCOLLID;
 const sal_uInt16 POOL_IDUSER_FMT =
         USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID);
 
-inline bool IsPoolUserFmt( sal_uInt16 nId )
+inline bool IsPoolUserFormat( sal_uInt16 nId )
 {
     return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID));
 }
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index e8fa575ae36c..47e8c3fb9721 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -27,7 +27,7 @@
 #include <SidebarWindowsTypes.hxx>
 
 class SfxBroadcaster;
-class SwTxtFld;
+class SwTextField;
 class SwRootFrm;
 class SwPostItMgr;
 class SwEditWin;
@@ -112,7 +112,7 @@ public:
 
     virtual SwPosition GetAnchorPosition() const = 0;
     virtual bool UseElement() = 0;
-    virtual const SwFmtFld& GetFmtFld() const = 0;
+    virtual const SwFormatField& GetFormatField() const = 0;
     virtual const SfxBroadcaster* GetBroadCaster() const = 0;
     virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin,
                                                                 WinBits nBits,
@@ -124,11 +124,11 @@ class SwAnnotationItem: public SwSidebarItem
 {
 public:
     SwAnnotationItem(
-        SwFmtFld& rFmtFld,
+        SwFormatField& rFormatField,
         const bool aShow,
         const bool aFocus)
         : SwSidebarItem( aShow, aFocus )
-        , mrFmtFld( rFmtFld )
+        , mrFormatField( rFormatField )
     {
     }
 
@@ -138,13 +138,13 @@ public:
 
     virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE;
     virtual bool UseElement() SAL_OVERRIDE;
-    virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE
+    virtual const SwFormatField& GetFormatField() const SAL_OVERRIDE
     {
-        return mrFmtFld;
+        return mrFormatField;
     }
     virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE
     {
-        return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld);
+        return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
     }
     virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow(
         SwEditWin& rEditWin,
@@ -153,7 +153,7 @@ public:
         SwPostItBits aBits ) SAL_OVERRIDE;
 
 private:
-    SwFmtFld& mrFmtFld;
+    SwFormatField& mrFormatField;
 };
 
 #endif // INCLUDED_SW_INC_POSTITHELPER_HXX
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 6c5e6f3efae7..5f7b7cb0a9c0 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -33,7 +33,7 @@
 
 class SwDoc;
 class SwDocShell;
-class _SetGetExpFlds;
+class _SetGetExpFields;
 class SwViewOption;
 class OutputDevice;
 class SwViewOptionAdjust_Impl;
@@ -233,8 +233,8 @@ class SwRenderData
 public:
 
     // PostIt relevant data
-    /// an array of "_SetGetExpFld *" sorted by page and line numbers
-    ::boost::scoped_ptr<_SetGetExpFlds> m_pPostItFields;
+    /// an array of "_SetGetExpField *" sorted by page and line numbers
+    ::boost::scoped_ptr<_SetGetExpFields> m_pPostItFields;
     /// this contains a SwDoc with the post-it content
     ::boost::scoped_ptr<SwViewShell>      m_pPostItShell;
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 533c027628a2..6fd7ad6f2ed9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -49,15 +49,15 @@ public:
     virtual bool operator == ( const SwRedlineExtraData& ) const;
 };
 
-class SwRedlineExtraData_FmtColl : public SwRedlineExtraData
+class SwRedlineExtraData_FormatColl : public SwRedlineExtraData
 {
-    OUString sFmtNm;
+    OUString sFormatNm;
     SfxItemSet* pSet;
     sal_uInt16 nPoolId;
 public:
-    SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId,
+    SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId,
                                 const SfxItemSet* pSet = 0 );
-    virtual ~SwRedlineExtraData_FmtColl();
+    virtual ~SwRedlineExtraData_FormatColl();
     virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
     virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
     virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
@@ -149,7 +149,7 @@ public:
     void SetComment( const OUString& rS )     { sComment = rS; }
     void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
 
-    void SetAutoFmtFlag()
+    void SetAutoFormatFlag()
   { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
     bool CanCombine( const SwRedlineData& rCmp ) const
         {
@@ -182,7 +182,7 @@ public:
 class SW_DLLPUBLIC SwRangeRedline : public SwPaM
 {
     SwRedlineData* pRedlineData;
-    SwNodeIndex* pCntntSect;
+    SwNodeIndex* pContentSect;
     bool bDelLastPara : 1;
     bool bIsLastParaDelete : 1;
     bool bIsVisible : 1;
@@ -199,13 +199,13 @@ public:
     // For sw3io: pData is taken over!
     SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl,
                bool bDelLP, bool bIsPD) :
-        SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ),
+        SwPaM( rPos ), pRedlineData( pData ), pContentSect( 0 ),
         bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl )
     {}
     SwRangeRedline( const SwRangeRedline& );
     virtual ~SwRangeRedline();
 
-    SwNodeIndex* GetContentIdx() const { return pCntntSect; }
+    SwNodeIndex* GetContentIdx() const { return pContentSect; }
     // For Undo.
     void SetContentIdx( const SwNodeIndex* );
 
@@ -230,7 +230,7 @@ public:
         { return *pRedlineData == rCmp; }
     bool operator!=( const SwRedlineData& rCmp ) const
         { return *pRedlineData != rCmp; }
-    void SetAutoFmtFlag()               { pRedlineData->SetAutoFmtFlag(); }
+    void SetAutoFormatFlag()               { pRedlineData->SetAutoFormatFlag(); }
 
     sal_uInt16 GetStackCount() const;
     sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 058d57d815ca..a6ececb2cd96 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -23,11 +23,11 @@
 
 class SfxPoolItem;
 class SwDoc;
-class SwTxtNode;
-class SwTxtFld;
+class SwTextNode;
+class SwTextField;
 
-bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                    const SwTxtNode& rBehindNd, sal_Int32 nSttPos );
+bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
+                    const SwTextNode& rBehindNd, sal_Int32 nSttPos );
 
 enum REFERENCESUBTYPE
 {
@@ -74,7 +74,7 @@ public:
 
     void MergeWithOtherDoc( SwDoc& rDestDoc );
 
-    static SwTxtNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
+    static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                                         sal_uInt16 nSubType, sal_uInt16 nSeqNo,
                                         sal_Int32* pStt, sal_Int32* pEnd = 0 );
 };
@@ -83,7 +83,7 @@ class SW_DLLPUBLIC SwGetRefField : public SwField
 {
 private:
     OUString sSetRefName;
-    OUString sTxt;
+    OUString sText;
     sal_uInt16 nSubType;
     sal_uInt16 nSeqNo;
 
@@ -91,13 +91,13 @@ private:
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
     // #i81002#
-    static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
-                          const SwTxtNode& rTxtNodeOfReferencedItem,
+    static OUString MakeRefNumStr( const SwTextNode& rTextNodeOfField,
+                          const SwTextNode& rTextNodeOfReferencedItem,
                           const sal_uInt32 nRefNumFormat );
 
 public:
     SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef,
-                    sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt );
+                    sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat );
 
     virtual ~SwGetRefField();
 
@@ -106,15 +106,15 @@ public:
     OUString GetSetRefName() const { return sSetRefName; }
 
     // #i81002#
-    /** The <SwTxtFld> instance, which represents the text attribute for the
+    /** The <SwTextField> instance, which represents the text attribute for the
        <SwGetRefField> instance, has to be passed to the method.
-       This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN
+       This <SwTextField> instance is needed for the reference format type REF_UPDOWN
        and REF_NUMBER.
        Note: This instance may be NULL (field in Undo/Redo). This will cause
        no update for these reference format types. */
-    void                UpdateField( const SwTxtFld* pFldTxtAttr );
+    void                UpdateField( const SwTextField* pFieldTextAttr );
 
-    void                SetExpand( const OUString& rStr ) { sTxt = rStr; }
+    void                SetExpand( const OUString& rStr ) { sText = rStr; }
 
     /// Get/set sub type.
     virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
@@ -123,9 +123,9 @@ public:
     // --> #i81002#
     bool IsRefToHeadingCrossRefBookmark() const;
     bool IsRefToNumItemCrossRefBookmark() const;
-    const SwTxtNode* GetReferencedTxtNode() const;
+    const SwTextNode* GetReferencedTextNode() const;
     // #i85090#
-    OUString GetExpandedTxtOfReferencedTxtNode() const;
+    OUString GetExpandedTextOfReferencedTextNode() const;
 
     /// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD).
     sal_uInt16              GetSeqNo() const        { return nSeqNo; }
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index 5dfd0bd0a6f7..38572b2e71da 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -26,7 +26,7 @@
 class SwRubyListEntry
 {
     OUString m_sText;
-    SwFmtRuby m_aRubyAttr;
+    SwFormatRuby m_aRubyAttr;
 public:
     SwRubyListEntry() : m_aRubyAttr( OUString() ) {}
     ~SwRubyListEntry();
@@ -34,9 +34,9 @@ public:
     OUString GetText() const                    { return m_sText; }
     void SetText( const OUString& rStr )        { m_sText = rStr; }
 
-    const SwFmtRuby& GetRubyAttr() const        { return m_aRubyAttr; }
-          SwFmtRuby& GetRubyAttr()              { return m_aRubyAttr; }
-    void SetRubyAttr( const SwFmtRuby& rAttr )  { m_aRubyAttr = rAttr; }
+    const SwFormatRuby& GetRubyAttr() const        { return m_aRubyAttr; }
+          SwFormatRuby& GetRubyAttr()              { return m_aRubyAttr; }
+    void SetRubyAttr( const SwFormatRuby& rAttr )  { m_aRubyAttr = rAttr; }
 };
 
 class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {};
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6dc7d17a4d88..a3d34be61988 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextSection; }
 } } }
 
-class SwSectionFmt;
+class SwSectionFormat;
 class SwDoc;
 class SwSection;
 class SwSectionNode;
@@ -162,7 +162,7 @@ public:
     TYPEINFO_OVERRIDE();     // rtti
 
     SwSection(SectionType const eType, OUString const& rName,
-                SwSectionFmt & rFormat);
+                SwSectionFormat & rFormat);
     virtual ~SwSection();
 
     bool DataEquals(SwSectionData const& rCmp) const;
@@ -174,8 +174,8 @@ public:
     SectionType GetType() const             { return m_Data.GetType(); }
     void SetType(SectionType const eType)   { return m_Data.SetType(eType); }
 
-    inline SwSectionFmt* GetFmt();
-    inline SwSectionFmt const * GetFmt() const;
+    inline SwSectionFormat* GetFormat();
+    inline SwSectionFormat const * GetFormat() const;
 
     // Set hidden/protected -> update the whole tree!
     // (Attributes/flags are set/get.)
@@ -256,34 +256,34 @@ public:
 class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint
 {
     public:
-        SwSectionFrmMoveAndDeleteHint( const bool bSaveCntnt )
+        SwSectionFrmMoveAndDeleteHint( const bool bSaveContent )
             : SfxSimpleHint( SFX_HINT_DYING )
-            , mbSaveCntnt( bSaveCntnt )
+            , mbSaveContent( bSaveContent )
         {}
 
         virtual ~SwSectionFrmMoveAndDeleteHint()
         {}
 
-        bool IsSaveCntnt() const
+        bool IsSaveContent() const
         {
-            return mbSaveCntnt;
+            return mbSaveContent;
         }
 
     private:
-        const bool mbSaveCntnt;
+        const bool mbSaveContent;
 };
 
 enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS };
 
-class SW_DLLPUBLIC SwSectionFmt
-    : public SwFrmFmt
+class SW_DLLPUBLIC SwSectionFormat
+    : public SwFrameFormat
     , public ::sfx2::Metadatable
 {
     friend class SwDoc;
 
-    /** Why does this exist in addition to the m_wXObject in SwFrmFmt?
+    /** Why does this exist in addition to the m_wXObject in SwFrameFormat?
         in case of an index, both a SwXDocumentIndex and a SwXTextSection
-        register at this SwSectionFmt, so we need to have two refs.
+        register at this SwSectionFormat, so we need to have two refs.
      */
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextSection> m_wXTextSection;
@@ -291,12 +291,12 @@ class SW_DLLPUBLIC SwSectionFmt
     SAL_DLLPRIVATE void UpdateParent();      // Parent has been changed.
 
 protected:
-    SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc );
+    SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc );
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     // Already contained in base class client.
-    virtual ~SwSectionFmt();
+    virtual ~SwSectionFormat();
 
     // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST).
     virtual void DelFrms() SAL_OVERRIDE;
@@ -308,7 +308,7 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     SwSection* GetSection() const;
-    inline SwSectionFmt* GetParent() const;
+    inline SwSectionFormat* GetParent() const;
     inline SwSection* GetParentSection() const;
 
     //  All sections that are derived from this one:
@@ -323,7 +323,7 @@ public:
 
           SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false);
     const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const
-        { return const_cast<SwSectionFmt *>(this)
+        { return const_cast<SwSectionFormat *>(this)
                 ->GetSectionNode(bEvenIfInUndo); }
 
     // Is section a valid one for global document?
@@ -347,36 +347,36 @@ public:
 
 };
 
-SwSectionFmt* SwSection::GetFmt()
+SwSectionFormat* SwSection::GetFormat()
 {
-    return static_cast<SwSectionFmt*>(GetRegisteredIn());
+    return static_cast<SwSectionFormat*>(GetRegisteredIn());
 }
 
-SwSectionFmt const * SwSection::GetFmt() const
+SwSectionFormat const * SwSection::GetFormat() const
 {
-    return static_cast<SwSectionFmt const *>(GetRegisteredIn());
+    return static_cast<SwSectionFormat const *>(GetRegisteredIn());
 }
 
 inline SwSection* SwSection::GetParent() const
 {
-    SwSectionFmt const * pFmt = GetFmt();
+    SwSectionFormat const * pFormat = GetFormat();
     SwSection* pRet = 0;
-    if( pFmt )
-        pRet = pFmt->GetParentSection();
+    if( pFormat )
+        pRet = pFormat->GetParentSection();
     return pRet;
 }
 
-inline SwSectionFmt* SwSectionFmt::GetParent() const
+inline SwSectionFormat* SwSectionFormat::GetParent() const
 {
-    SwSectionFmt* pRet = 0;
+    SwSectionFormat* pRet = 0;
     if( GetRegisteredIn() )
-        pRet = const_cast<SwSectionFmt*>(PTR_CAST( SwSectionFmt, GetRegisteredIn() ));
+        pRet = const_cast<SwSectionFormat*>(PTR_CAST( SwSectionFormat, GetRegisteredIn() ));
     return pRet;
 }
 
-inline SwSection* SwSectionFmt::GetParentSection() const
+inline SwSection* SwSectionFormat::GetParentSection() const
 {
-    SwSectionFmt* pParent = GetParent();
+    SwSectionFormat* pParent = GetParent();
     SwSection* pRet = 0;
     if( pParent )
     {
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index b7e36ddb70a1..da2622d60241 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -47,7 +47,7 @@ class SfxMedium;
 class SvStream;
 class SvxFontItem;
 class SvxMacroTableDtor;
-class SwCntntNode;
+class SwContentNode;
 class SwCrsrShell;
 class SwDoc;
 class SwPaM;
@@ -106,42 +106,42 @@ class SwgReaderOption
     SwAsciiOptions aASCIIOpts;
     union
     {
-        bool bFmtsOnly;
+        bool bFormatsOnly;
         struct
         {
-            bool bFrmFmts: 1;
+            bool bFrameFormats: 1;
             bool bPageDescs: 1;
-            bool bTxtFmts: 1;
+            bool bTextFormats: 1;
             bool bNumRules: 1;
             bool bMerge:1;
-        }  Fmts;
+        }  Formats;
     } What;
 
 public:
-    void ResetAllFmtsOnly() { What.bFmtsOnly = false; }
-    bool IsFmtsOnly() const { return What.bFmtsOnly; }
+    void ResetAllFormatsOnly() { What.bFormatsOnly = false; }
+    bool IsFormatsOnly() const { return What.bFormatsOnly; }
 
-    bool IsFrmFmts() const { return What.Fmts.bFrmFmts; }
-    void SetFrmFmts( const bool bNew) { What.Fmts.bFrmFmts = bNew; }
+    bool IsFrameFormats() const { return What.Formats.bFrameFormats; }
+    void SetFrameFormats( const bool bNew) { What.Formats.bFrameFormats = bNew; }
 
-    bool IsPageDescs() const { return What.Fmts.bPageDescs; }
-    void SetPageDescs( const bool bNew) { What.Fmts.bPageDescs = bNew; }
+    bool IsPageDescs() const { return What.Formats.bPageDescs; }
+    void SetPageDescs( const bool bNew) { What.Formats.bPageDescs = bNew; }
 
-    bool IsTxtFmts() const { return What.Fmts.bTxtFmts; }
-    void SetTxtFmts( const bool bNew) { What.Fmts.bTxtFmts = bNew; }
+    bool IsTextFormats() const { return What.Formats.bTextFormats; }
+    void SetTextFormats( const bool bNew) { What.Formats.bTextFormats = bNew; }
 
-    bool IsNumRules() const { return What.Fmts.bNumRules; }
-    void SetNumRules( const bool bNew) { What.Fmts.bNumRules = bNew; }
+    bool IsNumRules() const { return What.Formats.bNumRules; }
+    void SetNumRules( const bool bNew) { What.Formats.bNumRules = bNew; }
 
-    bool IsMerge() const { return What.Fmts.bMerge; }
-    void SetMerge( const bool bNew ) { What.Fmts.bMerge = bNew; }
+    bool IsMerge() const { return What.Formats.bMerge; }
+    void SetMerge( const bool bNew ) { What.Formats.bMerge = bNew; }
 
     const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; }
     void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; }
     void ResetASCIIOpts() { aASCIIOpts.Reset(); }
 
     SwgReaderOption()
-    {   ResetAllFmtsOnly(); aASCIIOpts.Reset(); }
+    {   ResetAllFormatsOnly(); aASCIIOpts.Reset(); }
 };
 
 class SW_DLLPUBLIC SwReader: public SwDocFac
@@ -225,11 +225,11 @@ public:
     virtual void SetFltName( const OUString& rFltNm );
 
     // Adapt item-set of a Frm-Format to the old format.
-    static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet );
+    static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet );
 
     // Adapt Frame-/Graphics-/OLE- styles to the old format
     // (without borders etc.).
-    static void ResetFrmFmts( SwDoc& rDoc );
+    static void ResetFrameFormats( SwDoc& rDoc );
 
     // Load filter template, set it and release it again.
     SwDoc* GetTemplateDoc();
@@ -339,8 +339,8 @@ public:
     OUString GetFileName() const;           // Filename of pImp.
     bool IsReadOnly() const;            // ReadOnly-flag of pImp.
 
-    bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl );
-    bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl );
+    bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable );
+    bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable );
 
     bool StartPutMuchBlockEntries();
     void EndPutMuchBlockEntries();
@@ -381,7 +381,7 @@ protected:
     void ResetWriter();
     bool CopyNextPam( SwPaM ** );
 
-    void PutNumFmtFontsInAttrPool();
+    void PutNumFormatFontsInAttrPool();
     void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
 
     virtual sal_uLong WriteStream() = 0;
@@ -434,9 +434,9 @@ public:
     sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const;
     // Build a bookmark table, which is sort by the node position. The
     // OtherPos of the bookmarks also inserted.
-    void CreateBookmarkTbl();
+    void CreateBookmarkTable();
     // Search alle Bookmarks in the range and return it in the Array.
-    bool GetBookmarks( const SwCntntNode& rNd,
+    bool GetBookmarks( const SwContentNode& rNd,
                         sal_Int32 nStt, sal_Int32 nEnd,
                         std::vector< const ::sw::mark::IMark* >& rArr );
 
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 60ab4a16cb3a..ca89be7dd7c6 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -42,10 +42,10 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     OUString        aCalc_Error;
 
     // For GetRefField - up/down.
-    OUString        aGetRefFld_Up;
-    OUString        aGetRefFld_Down;
+    OUString        aGetRefField_Up;
+    OUString        aGetRefField_Down;
     // For GetRefField - referenced item not found.
-    OUString        aGetRefFld_RefItemNotFound;
+    OUString        aGetRefField_RefItemNotFound;
     // For dynamic menu - string "all".
     OUString        aStrAllPageHeadFoot;
     // For some list boxes - string "none"
@@ -71,7 +71,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     std::vector<OUString> aDocInfoLst;
 
     // The autoFormat-Redline comments.
-    inline const std::vector<OUString>& GetAutoFmtNameLst() const;
+    inline const std::vector<OUString>& GetAutoFormatNameLst() const;
 
     enum PageNameMode
     {
@@ -88,18 +88,18 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     ~ShellResource();
 
 private:
-    void _GetAutoFmtNameLst() const;
-    mutable std::vector<OUString> *pAutoFmtNameLst;
+    void _GetAutoFormatNameLst() const;
+    mutable std::vector<OUString> *pAutoFormatNameLst;
     OUString        sPageDescFirstName;
     OUString        sPageDescFollowName;
     OUString        sPageDescName;
 };
 
-inline const std::vector<OUString>& ShellResource::GetAutoFmtNameLst() const
+inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const
 {
-    if( !pAutoFmtNameLst )
-        _GetAutoFmtNameLst();
-    return *pAutoFmtNameLst;
+    if( !pAutoFormatNameLst )
+        _GetAutoFormatNameLst();
+    return *pAutoFormatNameLst;
 }
 
 #endif // INCLUDED_SW_INC_SHELLRES_HXX
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 8a09c261b437..cce7388ff0e6 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -28,30 +28,30 @@
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
-class SwTxtNode;
+class SwTextNode;
 class SwIndex;
 namespace vcl { class Font; }
 
 struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 {
-    SwTxtNode  *pStartNode;
+    SwTextNode  *pStartNode;
     SwIndex    *pStartIdx;
-    SwTxtNode  *pEndNode;
+    SwTextNode  *pEndNode;
     SwIndex    *pEndIdx;
 
     SwArgsBase(
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd )
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd )
         : pStartNode( pStart ), pStartIdx( &rStart ),
           pEndNode( pEnd ), pEndIdx( &rEnd )
         {}
 
-    void SetStart(SwTxtNode* pStart, SwIndex& rStart )
+    void SetStart(SwTextNode* pStart, SwIndex& rStart )
     {
         pStartNode = pStart;    pStartIdx = &rStart ;
     }
 
-    void SetEnd( SwTxtNode* pEnd, SwIndex& rEnd  )
+    void SetEnd( SwTextNode* pEnd, SwIndex& rEnd  )
     {
         pEndNode = pEnd;        pEndIdx = &rEnd ;
     }
@@ -71,8 +71,8 @@ struct SwConversionArgs : SwArgsBase
     bool            bAllowImplicitChangesForNotConvertibleText;
 
     SwConversionArgs( LanguageType nLang,
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd )
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd )
         : SwArgsBase( pStart, rStart, pEnd, rEnd ),
           nConvSrcLang( nLang ),
           nConvTextLang( LANGUAGE_NONE ),
@@ -94,8 +94,8 @@ struct SwSpellArgs : SwArgsBase
 
     SwSpellArgs(::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk,
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd,
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd,
             bool bGrammar )
         :   SwArgsBase( pStart, rStart, pEnd, rEnd ),
             xSpeller( rxSplChk ),
@@ -105,8 +105,8 @@ struct SwSpellArgs : SwArgsBase
 
 // Parameter-class for Hyphenate.
 // docedt.cxx:  SwDoc::Hyphenate()
-// txtedt.cxx:  SwTxtNode::Hyphenate()
-// txthyph.cxx: SwTxtFrm::Hyphenate()
+// txtedt.cxx:  SwTextNode::Hyphenate()
+// txthyph.cxx: SwTextFrm::Hyphenate()
 
 class SwInterHyphInfo
 {
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
index d837db2aa776..1c500f06195b 100644
--- a/sw/inc/sw3convert.hxx
+++ b/sw/inc/sw3convert.hxx
@@ -25,7 +25,7 @@
 class SwDoc;
 
 SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
-                                sal_uInt16& rSubType, sal_uLong &rFmt,
+                                sal_uInt16& rSubType, sal_uLong &rFormat,
                                 sal_uInt16 nVersion );
 
 #endif
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a4fa8d788185..cb5ec2feb3f5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -47,7 +47,7 @@ class SfxStyleSheetBase;
 class SwGlossaryHdl;
 class SwField;
 
-class SwLabFmtPage;
+class SwLabFormatPage;
 class SwLabRec;
 class SwAsciiOptions;
 class SwDocShell;
@@ -55,7 +55,7 @@ class SvStream;
 class SwWrtShell;
 class SfxRequest;
 class SwView;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwTOXMgr;
 class SwForm;
 struct CurTOXType;
@@ -101,7 +101,7 @@ public:
     virtual OUString        GetCurrShortName() const = 0;
 };
 
-class AbstractFldInputDlg : public VclAbstractTerminatedDialog
+class AbstractFieldInputDlg : public VclAbstractTerminatedDialog
 {
 public:
     //from class SalFrame
@@ -125,8 +125,8 @@ class AbstractInsTableDlg : public VclAbstractDialog
 {
 public:
     virtual void            GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
-                                SwTableAutoFmt *& prTAFmt ) = 0;
+                                SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
+                                SwTableAutoFormat *& prTAFormat ) = 0;
 };
 
 class AbstractJavaEditDialog : public VclAbstractDialog
@@ -225,8 +225,8 @@ class AbstractSwConvertTableDlg :  public VclAbstractDialog
 {
 public:
     virtual void GetValues( sal_Unicode& rDelim,
-                    SwInsertTableOptions& rInsTblFlags,
-                    SwTableAutoFmt const*& prTAFmt ) = 0;
+                    SwInsertTableOptions& rInsTableFlags,
+                    SwTableAutoFormat const*& prTAFormat ) = 0;
 };
 
 class AbstractSwInsertDBColAutoPilot :  public VclAbstractDialog
@@ -264,10 +264,10 @@ public:
 class AbstractSwAutoFormatDlg : public VclAbstractDialog
 {
 public:
-    virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0;
+    virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const = 0;
 };
 
-class AbstractSwFldDlg : public SfxAbstractTabDialog
+class AbstractSwFieldDlg : public SfxAbstractTabDialog
 {
 public:
     virtual void                Start( bool bShow = true ) = 0;  //this method from sfxtabdialog
@@ -339,7 +339,7 @@ public:
     virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0;
     virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) = 0;
     virtual SfxAbstractTabDialog *  CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
+        sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) = 0;
     virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
     virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0;
 
@@ -369,11 +369,11 @@ public:
     virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0;
 
     virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
+    virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
 
     virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
-                                                            bool bSetAutoFmt = true,
-                                                            const SwTableAutoFmt* pSelFmt = 0 ) = 0;
+                                                            bool bSetAutoFormat = true,
+                                                            const SwTableAutoFormat* pSelFormat = 0 ) = 0;
     virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0;
     virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
 
@@ -381,21 +381,21 @@ public:
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
         const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
 
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
-    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
+    virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
+    virtual SfxAbstractDialog*   CreateSwFieldEditDlg ( SwView& rVw, int nResId ) = 0;
     virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
     virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
+    virtual VclAbstractDialog*          CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog(const OUString &rDialogType,
                                                 SfxViewFrame *pFrame, vcl::Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm = true,
-                                                bool bFmt = false,
+                                                bool bFormat = false,
                                                 const OString& sDefPage = OString(),
-                                                const OUString* pFmtStr = 0) = 0;
+                                                const OUString* pFormatStr = 0) = 0;
     /// @param nSlot
     /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
     /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
@@ -409,7 +409,7 @@ public:
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
                                                 SwWrtShell *pWrtShell) = 0;
-    virtual AbstractFldInputDlg*        CreateFldInputDlg(vcl::Window *pParent,
+    virtual AbstractFieldInputDlg*        CreateFieldInputDlg(vcl::Window *pParent,
         SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(vcl::Window * pParent,
         SwWrtShell &rSh, bool bEd = false) = 0;
@@ -421,7 +421,7 @@ public:
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 vcl::Window* pParent, SwWrtShell& rSh,
                                                  const OUString& rSourceName,
-                                                const OUString& rTblName,
+                                                const OUString& rTableName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 867f269e2d7a..160f858fabc3 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -57,45 +57,45 @@ class SvxCharReliefItem;
 class SvxCharHiddenItem;
 
 // Frame attributes
-class SwFmtFillOrder;
-class SwFmtFrmSize;
+class SwFormatFillOrder;
+class SwFormatFrmSize;
 class SvxPaperBinItem;
 class SvxLRSpaceItem;
 class SvxULSpaceItem;
-class SwFmtCntnt;
-class SwFmtHeader;
-class SwFmtFooter;
+class SwFormatContent;
+class SwFormatHeader;
+class SwFormatFooter;
 class SvxPrintItem;
 class SvxOpaqueItem;
 class SvxProtectItem;
-class SwFmtSurround;
-class SwFmtVertOrient;
-class SwFmtHoriOrient;
-class SwFmtAnchor;
+class SwFormatSurround;
+class SwFormatVertOrient;
+class SwFormatHoriOrient;
+class SwFormatAnchor;
 class SvxBoxItem;
 class SvxBrushItem;
 class XFillStyleItem;
 class XFillGradientItem;
 class SvxShadowItem;
-class SwFmtPageDesc;
-class SvxFmtBreakItem;
-class SwFmtCol;
+class SwFormatPageDesc;
+class SvxFormatBreakItem;
+class SwFormatCol;
 class SvxMacroItem;
-class SvxFmtKeepItem;
-class SwFmtURL;
-class SwFmtLineNumber;
-class SwFmtEditInReadonly;
-class SwFmtLayoutSplit;
-class SwFmtRowSplit;
-class SwFmtChain;
-class SwFmtFtnAtTxtEnd;
-class SwFmtEndAtTxtEnd;
-class SwFmtNoBalancedColumns;
+class SvxFormatKeepItem;
+class SwFormatURL;
+class SwFormatLineNumber;
+class SwFormatEditInReadonly;
+class SwFormatLayoutSplit;
+class SwFormatRowSplit;
+class SwFormatChain;
+class SwFormatFootnoteAtTextEnd;
+class SwFormatEndAtTextEnd;
+class SwFormatNoBalancedColumns;
 class SvxFrameDirectionItem;
 class SwTextGridItem;
 class SwHeaderAndFooterEatSpacingItem;
-class SwFmtFollowTextFlow;
-class SwFmtWrapInfluenceOnObjPos;
+class SwFormatFollowTextFlow;
+class SwFormatWrapInfluenceOnObjPos;
 class SdrTextVertAdjustItem;
 
 // Graphic attributes
@@ -115,14 +115,14 @@ class SwDrawModeGrf;
 // Paragraph attributes
 class SvxLineSpacingItem;
 class SvxAdjustItem;
-class SvxFmtSplitItem;
+class SvxFormatSplitItem;
 class SwRegisterItem;
 class SwNumRuleItem;
 class SvxWidowsItem;
 class SvxOrphansItem;
 class SvxTabStopItem;
 class SvxHyphenZoneItem;
-class SwFmtDrop;
+class SwFormatDrop;
 class SvxScriptSpaceItem;
 class SvxHangingPunctuationItem;
 class SvxForbiddenRuleItem;
@@ -131,9 +131,9 @@ class SvxParaGridItem;
 class SwParaConnectBorderItem;
 
 // TableBox attributes
-class SwTblBoxNumFormat;
-class SwTblBoxFormula;
-class SwTblBoxValue;
+class SwTableBoxNumFormat;
+class SwTableBoxFormula;
+class SwTableBoxValue;
 
 class SwAttrPool : public SfxItemPool
 {
@@ -206,10 +206,10 @@ public:
 
     // Special treatment for some attributes.
     // Set Modify-pointer (the old pDefinedIn) at the following attributes:
-    //  - SwFmtDropCaps
-    //  - SwFmtPageDesc
+    //  - SwFormatDropCaps
+    //  - SwFormatPageDesc
     // (Is called at insert in formats/nodes.)
-    // Second version is for the SwAttrSet handles of SwCntntNode.
+    // Second version is for the SwAttrSet handles of SwContentNode.
     bool SetModifyAtAttr( const SwModify* pModify );
 
     // Document is set at SwAttrPool. Therefore it is always accessible.
@@ -262,43 +262,43 @@ public:
     inline const SvxShadowItem      &GetCharShadow( bool = true ) const;
 
     // Frame attributes. Implementation in frmatr.hxx.
-    inline const SwFmtFillOrder       &GetFillOrder( bool = true ) const;
-    inline const SwFmtFrmSize             &GetFrmSize( bool = true ) const;
+    inline const SwFormatFillOrder       &GetFillOrder( bool = true ) const;
+    inline const SwFormatFrmSize             &GetFrmSize( bool = true ) const;
     inline const SvxPaperBinItem      &GetPaperBin( bool = true ) const;
     inline const SvxLRSpaceItem           &GetLRSpace( bool = true ) const;
     inline const SvxULSpaceItem           &GetULSpace( bool = true ) const;
-    inline const SwFmtCntnt           &GetCntnt( bool = true ) const;
-    inline const SwFmtHeader          &GetHeader( bool = true ) const;
-    inline const SwFmtFooter          &GetFooter( bool = true ) const;
+    inline const SwFormatContent           &GetContent( bool = true ) const;
+    inline const SwFormatHeader          &GetHeader( bool = true ) const;
+    inline const SwFormatFooter          &GetFooter( bool = true ) const;
     inline const SvxPrintItem             &GetPrint( bool = true ) const;
     inline const SvxOpaqueItem            &GetOpaque( bool = true ) const;
     inline const SvxProtectItem           &GetProtect( bool = true ) const;
-    inline const SwFmtSurround            &GetSurround( bool = true ) const;
-    inline const SwFmtVertOrient      &GetVertOrient( bool = true ) const;
-    inline const SwFmtHoriOrient      &GetHoriOrient( bool = true ) const;
-    inline const SwFmtAnchor          &GetAnchor( bool = true ) const;
+    inline const SwFormatSurround            &GetSurround( bool = true ) const;
+    inline const SwFormatVertOrient      &GetVertOrient( bool = true ) const;
+    inline const SwFormatHoriOrient      &GetHoriOrient( bool = true ) const;
+    inline const SwFormatAnchor          &GetAnchor( bool = true ) const;
     inline const SvxBoxItem               &GetBox( bool = true ) const;
-    inline const SvxFmtKeepItem         &GetKeep( bool = true ) const;
+    inline const SvxFormatKeepItem         &GetKeep( bool = true ) const;
     inline const SvxBrushItem           &GetBackground( bool = true ) const;
     inline const SvxShadowItem            &GetShadow( bool = true ) const;
-    inline const SwFmtPageDesc            &GetPageDesc( bool = true ) const;
-    inline const SvxFmtBreakItem      &GetBreak( bool = true ) const;
-    inline const SwFmtCol                 &GetCol( bool = true ) const;
+    inline const SwFormatPageDesc            &GetPageDesc( bool = true ) const;
+    inline const SvxFormatBreakItem      &GetBreak( bool = true ) const;
+    inline const SwFormatCol                 &GetCol( bool = true ) const;
     inline const SvxMacroItem             &GetMacro( bool = true ) const;
-    inline const SwFmtURL             &GetURL( bool = true ) const;
-    inline const SwFmtEditInReadonly  &GetEditInReadonly( bool = true ) const;
-    inline const SwFmtLayoutSplit     &GetLayoutSplit( bool = true ) const;
-    inline const SwFmtRowSplit          &GetRowSplit( bool = true ) const;
-    inline const SwFmtChain             &GetChain( bool = true ) const;
-    inline const SwFmtLineNumber      &GetLineNumber( bool = true ) const;
-    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( bool = true ) const;
-    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( bool = true ) const;
-    inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const;
+    inline const SwFormatURL             &GetURL( bool = true ) const;
+    inline const SwFormatEditInReadonly  &GetEditInReadonly( bool = true ) const;
+    inline const SwFormatLayoutSplit     &GetLayoutSplit( bool = true ) const;
+    inline const SwFormatRowSplit          &GetRowSplit( bool = true ) const;
+    inline const SwFormatChain             &GetChain( bool = true ) const;
+    inline const SwFormatLineNumber      &GetLineNumber( bool = true ) const;
+    inline const SwFormatFootnoteAtTextEnd     &GetFootnoteAtTextEnd( bool = true ) const;
+    inline const SwFormatEndAtTextEnd     &GetEndAtTextEnd( bool = true ) const;
+    inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
     inline const SvxFrameDirectionItem    &GetFrmDir( bool = true ) const;
     inline const SwTextGridItem         &GetTextGrid( bool = true ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
-    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(bool = true) const;
-    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+    inline const SwFormatFollowTextFlow    &GetFollowTextFlow(bool = true) const;
+    inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
     inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
 
     // Graphic attributes   - implementation in grfatr.hxx
@@ -318,14 +318,14 @@ public:
     // Paragraph attributes - implementation in paratr.hxx
     inline const SvxLineSpacingItem       &GetLineSpacing( bool = true ) const;
     inline const SvxAdjustItem            &GetAdjust( bool = true ) const;
-    inline const SvxFmtSplitItem      &GetSplit( bool = true ) const;
+    inline const SvxFormatSplitItem      &GetSplit( bool = true ) const;
     inline const SwRegisterItem           &GetRegister( bool = true ) const;
     inline const SwNumRuleItem            &GetNumRule( bool = true ) const;
     inline const SvxWidowsItem            &GetWidows( bool = true ) const;
     inline const SvxOrphansItem           &GetOrphans( bool = true ) const;
     inline const SvxTabStopItem           &GetTabStops( bool = true ) const;
     inline const SvxHyphenZoneItem        &GetHyphenZone( bool = true ) const;
-    inline const SwFmtDrop                &GetDrop( bool = true ) const;
+    inline const SwFormatDrop                &GetDrop( bool = true ) const;
     inline const SvxScriptSpaceItem       &GetScriptSpace(bool = true) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const;
     inline const SvxForbiddenRuleItem     &GetForbiddenRule(bool = true) const;
@@ -334,9 +334,9 @@ public:
     inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
 
     // Tablebox attributes  - implementation in cellatr.hxx
-    inline  const SwTblBoxNumFormat       &GetTblBoxNumFmt( bool = true ) const;
-    inline  const SwTblBoxFormula     &GetTblBoxFormula( bool = true ) const;
-    inline  const SwTblBoxValue           &GetTblBoxValue( bool = true ) const;
+    inline  const SwTableBoxNumFormat       &GetTableBoxNumFormat( bool = true ) const;
+    inline  const SwTableBoxFormula     &GetTableBoxFormula( bool = true ) const;
+    inline  const SwTableBoxValue           &GetTableBoxValue( bool = true ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet)
 };
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 8da7be7bd1bb..3a09b6c91b2b 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/lnkbase.hxx>
 
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class ReReadThread;
 long GrfNodeChanged( void* pLink, void* pCaller );
 
@@ -30,7 +30,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink
 {
     friend long GrfNodeChanged( void* pLink, void* pCaller );
 
-    SwCntntNode* pCntntNode;
+    SwContentNode* pContentNode;
     bool bSwapIn : 1;
     bool bNoDataFlag : 1;
     bool bIgnoreDataChanged : 1;
@@ -42,8 +42,8 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 )
-        : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
+    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
+        : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
         bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
         m_pReReadThread(0)
     {}
@@ -56,7 +56,7 @@ public:
 
     virtual const SwNode* GetAnchor() const;
 
-    SwCntntNode *GetCntntNode() { return pCntntNode; }
+    SwContentNode *GetContentNode() { return pContentNode; }
 
     // For graphics only.
     bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 5e3ea0a228b0..7e55f59a8cae 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -78,7 +78,7 @@ protected:
 
     const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; }
 
-    virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+    virtual const SwContentFrm* DoSetBidiLevelLeftRight(
         bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr);
     virtual void DoSetBidiLevelUpDown();
     virtual bool IsSelOvrCheck(int eFlags);
@@ -97,7 +97,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
 
     virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 );
 
     void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const;
     SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions,
@@ -109,11 +109,11 @@ public:
                 bool& bCancel,
                 FindRanges = FND_IN_BODY,
                 bool bReplace = false );
-    sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+    sal_uLong Find( const SwTextFormatColl& rFormatColl,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 bool& bCancel,
                 FindRanges = FND_IN_BODY,
-                const SwTxtFmtColl* pReplFmt = 0 );
+                const SwTextFormatColl* pReplFormat = 0 );
     sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 bool& bCancel,
@@ -172,14 +172,14 @@ public:
     bool GoNextCell( sal_uInt16 nCnt = 1 )  { return GoPrevNextCell( true, nCnt ); }
     bool GoPrevCell( sal_uInt16 nCnt = 1 )  { return GoPrevNextCell( false, nCnt ); }
     virtual bool GotoTable( const OUString& rName );
-    bool GotoTblBox( const OUString& rName );
+    bool GotoTableBox( const OUString& rName );
     bool GotoRegion( const OUString& rName );
-    bool GotoFtnAnchor();
-    bool GotoFtnTxt();
-    bool GotoNextFtnAnchor();
-    bool GotoPrevFtnAnchor();
-    bool GotoNextFtnCntnt();
-    bool GotoPrevFtnCntnt();
+    bool GotoFootnoteAnchor();
+    bool GotoFootnoteText();
+    bool GotoNextFootnoteAnchor();
+    bool GotoPrevFootnoteAnchor();
+    bool GotoNextFootnoteContent();
+    bool GotoPrevFootnoteContent();
 
     bool MovePara( SwWhichPara, SwPosPara );
     bool MoveSection( SwWhichSection, SwPosSection );
@@ -194,7 +194,7 @@ public:
                                   nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
     bool IsInProtectTable( bool bMove = false,
                                    bool bChgCrsr = true );
-    bool IsNoCntnt() const;
+    bool IsNoContent() const;
 
     /** Restore cursor state to the one saved by SwCrsrSaveState **/
     void RestoreSavePos();
@@ -240,12 +240,12 @@ public:
 struct _SwCursor_SavePos
 {
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
     _SwCursor_SavePos* pNext;
 
     _SwCursor_SavePos( const SwCursor& rCrsr )
         : nNode( rCrsr.GetPoint()->nNode.GetIndex() ),
-        nCntnt( rCrsr.GetPoint()->nContent.GetIndex() ),
+        nContent( rCrsr.GetPoint()->nContent.GetIndex() ),
         pNext( 0 )
     {}
     virtual ~_SwCursor_SavePos() {}
@@ -257,10 +257,10 @@ class SwTableCursor : public virtual SwCursor
 {
 
 protected:
-    sal_uLong m_nTblPtNd;
-    sal_uLong m_nTblMkNd;
-    sal_Int32 m_nTblPtCnt;
-    sal_Int32 m_nTblMkCnt;
+    sal_uLong m_nTablePtNd;
+    sal_uLong m_nTableMkNd;
+    sal_Int32 m_nTablePtCnt;
+    sal_Int32 m_nTableMkCnt;
     SwSelBoxes m_SelectedBoxes;
     bool m_bChanged : 1;
     bool m_bParked : 1;       // Table-cursor was parked.
@@ -276,7 +276,7 @@ public:
         bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE;
     virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE;
 
-    void InsertBox( const SwTableBox& rTblBox );
+    void InsertBox( const SwTableBox& rTableBox );
     void DeleteBox(size_t nPos);
     size_t GetSelectedBoxesCount() const { return m_SelectedBoxes.size(); }
     const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; }
@@ -287,14 +287,14 @@ public:
     bool HasReadOnlyBoxSel() const;
 
     // Has table cursor been changed? If so, save new values immediately.
-    bool IsCrsrMovedUpdt();
+    bool IsCrsrMovedUpdate();
     // Has table cursor been changed?
     bool IsCrsrMoved() const
     {
-        return  m_nTblMkNd != GetMark()->nNode.GetIndex() ||
-                m_nTblPtNd != GetPoint()->nNode.GetIndex() ||
-                m_nTblMkCnt != GetMark()->nContent.GetIndex() ||
-                m_nTblPtCnt != GetPoint()->nContent.GetIndex();
+        return  m_nTableMkNd != GetMark()->nNode.GetIndex() ||
+                m_nTablePtNd != GetPoint()->nNode.GetIndex() ||
+                m_nTableMkCnt != GetMark()->nContent.GetIndex() ||
+                m_nTablePtCnt != GetPoint()->nContent.GetIndex();
     }
 
     bool IsChgd() const { return m_bChanged; }
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 025fe81ce21c..ec76169e7309 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -38,16 +38,16 @@ public:
     void ChangeContent();
     bool  NoDDETable();
 
-    SwDDEFieldType* GetDDEFldType();
-    inline const SwDDEFieldType* GetDDEFldType() const;
+    SwDDEFieldType* GetDDEFieldType();
+    inline const SwDDEFieldType* GetDDEFieldType() const;
 protected:
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
 };
 
-inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const
+inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const
 {
-    return const_cast<SwDDETable*>(this)->GetDDEFldType();
+    return const_cast<SwDDETable*>(this)->GetDDEFieldType();
 }
 
 #endif
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 356c7bf56ba6..e2ca9302d2fd 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -51,8 +51,8 @@
 #define     STR_SW_EVENT_FRM_RESIZE           11
 #define     STR_SW_EVENT_FRM_MOVE             12
 
-class SwFrmFmt;
-class SwFmtINetFmt;
+class SwFrameFormat;
+class SwFormatINetFormat;
 class IMapObject;
 
 // Enum for objects that call events into Basic or JavaScript.
@@ -73,43 +73,43 @@ struct SwCallMouseEvent
     union
     {
         // EVENT_OBJECT_IMAGE/EVENT_OBJECT_URLITEM
-        const SwFrmFmt* pFmt;
+        const SwFrameFormat* pFormat;
 
         // EVENT_OBJECT_INETATTR
-        const SwFmtINetFmt* pINetAttr;
+        const SwFormatINetFormat* pINetAttr;
 
         // EVENT_OBJECT_IMAGEMAP
         struct
         {
-            const SwFrmFmt* pFmt;
+            const SwFrameFormat* pFormat;
             const IMapObject* pIMapObj;
         } IMAP;
     } PTR;
 
     SwCallMouseEvent()
         : eType( EVENT_OBJECT_NONE )
-        { PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+        { PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
 
-    void Set( SwCallEventObjectType eTyp, const SwFrmFmt* pFmt )
-        { eType = eTyp; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = 0; }
+    void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat )
+        { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 0; }
 
-    void Set( const SwFrmFmt* pFmt, const IMapObject* pIMapObj )
-        { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = pIMapObj; }
+    void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj )
+        { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = pIMapObj; }
 
-    void Set( const SwFmtINetFmt* pINetAttr )
+    void Set( const SwFormatINetFormat* pINetAttr )
         { eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = 0; }
 
     bool operator==( const SwCallMouseEvent& rEvent ) const
         {
             return eType == rEvent.eType &&
-                    PTR.pFmt == rEvent.PTR.pFmt &&
+                    PTR.pFormat == rEvent.PTR.pFormat &&
                     PTR.IMAP.pIMapObj == rEvent.PTR.IMAP.pIMapObj;
         }
     bool operator!=( const SwCallMouseEvent& rEvent ) const
         {   return !( *this == rEvent );    }
 
     void Clear()
-        { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+        { eType = EVENT_OBJECT_NONE; PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
 
     bool HasEvent() const { return EVENT_OBJECT_NONE != eType; }
 };
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 0b5504a57c3a..6c3dc36c738f 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -152,7 +152,7 @@ public:
                                      sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
     void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
     void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb );
-    void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
+    void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags);
     void ApplyLinkMode(sal_Int32 nNewLinkMode);
 
     // Default page mode for text grid.
@@ -184,9 +184,9 @@ public:
     static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
 
     // Table modi.
-    bool            IsInsTblFormatNum(bool bHTML) const;
-    bool            IsInsTblChangeNumFormat(bool bHTML) const;
-    bool            IsInsTblAlignNum(bool bHTML) const;
+    bool            IsInsTableFormatNum(bool bHTML) const;
+    bool            IsInsTableChangeNumFormat(bool bHTML) const;
+    bool            IsInsTableAlignNum(bool bHTML) const;
 
     // Redlining.
     sal_uInt16          GetRedlineAuthor();
@@ -214,7 +214,7 @@ public:
 
     // Pass update-statuses.
     sal_uInt16 GetLinkUpdMode( bool bWeb ) const;
-    SwFldUpdateFlags GetFldUpdateFlags( bool bWeb ) const;
+    SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const;
 
     // Virtual methods for options dialog.
     virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 2e2749fe0496..40fcfcb9801a 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -23,14 +23,14 @@
 #include <i18nlangtag/lang.h>
 #include <modeltoviewhelper.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 
 // Helper class that provides consecutively the words of a selected area
 // during spell check
 class SwScanner
 {
     OUString aWord;
-    const SwTxtNode& rNode;
+    const SwTextNode& rNode;
     const OUString aPreDashReplacementText;
     OUString aText;
     const LanguageType* pLanguage;
@@ -45,7 +45,7 @@ class SwScanner
     bool bClip;
 
 public:
-    SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
+    SwScanner( const SwTextNode& rNd, const OUString& rText,
                const LanguageType* pLang,
                const ModelToViewHelper& rConvMap,
                sal_uInt16 nWordType,
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 3da7b1a28df4..053912718280 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -36,7 +36,7 @@ protected:
     enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType;
     union {
         ::sw::mark::IMark* pBkmk;
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSectionNode* pSectNd;
     } CNTNT_TYPE;
 
@@ -51,7 +51,7 @@ public:
     SwServerObject( SwTableNode& rTableNd )
         : eType( TABLE_SERVER )
     {
-        CNTNT_TYPE.pTblNd = &rTableNd;
+        CNTNT_TYPE.pTableNd = &rTableNd;
     }
     SwServerObject( SwSectionNode& rSectNd )
         : eType( SECTION_SERVER )
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 088c01b82703..f3197b567a9d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -33,12 +33,12 @@
 #include <o3tl/sorted_vector.hxx>
 
 class SwStartNode;
-class SwFmt;
+class SwFormat;
 class Color;
-class SwFrmFmt;
-class SwTableFmt;
-class SwTableLineFmt;
-class SwTableBoxFmt;
+class SwFrameFormat;
+class SwTableFormat;
+class SwTableLineFormat;
+class SwTableBoxFormat;
 class SwHTMLTableLayout;
 class SwTableLine;
 class SwTableBox;
@@ -46,22 +46,22 @@ class SwTableNode;
 class SwTabCols;
 class SwDoc;
 class SwSelBoxes;
-class SwTblCalcPara;
+class SwTableCalcPara;
 struct SwPosition;
 class SwNodeIndex;
 class SwNode;
 class SfxPoolItem;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
 class SwUndo;
 class SwPaM;
 class SwTableBox_Impl;
-class SwUndoTblCpyTbl;
+class SwUndoTableCpyTable;
 class SwBoxSelection;
 struct SwSaveRowSpan;
 struct Parm;
 class SwServerObject;
 
-void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
+void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm );
 
 class SwTableLines : public std::vector<SwTableLine*> {
 public:
@@ -91,7 +91,7 @@ public:
 class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {};
 
 /// SwTable is one table in the document model, containing rows (which contain cells).
-class SW_DLLPUBLIC SwTable: public SwClient          //Client of FrmFmt.
+class SW_DLLPUBLIC SwTable: public SwClient          //Client of FrameFormat.
 {
 
 protected:
@@ -108,7 +108,7 @@ protected:
     SwTableNode* pTableNode;
 
     // Should that be adjustable for every table?
-    TblChgMode  eTblChgMode;
+    TableChgMode  eTableChgMode;
 
     sal_uInt16      nGrfsThatResize;    // Count of Grfs that initiate a resize of table
                                         // at HTML-import.
@@ -136,7 +136,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     // single argument ctors shall be explicit.
-    explicit SwTable( SwTableFmt* );
+    explicit SwTable( SwTableFormat* );
     virtual ~SwTable();
 
     // @@@ public copy ctor, but no copy assignment?
@@ -146,10 +146,10 @@ private:
     SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
     // no default ctor.
     SwTable();
-    bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
+    bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* );
     bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
-                   SwTableBox*, SwUndoTblMerge* );
+                   SwTableBox*, SwUndoTableMerge* );
     bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
     void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt );
@@ -184,8 +184,8 @@ public:
           SwTableLines &GetTabLines() { return aLines; }
     const SwTableLines &GetTabLines() const { return aLines; }
 
-    SwTableFmt* GetFrmFmt()       { return static_cast<SwTableFmt*>(GetRegisteredIn()); }
-    SwTableFmt* GetFrmFmt() const { return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(GetRegisteredIn())); }
+    SwTableFormat* GetFrameFormat()       { return static_cast<SwTableFormat*>(GetRegisteredIn()); }
+    SwTableFormat* GetFrameFormat() const { return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(GetRegisteredIn())); }
 
     void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
                      bool bHidden = false, bool bCurRowOnly = false ) const;
@@ -213,7 +213,7 @@ public:
 // It's not allowed to change the table model after the first call of one of these functions.
 
     bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
-                SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
+                SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = 0 )
     {
 #ifdef DBG_UTIL
         m_bDontChangeModel = true;
@@ -231,7 +231,7 @@ public:
                            OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight );
     }
     bool PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
-        SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo );
+        SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo );
     void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const;
     void PrepareDeleteCol( long nMin, long nMax );
 
@@ -244,7 +244,7 @@ public:
         SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
     bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
     bool Merge( const SwSelBoxes& rBoxes,
-                SwTableBox* pMergeBox, SwUndoTblMerge* = 0 );
+                SwTableBox* pMergeBox, SwUndoTableMerge* = 0 );
 
     void FindSuperfluousRows( SwSelBoxes& rBoxes )
         { _FindSuperfluousRows( rBoxes, 0, 0 ); }
@@ -253,7 +253,7 @@ public:
           SwTableSortBoxes& GetTabSortBoxes()       { return m_TabSortContentBoxes; }
     const SwTableSortBoxes& GetTabSortBoxes() const { return m_TabSortContentBoxes; }
 
-    // Read 1st number and delete it from string (used by GetTblBox and SwTblFld).
+    // Read 1st number and delete it from string (used by GetTableBox and SwTableField).
 
     // #i80314#
     // add 3rd parameter in order to control validation check on <rStr>
@@ -266,31 +266,31 @@ public:
     // #i80314#
     // add 2nd parameter in order to control validation check in called method
     // <_GetBoxNum(..)>
-    const SwTableBox* GetTblBox( const OUString& rName,
+    const SwTableBox* GetTableBox( const OUString& rName,
                                  const bool bPerformValidCheck = false ) const;
     // Copy selected boxes to another document.
     bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
                     bool bCpyNds = true, bool bCpyName = false ) const;
     // Copy table in this
-    bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&,
-                    SwUndoTblCpyTbl* pUndo = 0 );
-    bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&,
-                    SwUndoTblCpyTbl* pUndo = 0 );
-    bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&,
-                      SwUndoTblCpyTbl* pUndo );
+    bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&,
+                    SwUndoTableCpyTable* pUndo = 0 );
+    bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&,
+                    SwUndoTableCpyTable* pUndo = 0 );
+    bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&,
+                      SwUndoTableCpyTable* pUndo );
     // Copy headline of table (with content!) into an other one.
-    bool CopyHeadlineIntoTable( SwTableNode& rTblNd );
+    bool CopyHeadlineIntoTable( SwTableNode& rTableNd );
 
     // Get box, whose start index is set on nBoxStt.
-          SwTableBox* GetTblBox( sal_uLong nSttIdx );
-    const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
-                        {   return const_cast<SwTable*>(this)->GetTblBox( nSttIdx );  }
+          SwTableBox* GetTableBox( sal_uLong nSttIdx );
+    const SwTableBox* GetTableBox( sal_uLong nSttIdx ) const
+                        {   return const_cast<SwTable*>(this)->GetTableBox( nSttIdx );  }
 
     // Returns true if table contains nestings.
-    bool IsTblComplex() const;
+    bool IsTableComplex() const;
 
     // Returns true if table or selection is balanced.
-    bool IsTblComplexForChart( const OUString& rSel ) const;
+    bool IsTableComplexForChart( const OUString& rSel ) const;
 
     // Search all content-bearing boxes of the base line on which this box stands.
     // rBoxes as a return value for immediate use.
@@ -303,7 +303,7 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     // Search in format for registered table.
-    static SwTable * FindTable( SwFrmFmt const*const pFmt );
+    static SwTable * FindTable( SwFrameFormat const*const pFormat );
 
     // Clean up structure a bit.
     void GCLines();
@@ -320,14 +320,14 @@ public:
     // Fill data for chart.
     void UpdateCharts() const;
 
-    TblChgMode GetTblChgMode() const        { return eTblChgMode; }
-    void SetTblChgMode( TblChgMode eMode )  { eTblChgMode = eMode; }
+    TableChgMode GetTableChgMode() const        { return eTableChgMode; }
+    void SetTableChgMode( TableChgMode eMode )  { eTableChgMode = eMode; }
 
     bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
     bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
 #ifdef DBG_UTIL
     void CheckConsistency() const;
 #endif
@@ -336,7 +336,7 @@ public:
 };
 
 /// SwTableLine is one table row in the document model.
-class SW_DLLPUBLIC SwTableLine: public SwClient     // Client of FrmFmt.
+class SW_DLLPUBLIC SwTableLine: public SwClient     // Client of FrameFormat.
 {
     SwTableBoxes aBoxes;
     SwTableBox *pUpper;
@@ -346,7 +346,7 @@ public:
 
     SwTableLine() : pUpper(0) {}
 
-    SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp );
+    SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp );
     virtual ~SwTableLine();
 
           SwTableBoxes &GetTabBoxes() { return aBoxes; }
@@ -356,27 +356,27 @@ public:
     const SwTableBox *GetUpper() const { return pUpper; }
     void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
 
-    SwFrmFmt* GetFrmFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
-    // Creates a own FrmFmt if more lines depend on it.
-    SwFrmFmt* ClaimFrmFmt();
-    void ChgFrmFmt( SwTableLineFmt* pNewFmt );
+    // Creates a own FrameFormat if more lines depend on it.
+    SwFrameFormat* ClaimFrameFormat();
+    void ChgFrameFormat( SwTableLineFormat* pNewFormat );
 
     // Search next/previous box with content.
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
 
     SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const;
 
     bool hasSoftPageBreak() const;
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
 };
 
 /// SwTableBox is one table cell in the document model.
-class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
+class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrameFormat.
 {
     friend class SwNodes;           // Transpose index.
     friend void DelBoxNode(SwTableSortBoxes&);  // Delete StartNode* !
@@ -392,16 +392,16 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
 
     // In case Format contains formulas/values already,
     // a new one must be created for the new box.
-    static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* );
+    static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* );
 
 public:
     TYPEINFO_OVERRIDE();
 
     SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {}
 
-    SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
-    SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 );
-    SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 );
     virtual ~SwTableBox();
 
           SwTableLines &GetTabLines() { return aLines; }
@@ -411,12 +411,12 @@ public:
     const SwTableLine *GetUpper() const { return pUpper; }
     void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
 
-    SwFrmFmt* GetFrmFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
-    // Creates its own FrmFmt if more boxes depend on it.
-    SwFrmFmt* ClaimFrmFmt();
-    void ChgFrmFmt( SwTableBoxFmt *pNewFmt );
+    // Creates its own FrameFormat if more boxes depend on it.
+    SwFrameFormat* ClaimFrameFormat();
+    void ChgFrameFormat( SwTableBoxFormat *pNewFormat );
 
     void RemoveFromTable();
     const SwStartNode *GetSttNd() const { return pSttNd; }
@@ -424,25 +424,25 @@ public:
 
     // Search next/previous box with content.
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     // Return name of this box. It is determined dynamically and
     // is calculated from the position in the lines/boxes/table.
     OUString GetName() const;
     // Return "value" of box (for calculating in table).
-    double GetValue( SwTblCalcPara& rPara ) const;
+    double GetValue( SwTableCalcPara& rPara ) const;
 
     // Computes "coordinates" of a box, used to computed selection
     // width or height when inserting cols or rows
     Point GetCoordinates() const;
 
-    bool IsInHeadline( const SwTable* pTbl = 0 ) const;
+    bool IsInHeadline( const SwTable* pTable = 0 ) const;
 
     // Contains box contents, that can be formatted as a number?
-    bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
-                    bool& rIsEmptyTxtNd ) const;
-    sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const;
+    bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
+                    bool& rIsEmptyTextNd ) const;
+    sal_uLong IsValidNumTextNd( bool bCheckAttr = true ) const;
     // If a table formula is set, test if box contents is congruent with number.
     // (For Redo of change of NumFormat!).
     bool IsNumberChanged() const;
@@ -459,9 +459,9 @@ public:
 
     // Access on internal data - currently used for the NumFormatter.
     inline const Color* GetSaveUserColor()  const;
-    inline const Color* GetSaveNumFmtColor() const;
+    inline const Color* GetSaveNumFormatColor() const;
     inline void SetSaveUserColor(const Color* p );
-    inline void SetSaveNumFmtColor( const Color* p );
+    inline void SetSaveNumFormatColor( const Color* p );
 
     long getRowSpan() const;
     void setRowSpan( long nNewRowSpan );
@@ -477,7 +477,7 @@ public:
     const SwTableBox& FindEndOfRowSpan( const SwTable& rTable,
         sal_uInt16 nMaxStep = USHRT_MAX ) const
         { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); }
-    void RegisterToFormat( SwFmt& rFmt ) ;
+    void RegisterToFormat( SwFormat& rFormat ) ;
 };
 
 class SwCellFrm;
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 181bf23b67b0..336bb39a0193 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -23,62 +23,62 @@
 
 class SwDoc;
 
-class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+    SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
     {}
-    SwTableFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+    SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
     {}
 
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
-class SwTableLineFmt : public SwFrmFmt
+class SwTableLineFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+    SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
     {}
-    SwTableLineFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+    SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
     {}
 
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+    SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
     {}
-    SwTableBoxFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+    SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
     {}
 
    // For recognition of changes (especially TableBoxAttribute).
@@ -87,7 +87,7 @@ protected:
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b5107323d63f..b724fbdc3313 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -130,7 +130,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
 #define INIT_SEQ_FLDTYPES   4
 
 // The former Rendevouz-IDs live on:
-// There are IDs for the anchors (SwFmtAnchor) and some others
+// There are IDs for the anchors (SwFormatAnchor) and some others
 // that are only of importance for interfaces (SwDoc).
 enum RndStdIds
 {
@@ -257,7 +257,7 @@ enum PrepareHint
                             // (Check for Fly-break). In void* of Prepare()
                             // a sal_Bool& is passed. If this is sal_True,
                             // it indicateds that a format has been executed.
-    PREP_UL_SPACE,          // UL-Space has changed, TxtFrms have to
+    PREP_UL_SPACE,          // UL-Space has changed, TextFrms have to
                             // re-calculate line space.
     PREP_MUST_FIT,          // Make frm fit (split) even if the attributes do
                             // not allow that (e.g. "keep together").
@@ -269,7 +269,7 @@ enum PrepareHint
                             // order to format the text into it.
     PREP_BOSS_CHGD,         // If a Frm changes its column/page this additional
                             // Prepare is sended to POS_CHGD in MoveFwd/Bwd
-                            // (join Ftn-numbers etc.)
+                            // (join Footnote-numbers etc.)
                             // Direction is communicated via pVoid:
                             //     MoveFwd: pVoid == 0
                             //     MoveBwd: pVoid == pOldPage
@@ -279,7 +279,7 @@ enum PrepareHint
     PREP_MOVEFTN,           // A footnote changes its page. Its contents receives at first a
                             // height of zero in order to avoid too much noise. At formatting
                             // it checks whether it fits and if necessary changes its page again.
-    PREP_ERGOSUM,           // Needed because of movement in FtnFrms. Check QuoVadis/ErgoSum.
+    PREP_ERGOSUM,           // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum.
     PREP_END                // END.
 };
 
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 8c96abafcc87..8f51b2287392 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -62,7 +62,7 @@ struct SwAfVersions;
 
 class SvNumberFormatter;
 
-class SwBoxAutoFmt
+class SwBoxAutoFormat
 {
     // common attributes of Calc and Writer
     // --- from 641 on: CJK and CTL font settings
@@ -95,7 +95,7 @@ class SwBoxAutoFmt
     // Writer specific
     SvxAdjustItem       aAdjust;
     SvxFrameDirectionItem m_aTextOrientation;
-    SwFmtVertOrient m_aVerticalAlignment;
+    SwFormatVertOrient m_aVerticalAlignment;
 
     // Calc specific
     SvxHorJustifyItem   aHorJustify;
@@ -107,16 +107,16 @@ class SwBoxAutoFmt
     SvxRotateModeItem   aRotateMode;
 
     // number format
-    OUString            sNumFmtString;
-    LanguageType        eSysLanguage, eNumFmtLanguage;
+    OUString            sNumFormatString;
+    LanguageType        eSysLanguage, eNumFormatLanguage;
 
 public:
-    SwBoxAutoFmt();
-    SwBoxAutoFmt( const SwBoxAutoFmt& rNew );
-    ~SwBoxAutoFmt();
+    SwBoxAutoFormat();
+    SwBoxAutoFormat( const SwBoxAutoFormat& rNew );
+    ~SwBoxAutoFormat();
 
-    int operator==( const SwBoxAutoFmt& rCmp ) const;
-    SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew );
+    int operator==( const SwBoxAutoFormat& rCmp ) const;
+    SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew );
 
     // The get-methods.
     const SvxFontItem       &GetFont() const        { return aFont; }
@@ -139,13 +139,13 @@ public:
     const SvxColorItem      &GetColor() const       { return aColor; }
     const SvxAdjustItem     &GetAdjust() const      { return aAdjust; }
     const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; }
-    const SwFmtVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
+    const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
     const SvxBoxItem        &GetBox() const         { return aBox; }
     const SvxLineItem       &GetTLBR() const        { return aTLBR; }
     const SvxLineItem       &GetBLTR() const        { return aBLTR; }
     const SvxBrushItem      &GetBackground() const  { return aBackground; }
-    void GetValueFormat( OUString& rFmt, LanguageType& rLng, LanguageType& rSys ) const
-        { rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
+    void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const
+        { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; }
 
     // The set-methods.
     void SetFont( const SvxFontItem& rNew )             { aFont = rNew; }
@@ -173,11 +173,11 @@ public:
             aAdjust.SetLastBlock( rNew.GetLastBlock() );
         }
     void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; }
-    void SetVerticalAlignment(const SwFmtVertOrient& rNew) { m_aVerticalAlignment = rNew; }
+    void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; }
     void SetBox( const SvxBoxItem& rNew )               { aBox = rNew; }
     void SetBackground( const SvxBrushItem& rNew )      { aBackground = rNew; }
-    void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys )
-        { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; }
+    void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys )
+        { sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; }
 
     bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer );
     bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
@@ -228,10 +228,10 @@ The properties saved are divided into three categories:
 Character and box properties are stored per cell (and are lossy for tables larger than 4x4). Table
 properties are stored per-table, and are lossless.
 */
-class SW_DLLPUBLIC SwTableAutoFmt
+class SW_DLLPUBLIC SwTableAutoFormat
 {
     friend void _FinitCore();       // To destroy default pointer.
-    static SwBoxAutoFmt* pDfltBoxAutoFmt;
+    static SwBoxAutoFormat* pDfltBoxAutoFormat;
 
     OUString m_aName;
     sal_uInt16 nStrResId;
@@ -246,12 +246,12 @@ class SW_DLLPUBLIC SwTableAutoFmt
     // Calc specific flags.
     bool bInclWidthHeight : 1;
 
-    SwBoxAutoFmt* aBoxAutoFmt[ 16 ];
+    SwBoxAutoFormat* aBoxAutoFormat[ 16 ];
 
     // Writer-specific options
-    SvxFmtBreakItem m_aBreak;
-    SwFmtPageDesc m_aPageDesc;
-    SvxFmtKeepItem m_aKeepWithNextPara;
+    SvxFormatBreakItem m_aBreak;
+    SwFormatPageDesc m_aPageDesc;
+    SvxFormatKeepItem m_aKeepWithNextPara;
     sal_uInt16 m_aRepeatHeading;
     bool m_bLayoutSplit;
     bool m_bRowSplit;
@@ -259,14 +259,14 @@ class SW_DLLPUBLIC SwTableAutoFmt
     SvxShadowItem m_aShadow;
 
 public:
-    SwTableAutoFmt( const OUString& rName );
-    SwTableAutoFmt( const SwTableAutoFmt& rNew );
-    ~SwTableAutoFmt();
+    SwTableAutoFormat( const OUString& rName );
+    SwTableAutoFormat( const SwTableAutoFormat& rNew );
+    ~SwTableAutoFormat();
 
-    SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew );
+    SwTableAutoFormat& operator=( const SwTableAutoFormat& rNew );
 
-    void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos );
-    const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const;
+    void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos );
+    const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const;
 
     void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = USHRT_MAX; }
     OUString GetName() const { return m_aName; }
@@ -297,7 +297,7 @@ public:
     bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
 };
 
-class SW_DLLPUBLIC SwTableAutoFmtTbl
+class SW_DLLPUBLIC SwTableAutoFormatTable
 {
     struct Impl;
     ::boost::scoped_ptr<Impl> m_pImpl;
@@ -306,15 +306,15 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
     SAL_DLLPRIVATE bool Save( SvStream& rStream ) const;
 
 public:
-    explicit SwTableAutoFmtTbl();
-    ~SwTableAutoFmtTbl();
+    explicit SwTableAutoFormatTable();
+    ~SwTableAutoFormatTable();
 
     size_t size() const;
-    SwTableAutoFmt const& operator[](size_t i) const;
-    SwTableAutoFmt      & operator[](size_t i);
-    void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
-    void EraseAutoFmt(size_t i);
-    SwTableAutoFmt* ReleaseAutoFmt(size_t i);
+    SwTableAutoFormat const& operator[](size_t i) const;
+    SwTableAutoFormat      & operator[](size_t i);
+    void InsertAutoFormat(size_t i, SwTableAutoFormat * pFormat);
+    void EraseAutoFormat(size_t i);
+    SwTableAutoFormat* ReleaseAutoFormat(size_t i);
 
     bool Load();
     bool Save() const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index e99713af88f4..0fef6bb66504 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -20,35 +20,35 @@
 #define INCLUDED_SW_INC_TBLENUM_HXX
 
 // For changing table columns/rows widths/heights.
-typedef sal_uInt16 TblChgWidthHeightType;
+typedef sal_uInt16 TableChgWidthHeightType;
 
-namespace nsTblChgWidthHeightType
+namespace nsTableChgWidthHeightType
 {
-    const TblChgWidthHeightType WH_COL_LEFT = 0;
-    const TblChgWidthHeightType WH_COL_RIGHT = 1;
-    const TblChgWidthHeightType WH_ROW_TOP = 2;
-    const TblChgWidthHeightType WH_ROW_BOTTOM = 3;
-    const TblChgWidthHeightType WH_CELL_LEFT = 4;
-    const TblChgWidthHeightType WH_CELL_RIGHT = 5;
-    const TblChgWidthHeightType WH_CELL_TOP = 6;
-    const TblChgWidthHeightType WH_CELL_BOTTOM = 7;
+    const TableChgWidthHeightType WH_COL_LEFT = 0;
+    const TableChgWidthHeightType WH_COL_RIGHT = 1;
+    const TableChgWidthHeightType WH_ROW_TOP = 2;
+    const TableChgWidthHeightType WH_ROW_BOTTOM = 3;
+    const TableChgWidthHeightType WH_CELL_LEFT = 4;
+    const TableChgWidthHeightType WH_CELL_RIGHT = 5;
+    const TableChgWidthHeightType WH_CELL_TOP = 6;
+    const TableChgWidthHeightType WH_CELL_BOTTOM = 7;
 
     // The following can "or"ed into.
-    const TblChgWidthHeightType WH_FLAG_INSDEL  = 0x4000;           // Insert/Del-mode: the Bigger-Flag
+    const TableChgWidthHeightType WH_FLAG_INSDEL  = 0x4000;           // Insert/Del-mode: the Bigger-Flag
                                                                     // tells what happens:
                                                                     // bBigger -> box gets removed.
                                                                     // !bBigger-> box gets inserted.
-    const TblChgWidthHeightType WH_FLAG_BIGGER  = 0x8000;           // Box becomes larger -> else smaller.
+    const TableChgWidthHeightType WH_FLAG_BIGGER  = 0x8000;           // Box becomes larger -> else smaller.
 }
 
-enum TblChgMode
+enum TableChgMode
 {
     TBLFIX_CHGABS,          // Table fixed width, change neighbour.
     TBLFIX_CHGPROP,         // Table fixed width, change all neighbours.
     TBLVAR_CHGABS           // Table variable, change all neighbours.
 };
 
-enum SplitTbl_HeadlineOption
+enum SplitTable_HeadlineOption
 {
     HEADLINE_NONE = 0,          // Leave everything in place.
     HEADLINE_BORDERCOPY,        // Copy border of the previous line.
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 10d237ea62eb..aa1001607b8f 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -38,7 +38,7 @@ class SwLayoutFrm;
 class SwPaM;
 class SwNode;
 class SwTable;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
 class SwCellFrm;
 
 typedef ::std::deque< SwCellFrm* > SwCellFrms;
@@ -56,32 +56,32 @@ class SwSelBoxes : public o3tl::sorted_vector<SwTableBox*, CompareSwSelBoxes> {}
 // Selection gets extended in given direction according to enum-parameter.
 // Boxes are collected via the Layout; works correctly if tables are split.
 // (Cf. MakeSelUnions().)
-typedef sal_uInt16 SwTblSearchType;
-namespace nsSwTblSearchType
+typedef sal_uInt16 SwTableSearchType;
+namespace nsSwTableSearchType
 {
-    const SwTblSearchType TBLSEARCH_NONE = 0x1;       // No extension.
-    const SwTblSearchType TBLSEARCH_ROW  = 0x2;       // Extend to rows.
-    const SwTblSearchType TBLSEARCH_COL  = 0x3;       // Extend to columns.
+    const SwTableSearchType TBLSEARCH_NONE = 0x1;       // No extension.
+    const SwTableSearchType TBLSEARCH_ROW  = 0x2;       // Extend to rows.
+    const SwTableSearchType TBLSEARCH_COL  = 0x3;       // Extend to columns.
 
     // As flag to the other values!
-    const SwTblSearchType TBLSEARCH_PROTECT = 0x8;      // Collect protected boxes too.
-    const SwTblSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
+    const SwTableSearchType TBLSEARCH_PROTECT = 0x8;      // Collect protected boxes too.
+    const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
 }
 
-SW_DLLPUBLIC void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
-void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // As before, but don't start from selection but from Start- EndFrms.
-void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
+void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                 SwSelBoxes& rBoxes, SwCellFrms* pCells,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // As before but directly via PaMs.
-void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
-void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes );
 
 // Collect boxes relevant for auto sum.
 bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
@@ -93,16 +93,16 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes );
 bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd);
 
 // Check if cell is part of SSelection.
-// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr()
+// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr()
 // have always the same concept of the selection.
-bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell );
+bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell );
 
 // Determine boxes to be merged.
 // In this process the rectangle gets "adapted" on the base of the layout,
 // i.e. boxes are added if some overlap at the sides.
 // Additionally a new box is created and filled with the relevant content.
 void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
-                  SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 );
+                  SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = 0 );
 
 // Check if selected boxes allow for a valid merge.
 sal_uInt16 CheckMergeSel( const SwPaM& rPam );
@@ -112,9 +112,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
 
 // Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
 bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
-                        const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                        const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
-                        const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                        const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // For working on tab selection also for split tables.
 class SwSelUnion
@@ -138,11 +138,11 @@ typedef boost::ptr_vector<SwSelUnion> SwSelUnions;
 
 // Gets the tables involved in a table selection and the union-rectangles of the selections
 // - also for split tables.
-// If a parameter is passed that != nsSwTblSearchType::TBLSEARCH_NONE
+// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE
 // the selection is extended in the given direction.
 void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart,
                     const SwLayoutFrm *pEnd,
-                    const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                    const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // These classes copy the current table selections (rBoxes) into a
 // separate structure while keeping the table structure.
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 89802c3d41f2..f4fb97a3dc6d 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -24,9 +24,9 @@
 class SdrPage;
 class SdrObject;
 class SfxItemSet;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFmtCntnt;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFormatContent;
 class SwDoc;
 class Rectangle;
 class _ZSortFly;
@@ -42,58 +42,58 @@ class SW_DLLPUBLIC SwTextBoxHelper
 {
 public:
     /// Maps a draw format to a fly format.
-    typedef std::map<const SwFrmFmt*, const SwFrmFmt*> SavedLink;
+    typedef std::map<const SwFrameFormat*, const SwFrameFormat*> SavedLink;
     /// Maps a draw format to content.
-    typedef std::map<const SwFrmFmt*, SwFmtCntnt> SavedContent;
+    typedef std::map<const SwFrameFormat*, SwFormatContent> SavedContent;
     /// Create a TextBox for a shape.
-    static void create(SwFrmFmt* pShape);
+    static void create(SwFrameFormat* pShape);
     /// Destroy a TextBox for a shape.
-    static void destroy(SwFrmFmt* pShape);
+    static void destroy(SwFrameFormat* pShape);
     /// Get interface of a shape's TextBox, if there is any.
-    static css::uno::Any queryInterface(SwFrmFmt* pShape, const css::uno::Type& rType);
+    static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType);
 
     /// Sync property of TextBox with the one of the shape.
-    static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
     /// Does the same, but works on properties which lack an sw-specific WID / MemberID.
-    static void syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
     /// Get a property of the underlying TextFrame.
-    static void getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
+    static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
 
     /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes).
-    static void syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet);
+    static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
 
     /// If we have an associated TextFrame, then return that.
-    static SwFrmFmt* findTextBox(const SwFrmFmt* pShape);
-    static SwFrmFmt* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
+    static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
+    static SwFrameFormat* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
     /// Return the textbox rectangle of a draw shape (in twips).
-    static Rectangle getTextRectangle(SwFrmFmt* pShape, bool bAbsolute = true);
+    static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
 
     /// Look up TextFrames in a document, which are in fact TextBoxes.
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwDoc* pDoc);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwDoc* pDoc);
     /**
      * Look up TextFrames in a document, which are in fact TextBoxes.
      *
-     * If rNode has a matching SwCntntFrm, then only TextBoxes of rNode are
+     * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are
      * returned.
      */
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwNode& rNode);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode);
     /// Is pObject a textbox of a drawinglayer shape?
     static bool isTextBox(const SdrObject* pObject);
     /// Build a textbox -> shape format map.
-    static std::map<SwFrmFmt*, SwFrmFmt*> findShapes(const SwDoc* pDoc);
+    static std::map<SwFrameFormat*, SwFrameFormat*> findShapes(const SwDoc* pDoc);
     /// Count number of shapes in the document, excluding TextBoxes.
-    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes);
     /// Get a shape by index, excluding TextBoxes.
-    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
+    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
     /// Get the order of the shape, excluding TextBoxes.
-    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes);
 
     /// Saves the current shape -> textbox links in a map, so they can be restored later.
-    static void saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks);
+    static void saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks);
     /// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later.
-    static void resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rOldContent);
+    static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent);
     /// Undo the effect of saveLinks() + individual resetLink() calls.
-    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
+    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
 };
 
 #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 8e67ce5b032f..de112998501d 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -108,7 +108,7 @@ public:
 
 inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const
     {   return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); }
-inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const
+inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const
     {   return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); }
 
 #endif
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 6e394742b0bb..1b75da2d9472 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
 
 class SwTOXType;
 class SwTOXMark;
-class SwTxtTOXMark;
+class SwTextTOXMark;
 class SwDoc;
 
 typedef std::vector<SwTOXMark*> SwTOXMarks;
@@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwTOXMark
     , public SwModify
 {
     friend void _InitCore();
-    friend class SwTxtTOXMark;
+    friend class SwTextTOXMark;
 
     OUString aAltText;    // Text of caption is different.
     OUString aPrimaryKey;
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwTOXMark
     OUString aPrimaryKeyReading;
     OUString aSecondaryKeyReading;
 
-    SwTxtTOXMark* pTxtAttr;
+    SwTextTOXMark* pTextAttr;
 
     sal_uInt16  nLevel;
     OUString    m_aBookmarkName;
@@ -137,8 +137,8 @@ public:
 
     inline const SwTOXType*    GetTOXType() const;
 
-    const SwTxtTOXMark* GetTxtTOXMark() const   { return pTxtAttr; }
-          SwTxtTOXMark* GetTxtTOXMark()         { return pTxtAttr; }
+    const SwTextTOXMark* GetTextTOXMark() const   { return pTextAttr; }
+          SwTextTOXMark* GetTextTOXMark()         { return pTextAttr; }
 
     SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
@@ -332,7 +332,7 @@ public:
     static OUString GetFormLinkStt();
     static OUString GetFormLinkEnd();
     static OUString GetFormEntryNum();
-    static OUString GetFormEntryTxt();
+    static OUString GetFormEntryText();
     static OUString GetFormChapterMark();
     static OUString GetFormText();
     static OUString GetFormAuth();
@@ -585,10 +585,10 @@ inline void SwTOXMark::SetSecondaryKey( const OUString& rKey )
     aSecondaryKey = rKey;
 }
 
-inline void SwTOXMark::SetTextReading( const OUString& rTxt )
+inline void SwTOXMark::SetTextReading( const OUString& rText )
 {
     SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
-    aTextReading = rTxt;
+    aTextReading = rText;
 }
 
 inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey )
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index d1588022cc15..b83e34906146 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -45,7 +45,7 @@ public:
 
     void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; }
 
-    OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading,
+    OUString GetIndexKey( const OUString& rText, const OUString& rTextReading,
                         const ::com::sun::star::lang::Locale& rLocale ) const;
 
     OUString GetFollowingText( bool bMorePages ) const;
@@ -56,9 +56,9 @@ public:
     bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
                             const OUString& sSortAlgorithm, long nOptions ) const;
 
-    sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1,
+    sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1,
                                  const ::com::sun::star::lang::Locale& rLcl1,
-                                 const OUString& rTxt2, const OUString& rTxtReading2,
+                                 const OUString& rText2, const OUString& rTextReading2,
                                  const ::com::sun::star::lang::Locale& rLcl2 ) const;
 };
 
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index d8ccb02eded6..f1f70b431555 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -38,7 +38,7 @@
 class SfxItemPool;
 class SvXMLAttrContainerItem;
 
-class SwTxtAttr : private boost::noncopyable
+class SwTextAttr : private boost::noncopyable
 {
 private:
     SfxPoolItem * const m_pAttr;
@@ -47,23 +47,23 @@ private:
     bool m_bLockExpandFlag      : 1;
 
     bool m_bDontMoveAttr        : 1;    // refmarks, toxmarks
-    bool m_bCharFmtAttr         : 1;    // charfmt, inet
+    bool m_bCharFormatAttr         : 1;    // charfmt, inet
     bool m_bOverlapAllowedAttr  : 1;    // refmarks, toxmarks
     bool m_bPriorityAttr        : 1;    // attribute has priority (redlining)
     bool m_bDontExpandStart     : 1;    // don't expand start at paragraph start (ruby)
-    bool m_bNesting             : 1;    // SwTxtAttrNesting
+    bool m_bNesting             : 1;    // SwTextAttrNesting
     bool m_bHasDummyChar        : 1;    // without end + meta
     bool m_bFormatIgnoreStart   : 1;    ///< text formatting should ignore start
     bool m_bFormatIgnoreEnd     : 1;    ///< text formatting should ignore end
     bool m_bHasContent          : 1;    // text attribute with content
 
 protected:
-    SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
-    virtual ~SwTxtAttr();
+    SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
+    virtual ~SwTextAttr();
 
     void SetLockExpandFlag( bool bFlag )    { m_bLockExpandFlag = bFlag; }
     void SetDontMoveAttr( bool bFlag )      { m_bDontMoveAttr = bFlag; }
-    void SetCharFmtAttr( bool bFlag )       { m_bCharFmtAttr = bFlag; }
+    void SetCharFormatAttr( bool bFlag )       { m_bCharFormatAttr = bFlag; }
     void SetOverlapAllowedAttr( bool bFlag ){ m_bOverlapAllowedAttr = bFlag; }
     void SetDontExpandStartAttr(bool bFlag) { m_bDontExpandStart = bFlag; }
     void SetNesting(const bool bFlag)       { m_bNesting = bFlag; }
@@ -73,7 +73,7 @@ protected:
 public:
 
     /// destroy instance
-    static void Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool );
+    static void Destroy( SwTextAttr * pToDestroy, SfxItemPool& rPool );
 
     /// start position
                   sal_Int32& GetStart()        { return m_nStart; }
@@ -89,7 +89,7 @@ public:
     bool DontExpand() const                 { return m_bDontExpand; }
     bool IsLockExpandFlag() const           { return m_bLockExpandFlag; }
     bool IsDontMoveAttr() const             { return m_bDontMoveAttr; }
-    bool IsCharFmtAttr() const              { return m_bCharFmtAttr; }
+    bool IsCharFormatAttr() const              { return m_bCharFormatAttr; }
     bool IsOverlapAllowedAttr() const       { return m_bOverlapAllowedAttr; }
     bool IsPriorityAttr() const             { return m_bPriorityAttr; }
     void SetPriorityAttr( bool bFlag )      { m_bPriorityAttr = bFlag; }
@@ -106,66 +106,66 @@ public:
     inline       SfxPoolItem& GetAttr();
     inline sal_uInt16 Which() const { return GetAttr().Which(); }
 
-    bool operator==( const SwTxtAttr& ) const;
+    bool operator==( const SwTextAttr& ) const;
 
-    inline const SwFmtCharFmt           &GetCharFmt() const;
-    inline const SwFmtAutoFmt           &GetAutoFmt() const;
-    inline const SwFmtFld               &GetFmtFld() const;
-    inline const SwFmtFtn               &GetFtn() const;
-    inline const SwFmtFlyCnt            &GetFlyCnt() const;
+    inline const SwFormatCharFormat           &GetCharFormat() const;
+    inline const SwFormatAutoFormat           &GetAutoFormat() const;
+    inline const SwFormatField               &GetFormatField() const;
+    inline const SwFormatFootnote               &GetFootnote() const;
+    inline const SwFormatFlyCnt            &GetFlyCnt() const;
     inline const SwTOXMark              &GetTOXMark() const;
-    inline const SwFmtRefMark           &GetRefMark() const;
-    inline const SwFmtINetFmt           &GetINetFmt() const;
-    inline const SwFmtRuby              &GetRuby() const;
-    inline const SwFmtMeta              &GetMeta() const;
+    inline const SwFormatRefMark           &GetRefMark() const;
+    inline const SwFormatINetFormat           &GetINetFormat() const;
+    inline const SwFormatRuby              &GetRuby() const;
+    inline const SwFormatMeta              &GetMeta() const;
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwTxtAttrEnd : public virtual SwTxtAttr
+class SwTextAttrEnd : public virtual SwTextAttr
 {
 protected:
     sal_Int32 m_nEnd;
 
 public:
-    SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    SwTextAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
 
     virtual sal_Int32* GetEnd() SAL_OVERRIDE;
 };
 
 // attribute that must not overlap others
-class SwTxtAttrNesting : public SwTxtAttrEnd
+class SwTextAttrNesting : public SwTextAttrEnd
 {
 protected:
-    SwTxtAttrNesting( SfxPoolItem & i_rAttr,
+    SwTextAttrNesting( SfxPoolItem & i_rAttr,
         const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
-    virtual ~SwTxtAttrNesting();
+    virtual ~SwTextAttrNesting();
 };
 
-inline const sal_Int32* SwTxtAttr::End() const
+inline const sal_Int32* SwTextAttr::End() const
 {
-    return const_cast<SwTxtAttr * >(this)->GetEnd();
+    return const_cast<SwTextAttr * >(this)->GetEnd();
 }
 
-inline const sal_Int32* SwTxtAttr::GetAnyEnd() const
+inline const sal_Int32* SwTextAttr::GetAnyEnd() const
 {
     const sal_Int32* pEnd = End();
     return pEnd ? pEnd : &GetStart();
 }
 
-inline const SfxPoolItem& SwTxtAttr::GetAttr() const
+inline const SfxPoolItem& SwTextAttr::GetAttr() const
 {
     assert( m_pAttr );
     return *m_pAttr;
 }
 
-inline SfxPoolItem& SwTxtAttr::GetAttr()
+inline SfxPoolItem& SwTextAttr::GetAttr()
 {
     return const_cast<SfxPoolItem&>(
-            const_cast<const SwTxtAttr*>(this)->GetAttr());
+            const_cast<const SwTextAttr*>(this)->GetAttr());
 }
 
-inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
+inline void SwTextAttr::SetDontExpand( bool bDontExpand )
 {
     if ( !m_bLockExpandFlag )
     {
@@ -173,68 +173,68 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
     }
 }
 
-inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
+inline const SwFormatCharFormat& SwTextAttr::GetCharFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT );
-    return static_cast<const SwFmtCharFmt&>(*m_pAttr);
+    return static_cast<const SwFormatCharFormat&>(*m_pAttr);
 }
 
-inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
+inline const SwFormatAutoFormat& SwTextAttr::GetAutoFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT );
-    return static_cast<const SwFmtAutoFmt&>(*m_pAttr);
+    return static_cast<const SwFormatAutoFormat&>(*m_pAttr);
 }
 
-inline const SwFmtFld& SwTxtAttr::GetFmtFld() const
+inline const SwFormatField& SwTextAttr::GetFormatField() const
 {
     assert( m_pAttr
             && ( m_pAttr->Which() == RES_TXTATR_FIELD
                  || m_pAttr->Which() == RES_TXTATR_ANNOTATION
                  || m_pAttr->Which() == RES_TXTATR_INPUTFIELD ));
-    return static_cast<const SwFmtFld&>(*m_pAttr);
+    return static_cast<const SwFormatField&>(*m_pAttr);
 }
 
-inline const SwFmtFtn& SwTxtAttr::GetFtn() const
+inline const SwFormatFootnote& SwTextAttr::GetFootnote() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN );
-    return static_cast<const SwFmtFtn&>(*m_pAttr);
+    return static_cast<const SwFormatFootnote&>(*m_pAttr);
 }
 
-inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const
+inline const SwFormatFlyCnt& SwTextAttr::GetFlyCnt() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT );
-    return static_cast<const SwFmtFlyCnt&>(*m_pAttr);
+    return static_cast<const SwFormatFlyCnt&>(*m_pAttr);
 }
 
-inline const SwTOXMark& SwTxtAttr::GetTOXMark() const
+inline const SwTOXMark& SwTextAttr::GetTOXMark() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK );
     return static_cast<const SwTOXMark&>(*m_pAttr);
 }
 
-inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const
+inline const SwFormatRefMark& SwTextAttr::GetRefMark() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK );
-    return static_cast<const SwFmtRefMark&>(*m_pAttr);
+    return static_cast<const SwFormatRefMark&>(*m_pAttr);
 }
 
-inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const
+inline const SwFormatINetFormat& SwTextAttr::GetINetFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT );
-    return static_cast<const SwFmtINetFmt&>(*m_pAttr);
+    return static_cast<const SwFormatINetFormat&>(*m_pAttr);
 }
 
-inline const SwFmtRuby& SwTxtAttr::GetRuby() const
+inline const SwFormatRuby& SwTextAttr::GetRuby() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY );
-    return static_cast<const SwFmtRuby&>(*m_pAttr);
+    return static_cast<const SwFormatRuby&>(*m_pAttr);
 }
 
-inline const SwFmtMeta& SwTxtAttr::GetMeta() const
+inline const SwFormatMeta& SwTextAttr::GetMeta() const
 {
     assert( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
         m_pAttr->Which() == RES_TXTATR_METAFIELD) );
-    return static_cast<const SwFmtMeta&>(*m_pAttr);
+    return static_cast<const SwFormatMeta&>(*m_pAttr);
 }
 
 // these should be static_casts but with virtual inheritance it's not possible
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index ced47511f808..6ab4f0c1a06d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -26,8 +26,8 @@
 #include <swtypes.hxx>
 #include <deque>
 
-class SwTxtNode;
-class SwTxtAttr;
+class SwTextNode;
+class SwTextAttr;
 class SfxPoolItem;
 
 class SwScriptIterator
@@ -48,22 +48,22 @@ public:
     const OUString& GetText() const { return m_rText; }
 };
 
-class SwTxtAttrIterator
+class SwTextAttrIterator
 {
     SwScriptIterator aSIter;
-    std::deque<const SwTxtAttr*> aStack;
-    const SwTxtNode& rTxtNd;
+    std::deque<const SwTextAttr*> aStack;
+    const SwTextNode& rTextNd;
     const SfxPoolItem *pParaItem, *pCurItem;
     size_t nAttrPos;
     sal_Int32 nChgPos;
     sal_uInt16 nWhichId;
     bool bIsUseGetWhichOfScript;
 
-    void AddToStack( const SwTxtAttr& rAttr );
+    void AddToStack( const SwTextAttr& rAttr );
     void SearchNextChg();
 
 public:
-    SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId,
+    SwTextAttrIterator( const SwTextNode& rTextNd, sal_uInt16 nWhichId,
                         sal_Int32 nStart = 0, bool bUseGetWhichOfScript = true );
 
     bool Next();
@@ -72,13 +72,13 @@ public:
     sal_Int32 GetChgPos() const        { return nChgPos; }
 };
 
-class SwLanguageIterator : public SwTxtAttrIterator
+class SwLanguageIterator : public SwTextAttrIterator
 {
 public:
-    SwLanguageIterator( const SwTxtNode& rTxtNode, sal_Int32 nStart = 0,
+    SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0,
                         sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
                         bool bUseGetWhichOfScript = true )
-        : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript )
+        : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript )
     {}
 
     sal_uInt16 GetLanguage() const
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 5dc18ecd303c..7f7e330b6134 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -25,15 +25,15 @@
 
 class SwDoc;
 
-class SwTxtAnnotationFld : public SwTxtFld
+class SwTextAnnotationField : public SwTextField
 {
 public:
-    SwTxtAnnotationFld(
-        SwFmtFld & rAttr,
+    SwTextAnnotationField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         bool const bInClipboard );
 
-    virtual ~SwTxtAnnotationFld();
+    virtual ~SwTextAnnotationField();
 
     ::sw::mark::IMark* GetAnnotationMark(
         SwDoc* pDoc = NULL ) const;
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index a5a4e1d8b282..02e5a1f2b82d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -22,82 +22,82 @@
 #include <txatbase.hxx>
 #include <calbck.hxx>
 
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
 
 namespace sw {
     class MetaFieldManager;
 }
 
-class SwTxtCharFmt : public SwTxtAttrEnd
+class SwTextCharFormat : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_uInt16 m_nSortNumber;
 
 public:
-    SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtCharFmt( );
+    SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextCharFormat( );
 
-    // Passed from SwFmtCharFmt (no derivation from SwClient!).
+    // Passed from SwFormatCharFormat (no derivation from SwClient!).
     void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* );
     bool GetInfo( SfxPoolItem& rInfo ) const;
 
-    // get and set TxtNode pointer
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
     void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; }
     sal_uInt16 GetSortNumber() const { return m_nSortNumber; }
 };
 
 
-class SwTxtMeta : public SwTxtAttrNesting
+class SwTextMeta : public SwTextAttrNesting
 {
 private:
-    SwTxtMeta( SwFmtMeta & i_rAttr,
+    SwTextMeta( SwFormatMeta & i_rAttr,
         const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
 
 public:
-    static SwTxtMeta * CreateTxtMeta(
+    static SwTextMeta * CreateTextMeta(
         ::sw::MetaFieldManager & i_rTargetDocManager,
-        SwTxtNode *const i_pTargetTxtNode,
-        SwFmtMeta & i_rAttr,
+        SwTextNode *const i_pTargetTextNode,
+        SwFormatMeta & i_rAttr,
         sal_Int32 const i_nStart, sal_Int32 const i_nEnd,
         bool const i_bIsCopy);
 
-    virtual ~SwTxtMeta();
+    virtual ~SwTextMeta();
 
-    void ChgTxtNode(SwTxtNode * const pNode);
+    void ChgTextNode(SwTextNode * const pNode);
 };
 
 
-class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextRuby : public SwTextAttrNesting, public SwClient
 {
-    SwTxtNode* m_pTxtNode;
+    SwTextNode* m_pTextNode;
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 public:
-    SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtRuby();
+    SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextRuby();
     TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode);
 
-    /// Get and set TxtNode pointer.
-           const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    /// Get and set TextNode pointer.
+           const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
-          SwCharFmt* GetCharFmt();
-    const SwCharFmt* GetCharFmt() const
-            { return (const_cast<SwTxtRuby*>(this))->GetCharFmt(); }
+          SwCharFormat* GetCharFormat();
+    const SwCharFormat* GetCharFormat() const
+            { return (const_cast<SwTextRuby*>(this))->GetCharFormat(); }
 };
 
-inline const SwTxtNode& SwTxtRuby::GetTxtNode() const
+inline const SwTextNode& SwTextRuby::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index b3e2b6cfb103..74f78691db0f 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -23,34 +23,34 @@
 
 class SwFlyInCntFrm;
 class SwFrm;
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 
 // Attribute for line-bound frames (without end index).
-class SwTxtFlyCnt : public SwTxtAttr
+class SwTextFlyCnt : public SwTextAttr
 {
     SwFlyInCntFrm  *_GetFlyFrm( const SwFrm *pCurrFrm );
 public:
-    SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart );
+    SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart );
 
-    // Sets anchor in pFmt and
-    void    SetAnchor( const SwTxtNode *pNode );
+    // Sets anchor in pFormat and
+    void    SetAnchor( const SwTextNode *pNode );
 
     inline        SwFlyInCntFrm  *GetFlyFrm( const SwFrm *pCurrFrm );
     inline const  SwFlyInCntFrm  *GetFlyFrm( const SwFrm *pCurrFrm ) const;
 
     // creates for itself a new FlyFrameFormat.
-    void CopyFlyFmt( SwDoc* pDoc );
+    void CopyFlyFormat( SwDoc* pDoc );
 };
 
-inline SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
+inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
 {
     return _GetFlyFrm( pCurrFrm );
 }
 
-inline const SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
+inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
 {
-    return (const_cast<SwTxtFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
+    return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
 }
 
 #endif
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index fa40f76090d3..d4189ed6f8cd 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -26,70 +26,70 @@
 #include <boost/shared_ptr.hpp>
 
 class SwPaM;
-class SwTxtNode;
+class SwTextNode;
 
-class SwTxtFld : public virtual SwTxtAttr
+class SwTextField : public virtual SwTextAttr
 {
-    mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
-    SwTxtNode * m_pTxtNode;
+    mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTextField()>
+    SwTextNode * m_pTextNode;
 
 public:
-    SwTxtFld(
-        SwFmtFld & rAttr,
+    SwTextField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         bool const bInClipboard );
 
-    virtual ~SwTxtFld();
+    virtual ~SwTextField();
 
-    void CopyTxtFld( SwTxtFld *pDest ) const;
+    void CopyTextField( SwTextField *pDest ) const;
 
-    void ExpandTxtFld( const bool bForceNotify = false ) const;
+    void ExpandTextField( const bool bForceNotify = false ) const;
 
-    // get and set TxtNode pointer
-    SwTxtNode* GetpTxtNode() const
+    // get and set TextNode pointer
+    SwTextNode* GetpTextNode() const
     {
-        return m_pTxtNode;
+        return m_pTextNode;
     }
-    SwTxtNode& GetTxtNode() const
+    SwTextNode& GetTextNode() const
     {
-        OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
-        return *m_pTxtNode;
+        OSL_ENSURE( m_pTextNode, "SwTextField:: where is my TextNode?" );
+        return *m_pTextNode;
     }
-    void ChgTxtNode( SwTxtNode* pNew )
+    void ChgTextNode( SwTextNode* pNew )
     {
-        m_pTxtNode = pNew;
+        m_pTextNode = pNew;
     }
 
-    bool IsFldInDoc() const;
+    bool IsFieldInDoc() const;
 
     // enable notification that field content has changed and needs reformatting
-    virtual void NotifyContentChange( SwFmtFld& rFmtFld );
+    virtual void NotifyContentChange( SwFormatField& rFormatField );
 
     // deletes the given field via removing the corresponding text selection from the document's content
-    static void DeleteTxtFld( const SwTxtFld& rTxtFld );
+    static void DeleteTextField( const SwTextField& rTextField );
 
     // return text selection for the given field
-    static void GetPamForTxtFld( const SwTxtFld& rTxtFld,
-                                 boost::shared_ptr< SwPaM >& rPamForTxtFld );
+    static void GetPamForTextField( const SwTextField& rTextField,
+                                 boost::shared_ptr< SwPaM >& rPamForTextField );
 
 };
 
-class SwTxtInputFld
-    : public SwTxtAttrNesting
-    , public SwTxtFld
+class SwTextInputField
+    : public SwTextAttrNesting
+    , public SwTextField
 {
 public:
-    SwTxtInputFld(
-        SwFmtFld & rAttr,
+    SwTextInputField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         sal_Int32 const nEnd,
         bool const bInClipboard );
 
-    virtual ~SwTxtInputFld();
+    virtual ~SwTextInputField();
 
     void LockNotifyContentChange();
     void UnlockNotifyContentChange();
-    virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE;
+    virtual void NotifyContentChange( SwFormatField& rFormatField ) SAL_OVERRIDE;
 
     void UpdateTextNodeContent( const OUString& rNewContent );
 
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 94b2712c2f0a..2d34daaabae6 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -24,34 +24,34 @@
 namespace rtl { class OUString; }
 
 class SwNodeIndex;
-class SwTxtNode;
+class SwTextNode;
 class SwNodes;
 class SwDoc;
 class SwFrm;
 
-class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr
+class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr
 {
     SwNodeIndex * m_pStartNode;
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_uInt16 m_nSeqNo;
 
 public:
-    SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStart );
-    virtual ~SwTxtFtn();
+    SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart );
+    virtual ~SwTextFootnote();
 
     inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
     void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true );
     void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr );
-    void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const;
+    void CopyFootnote(SwTextFootnote & rDest, SwTextNode & rDestNode) const;
 
-    // Get and set TxtNode pointer.
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // Get and set TextNode pointer.
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
     // Create a new empty TextSection for this footnote.
     void MakeNewTextSection( SwNodes& rNodes );
 
-    // Delete the FtnFrame from page.
+    // Delete the FootnoteFrame from page.
     void DelFrms( const SwFrm* );
 
     // Check conditional paragraph styles.
@@ -65,10 +65,10 @@ public:
     static void SetUniqueSeqRefNo( SwDoc& rDoc );
 };
 
-inline const SwTxtNode& SwTxtFtn::GetTxtNode() const
+inline const SwTextNode& SwTextFootnote::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 8e70df02e96c..9a08f70faa67 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -23,12 +23,12 @@
 #include <txtatr.hxx>
 #include <calbck.hxx>
 
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
 
-class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextINetFormat : public SwTextAttrNesting, public SwClient
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     bool m_bVisited         : 1; // visited link?
     bool m_bVisitedValid    : 1; // is m_bVisited valid?
 
@@ -36,23 +36,23 @@ protected:
 virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
 public:
-    SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtINetFmt();
+    SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextINetFormat();
     TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitINetFormat(SwTextNode & rNode);
 
-    // get and set TxtNode pointer
-    const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    inline SwTxtNode& GetTxtNode();
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    inline SwTextNode& GetTextNode();
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
-          SwCharFmt* GetCharFmt();
-    const SwCharFmt* GetCharFmt() const
-            { return const_cast<SwTxtINetFmt*>(this)->GetCharFmt(); }
+          SwCharFormat* GetCharFormat();
+    const SwCharFormat* GetCharFormat() const
+            { return const_cast<SwTextINetFormat*>(this)->GetCharFormat(); }
 
     bool IsVisited() const { return m_bVisited; }
     void SetVisited( bool bNew ) { m_bVisited = bNew; }
@@ -63,15 +63,15 @@ public:
     bool IsProtect() const;
 };
 
-inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const
+inline const SwTextNode& SwTextINetFormat::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
-inline SwTxtNode& SwTxtINetFmt::GetTxtNode()
+inline SwTextNode& SwTextINetFormat::GetTextNode()
 {
-    return const_cast<SwTxtNode&>( const_cast<SwTxtINetFmt const*>(this)->GetTxtNode() );
+    return const_cast<SwTextNode&>( const_cast<SwTextINetFormat const*>(this)->GetTextNode() );
 }
 
 #endif
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index eee21e2f9f32..ab72f76d3cf0 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -21,29 +21,29 @@
 
 #include <txatbase.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 
 // Attribute for content-/position references in text.
-class SwTxtRefMark : public SwTxtAttrEnd
+class SwTextRefMark : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_Int32 * m_pEnd; // end is optional (point reference)
 
 public:
-    SwTxtRefMark( SwFmtRefMark& rAttr,
+    SwTextRefMark( SwFormatRefMark& rAttr,
             sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
 
-    virtual sal_Int32* GetEnd() SAL_OVERRIDE;       // SwTxtAttr
+    virtual sal_Int32* GetEnd() SAL_OVERRIDE;       // SwTextAttr
 
-    // get and set TxtNode pointer
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 };
 
-inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const
+inline const SwTextNode& SwTextRefMark::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 6436b859f342..f935254fc682 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -21,34 +21,34 @@
 
 #include <txatbase.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 
 // Attribute for indices/tables of contents.
-class SwTxtTOXMark : public SwTxtAttrEnd
+class SwTextTOXMark : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_Int32 * m_pEnd;   // 0 if SwTOXMark without AlternativeText
 
 public:
-    SwTxtTOXMark( SwTOXMark& rAttr,
+    SwTextTOXMark( SwTOXMark& rAttr,
             sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
-    virtual ~SwTxtTOXMark();
+    virtual ~SwTextTOXMark();
 
-    virtual sal_Int32 *GetEnd() SAL_OVERRIDE;     // SwTxtAttr
+    virtual sal_Int32 *GetEnd() SAL_OVERRIDE;     // SwTextAttr
 
     void CopyTOXMark( SwDoc* pDestDoc );
 
-    // get and set TxtNode pointer
-    inline const SwTxtNode* GetpTxtNd() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    inline const SwTextNode* GetpTextNd() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 };
 
-inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const
+inline const SwTextNode& SwTextTOXMark::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 9ec5e4dc7d88..69703760d8a5 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -34,8 +34,8 @@ class SwIndex;
 class SwPaM;
 struct SwPosition;
 class SwDoc;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwFrameFormat;
 class SwNodeIndex;
 class SwNodeRange;
 class SwRedlineData;
@@ -116,30 +116,30 @@ public:
     // Save and set Redline data.
     static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
                               bool bDelRange = true, bool bCopyNext = true );
-    static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
+    static bool FillSaveDataForFormat( const SwPaM& , SwRedlineSaveDatas& );
     static void SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData );
     static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
 };
 
-typedef sal_uInt16 DelCntntType;
-namespace nsDelCntntType
+typedef sal_uInt16 DelContentType;
+namespace nsDelContentType
 {
-    const DelCntntType DELCNT_FTN = 0x01;
-    const DelCntntType DELCNT_FLY = 0x02;
-    const DelCntntType DELCNT_TOC = 0x04;
-    const DelCntntType DELCNT_BKM = 0x08;
-    const DelCntntType DELCNT_ALL = 0x0F;
-    const DelCntntType DELCNT_CHKNOCNTNT = 0x80;
+    const DelContentType DELCNT_FTN = 0x01;
+    const DelContentType DELCNT_FLY = 0x02;
+    const DelContentType DELCNT_TOC = 0x04;
+    const DelContentType DELCNT_BKM = 0x08;
+    const DelContentType DELCNT_ALL = 0x0F;
+    const DelContentType DELCNT_CHKNOCNTNT = 0x80;
 }
 
-/// will DelCntntIndex destroy a frame anchored at character at rAnchorPos?
+/// will DelContentIndex destroy a frame anchored at character at rAnchorPos?
 bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
         SwPosition const & rStart, SwPosition const & rEnd, const SwDoc* doc,
-        DelCntntType const nDelCntntType = nsDelCntntType::DELCNT_ALL);
+        DelContentType const nDelContentType = nsDelContentType::DELCNT_ALL);
 
 // This class has to be inherited into an Undo-object if it saves content
 // for Redo/Undo...
-class SwUndoSaveCntnt
+class SwUndoSaveContent
 {
 protected:
 
@@ -166,16 +166,16 @@ protected:
 
     // Before moving stuff into UndoNodes-Array care has to be taken that
     // the content-bearing attributes are removed from the nodes-array.
-    void DelCntntIndex( const SwPosition& pMark, const SwPosition& pPoint,
-                        DelCntntType nDelCntntType = nsDelCntntType::DELCNT_ALL );
+    void DelContentIndex( const SwPosition& pMark, const SwPosition& pPoint,
+                        DelContentType nDelContentType = nsDelContentType::DELCNT_ALL );
 
 public:
-    SwUndoSaveCntnt();
-    ~SwUndoSaveCntnt();
+    SwUndoSaveContent();
+    ~SwUndoSaveContent();
 };
 
 // Save a complete section in nodes-array.
-class SwUndoSaveSection : private SwUndoSaveCntnt
+class SwUndoSaveSection : private SwUndoSaveContent
 {
     SwNodeIndex *pMvStt;
     SwRedlineSaveDatas* pRedlSaveData;
@@ -205,27 +205,27 @@ class SwUndRng
 {
 public:
     sal_uLong nSttNode, nEndNode;
-    sal_Int32 nSttCntnt, nEndCntnt;
+    sal_Int32 nSttContent, nEndContent;
 
     SwUndRng();
     SwUndRng( const SwPaM& );
 
     void SetValues( const SwPaM& rPam );
-    void SetPaM( SwPaM&, bool bCorrToCntnt = false ) const;
+    void SetPaM( SwPaM&, bool bCorrToContent = false ) const;
     SwPaM & AddUndoRedoPaM(
-        ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const;
+        ::sw::UndoRedoContext &, bool const bCorrToContent = false) const;
 };
 
-class SwUndoInsLayFmt;
+class SwUndoInsLayFormat;
 
 // base class for insertion of Document, Glossaries and Copy
-class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt
+class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
 {
-    SwTxtFmtColl *pTxtFmtColl, *pLastNdColl;
-    std::vector<SwFrmFmt*>* pFrmFmts;
-    ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos;
+    SwTextFormatColl *pTextFormatColl, *pLastNdColl;
+    std::vector<SwFrameFormat*>* pFrameFormats;
+    ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
     SwRedlineData* pRedlData;
-    bool bSttWasTxtNd;
+    bool bSttWasTextNd;
 protected:
     sal_uLong nNdDiff;
     /// start of Content in UndoNodes for Redo
@@ -242,7 +242,7 @@ public:
 
     // Set destination range after reading.
     void SetInsertRange( const SwPaM&, bool bScanFlys = true,
-                         bool bSttWasTxtNd = true );
+                         bool bSttWasTextNd = true );
 };
 
 class SwUndoInsDoc : public SwUndoInserts
@@ -260,16 +260,16 @@ public:
 class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
 {
 protected:
-    SwFrmFmt* pFrmFmt;          // The saved FlyFormat.
+    SwFrameFormat* pFrameFormat;          // The saved FlyFormat.
     sal_uLong nNdPgPos;
     sal_Int32 nCntPos;         // Page at/in paragraph.
     sal_uInt16 nRndId;
-    bool bDelFmt;           // Delete saved format.
+    bool bDelFormat;           // Delete saved format.
 
     void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true);
     void DelFly( SwDoc* );
 
-    SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId );
+    SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId );
 
     SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); }
     sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); }
@@ -279,14 +279,14 @@ public:
 
 };
 
-class SwUndoInsLayFmt : public SwUndoFlyBase
+class SwUndoInsLayFormat : public SwUndoFlyBase
 {
     sal_uLong mnCrsrSaveIndexPara;           // Cursor position
     sal_Int32 mnCrsrSaveIndexPos;            // for undo
 public:
-    SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
+    SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
 
-    virtual ~SwUndoInsLayFmt();
+    virtual ~SwUndoInsLayFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -296,11 +296,11 @@ public:
 
 };
 
-class SwUndoDelLayFmt : public SwUndoFlyBase
+class SwUndoDelLayFormat : public SwUndoFlyBase
 {
     bool bShowSelFrm;
 public:
-    SwUndoDelLayFmt( SwFrmFmt* pFormat );
+    SwUndoDelLayFormat( SwFrameFormat* pFormat );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 8f135031bb52..ebee75cf4092 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -58,7 +58,7 @@ class SwTableBox;
 class SwUnoCrsr;
 struct SwRangeDescriptor;
 class SwSelBoxes;
-class SwFrmFmt;
+class SwFrameFormat;
 
 bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName );
 
@@ -190,7 +190,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwFrmFmt*       GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*       GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
     void        AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
     void        RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
@@ -265,7 +265,7 @@ class SwChartDataSequence :
     ::com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider >    xDataProvider;
     SwChartDataProvider *                   pDataProvider;
 
-    SwUnoCrsr*                  pTblCrsr;   // cursor spanned over cells to use
+    SwUnoCrsr*                  pTableCrsr;   // cursor spanned over cells to use
     SwDepend                    aCursorDepend; //the cursor is removed after the doc has been removed
 
     const SfxItemPropertySet*   _pPropSet;
@@ -281,7 +281,7 @@ protected:
 
 public:
     SwChartDataSequence( SwChartDataProvider &rProvider,
-                         SwFrmFmt   &rTblFmt,
+                         SwFrameFormat   &rTableFormat,
                          SwUnoCrsr  *pTableCursor );
     virtual ~SwChartDataSequence();
 
@@ -345,7 +345,7 @@ public:
     virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwFrmFmt*   GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*   GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     bool    DeleteBox( const SwTableBox &rBox );
 
     void        FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 4426e3582028..ff27c0ad0586 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -31,7 +31,7 @@
 #include "swdllapi.h"
 
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 namespace com{namespace sun {namespace star {namespace text
 {
     class XTextTable;
@@ -39,12 +39,12 @@ namespace com{namespace sun {namespace star {namespace text
     class XFootnote;
 }}}}
 class SwXFrame;
-class SwFrmFmt;
-class SwFmtFtn;
+class SwFrameFormat;
+class SwFormatFootnote;
 class XBookmark;
 class SwXReferenceMark;
-class SwSectionFmt;
-class SwFmtRefMark;
+class SwSectionFormat;
+class SwFormatRefMark;
 class SwXReferenceMark;
 class SwXBookmark;
 struct SvEventDescription;
@@ -290,7 +290,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static css::uno::Reference<css::text::XTextTable> GetObject(SwFrmFmt& rFmt);
+    static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
 };
 
 typedef
@@ -404,7 +404,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat );
 };
 
 class SwXBookmarks : public SwCollectionBaseClass,
@@ -487,7 +487,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat );
 };
 
 class SwXReferenceMarks : public SwCollectionBaseClass,
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 66aa05ab7c5f..c32905025539 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -35,7 +35,7 @@ public:
 
 protected:
 
-    virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+    virtual const SwContentFrm* DoSetBidiLevelLeftRight(
         bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE;
     virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE;
 
@@ -74,7 +74,7 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
     // The selection has the same order as the table boxes, i.e.
     // if something is deleted from the one array at a certain position
     // it has also to be deleted from the other!
-    SwCursor m_aTblSel;
+    SwCursor m_aTableSel;
 
     using SwTableCursor::MakeBoxSels;
 
@@ -93,8 +93,8 @@ public:
 
     void MakeBoxSels();
 
-          SwCursor& GetSelRing()            { return m_aTblSel; }
-    const SwCursor& GetSelRing() const      { return m_aTblSel; }
+          SwCursor& GetSelRing()            { return m_aTableSel; }
+    const SwCursor& GetSelRing() const      { return m_aTableSel; }
 };
 
 #endif
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 4d14357831b0..a7bd39e0ab40 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
 class SfxItemPropertySet;
 struct SfxItemPropertySimpleEntry;
 class SdrObject;
-class SwTxtNode;
+class SwTextNode;
 class SwCursor;
 class SwUnoCrsr;
 class SwUnoTableCrsr;
-class SwFmtColl;
+class SwFormatColl;
 struct SwSortOptions;
 class SwDoc;
 
@@ -76,22 +76,22 @@ namespace SwUnoCursorHelper
     };
 
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
-        GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex,
+        GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex,
             bool const bParent);
 
     bool                    getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , SwPaM& rPam
                                         , com::sun::star::uno::Any *pAny
                                         , com::sun::star::beans::PropertyState& eState
-                                        , const SwTxtNode* pNode = 0 );
+                                        , const SwTextNode* pNode = 0 );
 
     void                        GetCurPageStyle(SwPaM& rPaM, OUString &rString);
 
     inline bool             IsStartOfPara(SwPaM& rUnoCrsr)
                                         { return rUnoCrsr.GetPoint()->nContent == 0;}
     inline bool             IsEndOfPara(SwPaM& rUnoCrsr)
-                                        { return rUnoCrsr.GetCntntNode() &&
-                                            rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();}
+                                        { return rUnoCrsr.GetContentNode() &&
+                                            rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();}
 
     void                        resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
     void                        InsertFile(SwUnoCrsr* pUnoCrsr,
@@ -135,10 +135,10 @@ namespace SwUnoCursorHelper
                      const SetAttrMode nAttrMode,
                      const bool bTableMode = false);
     void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
-                     const bool bOnlyTxtAttr = false,
-                     const bool bGetFromChrFmt = true);
+                     const bool bOnlyTextAttr = false,
+                     const bool bGetFromChrFormat = true);
     void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
-    SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
+    SwFormatColl * GetCurTextFormatColl(SwPaM & rPam, const bool bConditional);
 
     void SelectPam(SwPaM & rPam, const bool bExpand);
     void SetString(SwCursor & rCursor, const OUString & rString);
@@ -216,7 +216,7 @@ namespace SwUnoCursorHelper
     bool SetPageDesc(
             const ::com::sun::star::uno::Any& rValue,
             SwDoc & rDoc, SfxItemSet & rSet);
-    void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
+    void SetTextFormatColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
         throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException);
     bool SetCursorPropertyValue(
             SfxItemPropertySimpleEntry const& rEntry,
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 68e4d40e2910..ce894a9687b7 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -119,7 +119,7 @@ public:
     void    InvalidateSwDoc(); // {pDoc = 0;}
     SwDoc* GetDoc();
     /// Same as getByIndex(nIndex), except that it also takes a set of formats to ignore, so the method itself doesn't have to generate such a list.
-    css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
 };
 
 class SwShapeDescriptor_Impl;
@@ -273,11 +273,11 @@ public:
     virtual OUString SAL_CALL getShapeType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     SwShapeDescriptor_Impl*     GetDescImpl() {return pImpl;}
-    SwFrmFmt*               GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*               GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >                 GetAggregationInterface() {return xShapeAgg;}
 
     // helper
-    static void AddExistingShapeToFmt( SdrObject& _rObj );
+    static void AddExistingShapeToFormat( SdrObject& _rObj );
 };
 
 class SwXGroupShape :
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 1d1fbb1701a2..1b1cab829262 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -43,7 +43,7 @@ protected:
 public:
     SwXTextFieldMasters(SwDoc* pDoc);
 
-    static bool getInstanceName(const SwFieldType& rFldType, OUString& rName);
+    static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName);
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 281098940a4f..730a93954c97 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -39,8 +39,8 @@
 
 class SdrObject;
 class SwDoc;
-class SwFmt;
-class SwFlyFrmFmt;
+class SwFormat;
+class SwFlyFrameFormat;
 
 class BaseFrameProperties_Impl;
 class SwXFrame : public cppu::WeakImplHelper
@@ -80,12 +80,12 @@ protected:
     SwXFrame(FlyCntType eSet,
                 const SfxItemPropertySet*    pPropSet,
                 SwDoc *pDoc ); //Descriptor-If
-    SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet,
+    SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet,
                 const SfxItemPropertySet*    pPropSet);
 
     template<class Interface, class Impl>
     static css::uno::Reference<Interface>
-    CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt);
+    CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat);
 
 public:
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -139,13 +139,13 @@ public:
     void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
     void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
-    const SwFrmFmt* GetFrmFmt() const
+    const SwFrameFormat* GetFrameFormat() const
     {
-        return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+        return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
     }
-    SwFrmFmt* GetFrmFmt()
+    SwFrameFormat* GetFrameFormat()
     {
-        return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+        return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
     }
     FlyCntType      GetFlyCntType()const {return eType;}
 
@@ -153,7 +153,7 @@ public:
     void            ResetDescriptor();
     //copy text from a given source PaM
     void            SetSelection(SwPaM& rCopySource);
-    static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
+    static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
 };
 
 typedef cppu::WeakImplHelper
@@ -181,11 +181,11 @@ protected:
     virtual ~SwXTextFrame();
 
     SwXTextFrame(SwDoc *pDoc);
-    SwXTextFrame(SwFrmFmt& rFmt);
+    SwXTextFrame(SwFrameFormat& rFormat);
 
 public:
     static SW_DLLPUBLIC css::uno::Reference<css::text::XTextFrame>
-            CreateXTextFrame(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+            CreateXTextFrame(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     // FIXME: EVIL HACK:  make available for SwXFrame::attachToRange
     void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); };
@@ -254,12 +254,12 @@ protected:
     virtual ~SwXTextGraphicObject();
 
     SwXTextGraphicObject( SwDoc *pDoc );
-    SwXTextGraphicObject(SwFrmFmt& rFmt);
+    SwXTextGraphicObject(SwFrameFormat& rFormat);
 
 public:
 
     static css::uno::Reference<css::text::XTextContent>
-        CreateXTextGraphicObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+        CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire(  ) throw() SAL_OVERRIDE;
@@ -307,12 +307,12 @@ protected:
     virtual ~SwXTextEmbeddedObject();
 
     SwXTextEmbeddedObject( SwDoc *pDoc );
-    SwXTextEmbeddedObject(SwFrmFmt& rFmt);
+    SwXTextEmbeddedObject(SwFrameFormat& rFormat);
 
 public:
 
     static css::uno::Reference<css::text::XTextContent>
-        CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+        CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire(  ) throw() SAL_OVERRIDE;
@@ -357,9 +357,9 @@ class SwXOLEListener : public cppu::WeakImplHelper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel;
 
-    SwFmt*       GetFmt() const    {  return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+    SwFormat*       GetFormat() const    {  return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
 public:
-    SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
+    SwXOLEListener(SwFormat& rOLEFormat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
     virtual ~SwXOLEListener();
     TYPEINFO_OVERRIDE();
 
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index bc0794409c74..db8ba9335565 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -90,7 +90,7 @@
 #define MID_COLUMNS                             0
 #define MID_COLUMN_SEPARATOR_LINE               1
 
-//SwFmtFtnAtTxtEnd
+//SwFormatFootnoteAtTextEnd
 #define MID_COLLECT                             0
 #define MID_RESTART_NUM                         1
 #define MID_NUM_START_AT                        2
@@ -109,7 +109,7 @@
 #define MID_LINE_FOOTNOTE_DIST                  6
 #define MID_FTN_LINE_STYLE                      7
 
-//SwFmtRuby
+//SwFormatRuby
 #define MID_RUBY_TEXT           0
 #define MID_RUBY_ADJUST         1
 #define MID_RUBY_CHARSTYLE      2
@@ -143,7 +143,7 @@
 #define MID_ENV_SHIFT_RIGHT     12
 #define MID_ENV_SHIFT_DOWN      13
 
-// SwFmtWrapInfluenceOnObjPos
+// SwFormatWrapInfluenceOnObjPos
 #define MID_WRAP_INFLUENCE      0
 
 #endif
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 8c048865fcf5..5bca49d1912b 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -43,7 +43,7 @@ struct SwPosition;
 class SwPaM;
 class SwUnoCrsr;
 class SwStartNode;
-class SwTxtNode;
+class SwTextNode;
 class SwTable;
 class SwXText;
 
@@ -74,7 +74,7 @@ private:
 
     SwXParagraph(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XText > const & xParent,
-            SwTxtNode & rTxtNode,
+            SwTextNode & rTextNode,
             const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
 
     /// descriptor
@@ -84,17 +84,17 @@ public:
 
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::text::XTextContent>
-        CreateXParagraph(SwDoc & rDoc, SwTxtNode * pTxtNode,
+        CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode,
             ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
                 const& xParentText = 0,
             const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
 
-    const SwTxtNode * GetTxtNode() const;
+    const SwTextNode * GetTextNode() const;
     bool            IsDescriptor() const;
     /// make rPaM select the paragraph
     bool SelectPaM(SwPaM & rPaM);
     /// for SwXText
-    void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
+    void attachToText(SwXText & rParent, SwTextNode & rTextNode);
 
     // MetadatableMixin
     virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 2f97eb84bc1d..94935ad8a2ac 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -34,10 +34,10 @@
 #include <svl/itemprop.hxx>
 
 class SwDoc;
-class SwFmtCol;
+class SwFormatCol;
 class SwDocShell;
 class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
 
 class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
 <
@@ -206,11 +206,11 @@ public:
     void    Invalidate()    {pDocShell = 0;}
     OUString                GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;}
 
-    static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFmt(
-            const SwNumFmt& rFmt, OUString const& rCharFormatName,
+    static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat(
+            const SwNumFormat& rFormat, OUString const& rCharFormatName,
             OUString const* pHeadingStyleName);
-    static void SetPropertiesToNumFmt(
-            SwNumFmt & aFmt,
+    static void SetPropertiesToNumFormat(
+            SwNumFormat & aFormat,
             OUString & rCharStyleName,
             OUString *const pBulletFontName,
             OUString *const pHeadingStyleName,
@@ -264,7 +264,7 @@ protected:
     virtual ~SwXTextColumns();
 public:
     SwXTextColumns(sal_uInt16 nColCount);
-    SwXTextColumns(const SwFmtCol& rFmtCol);
+    SwXTextColumns(const SwFormatCol& rFormatCol);
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index ffe6985b43ec..11b30a346ca7 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -48,9 +48,9 @@ class SwTable;
 class SwTableBox;
 class SwTableLine;
 class SwTableCursor;
-class SwTableBoxFmt;
+class SwTableBoxFormat;
 class SwChartDataProvider;
-class SwFrmFmt;
+class SwFrameFormat;
 
 typedef
 cppu::WeakImplHelper
@@ -65,8 +65,8 @@ class SwXCell SAL_FINAL : public SwXCellBaseClass,
     public SwXText,
     public SwClient
 {
-    friend void   sw_setString( SwXCell &rCell, const OUString &rTxt,
-                                bool bKeepNumberFmt );
+    friend void   sw_setString( SwXCell &rCell, const OUString &rText,
+                                bool bKeepNumberFormat );
     friend double sw_getValue( SwXCell &rCell );
     friend void   sw_setValue( SwXCell &rCell, double nVal );
 
@@ -95,8 +95,8 @@ protected:
     virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
 
 public:
-    SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND);
-    SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface
+    SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
+    SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface
 
     TYPEINFO_OVERRIDE();
 
@@ -147,11 +147,11 @@ public:
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwTableBox*   GetTblBox()const {return pBox;}
-    static SwXCell*     CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 );
+    SwTableBox*   GetTableBox()const {return pBox;}
+    static SwXCell*     CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = 0 );
     SwTableBox*     FindBox(SwTable* pTable, SwTableBox* pBox);
 
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
@@ -164,8 +164,8 @@ class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
     const SfxItemPropertySet*   m_pPropSet;
     SwTableLine*            pLine;
 
-    SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTextTableRow*>(this)->GetFrmFmt(); }
+    SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); }
 protected:
     virtual ~SwXTextTableRow();
     //SwClient
@@ -173,7 +173,7 @@ protected:
     virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
 
 public:
-    SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine);
+    SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
 
     TYPEINFO_OVERRIDE();
 
@@ -197,7 +197,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    const SwTableLine*  GetTblRow() const {return pLine;}
+    const SwTableLine*  GetTableRow() const {return pLine;}
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
 
@@ -216,8 +216,8 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
 protected:
     virtual ~SwXTextTableCursor();
 public:
-    SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox);
-    SwXTextTableCursor(SwFrmFmt& rTableFmt,
+    SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox);
+    SwXTextTableCursor(SwFrameFormat& rTableFormat,
                         const SwTableCursor* pTableSelection);
 
     DECLARE_XINTERFACE()
@@ -275,7 +275,7 @@ public:
 
     const SwUnoCrsr*            GetCrsr() const;
     SwUnoCrsr*                  GetCrsr();
-    SwFrmFmt*       GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*       GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 struct SwRangeDescriptor
@@ -324,11 +324,11 @@ private:
 protected:
     virtual ~SwXTextTable();
     SwXTextTable();
-    SwXTextTable(SwFrmFmt& rFrmFmt);
+    SwXTextTable(SwFrameFormat& rFrameFormat);
 
 public:
     static css::uno::Reference<css::text::XTextTable>
-            CreateXTextTable(SwFrmFmt * pFrmFmt);
+            CreateXTextTable(SwFrameFormat * pFrameFormat);
 
     SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -428,14 +428,14 @@ public:
 
     sal_uInt16          getRowCount();
     sal_uInt16          getColumnCount();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+    static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable,
                         const OUString& sTLName, const OUString& sBRName,
                         SwRangeDescriptor& rDesc);
 
     //SwClient
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 class SwXCellRange : public cppu::WeakImplHelper
@@ -457,7 +457,7 @@ class SwXCellRange : public cppu::WeakImplHelper
     SwRangeDescriptor           aRgDesc;
     const SfxItemPropertySet*   m_pPropSet;
 
-    SwUnoCrsr*                  pTblCrsr;
+    SwUnoCrsr*                  pTableCrsr;
 
     bool m_bFirstRowAsLabel;
     bool m_bFirstColumnAsLabel;
@@ -466,7 +466,7 @@ class SwXCellRange : public cppu::WeakImplHelper
     void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow);
 
 public:
-    SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc);
+    SwXCellRange(SwUnoCrsr* pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
     void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
         { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; }
     std::vector< css::uno::Reference< css::table::XCell > > getCells();
@@ -538,16 +538,16 @@ public:
     //SwClient
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
-    SwFrmFmt*   GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*   GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     sal_uInt16      getRowCount();
     sal_uInt16      getColumnCount();
 
-    const SwUnoCrsr* GetTblCrsr() const;
+    const SwUnoCrsr* GetTableCrsr() const;
 
     // for SwChartDataSequence
     void GetDataSequence(
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq,
-            ::com::sun::star::uno::Sequence< OUString > *pTxtSeq,
+            ::com::sun::star::uno::Sequence< OUString > *pTextSeq,
             ::com::sun::star::uno::Sequence< double > *pDblSeq,
             bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -561,12 +561,12 @@ class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
     public SwClient
 
 {
-    SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTableRows*>(this)->GetFrmFmt(); }
+    SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); }
 protected:
     virtual ~SwXTableRows();
 public:
-    SwXTableRows(SwFrmFmt& rFrmFmt);
+    SwXTableRows(SwFrameFormat& rFrameFormat);
 
     TYPEINFO_OVERRIDE();
 
@@ -603,11 +603,11 @@ class SwXTableColumns : public cppu::WeakImplHelper
     public SwClient
 
 {
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 protected:
     virtual ~SwXTableColumns();
 public:
-    SwXTableColumns(SwFrmFmt& rFrmFmt);
+    SwXTableColumns(SwFrameFormat& rFrameFormat);
 
     TYPEINFO_OVERRIDE();
 
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 71662286ff6d..6f46a3905734 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -30,7 +30,7 @@
 #include <unotext.hxx>
 
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwXTextCursor;
 
 typedef ::cppu::WeakAggImplHelper2
@@ -134,12 +134,12 @@ protected:
 
     virtual ~SwXHeadFootText();
 
-    SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+    SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
 
 public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
-        CreateXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+        CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
     static bool IsXHeadFootText(SwClient *const pClient);
 
     // XInterface
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 312b68eec8a8..b7f7ae90b743 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -37,7 +37,7 @@
 
 class SwDoc;
 class SwUnoCrsr;
-class SwFrmFmt;
+class SwFrameFormat;
 
 class SW_DLLPUBLIC SwUnoInternalPaM
     : public SwPaM
@@ -114,7 +114,7 @@ public:
                 ::com::sun::star::text::XText > & xParent,
             const enum RangePosition eRange = RANGE_IN_TEXT);
     // only for RANGE_IS_TABLE
-    SwXTextRange(SwFrmFmt& rTblFmt);
+    SwXTextRange(SwFrameFormat& rTableFormat);
 
     const SwDoc* GetDoc() const;
           SwDoc* GetDoc();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index b7fb3d0e4f9c..90e7f02b9335 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -148,7 +148,7 @@ private:
 
     css::uno::Reference< css::text::XText >                 xBodyText;
     SwXBodyText*            pBodyText;
-    css::uno::Reference< css::uno::XAggregation >           xNumFmtAgg;
+    css::uno::Reference< css::uno::XAggregation >           xNumFormatAgg;
 
     css::uno::Reference< css::container::XIndexAccess > *     pxXNumberingRules;
     css::uno::Reference< css::container::XIndexAccess > *     pxXFootnotes;
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index ef4c88d0dfbf..e0d1730c5ce7 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -41,10 +41,10 @@ public:
     virtual OUString        GetName() const SAL_OVERRIDE;
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    OUString                Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng);
+    OUString                Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng);
 
-    OUString                GetContent( sal_uInt32 nFmt = 0 );
-           void             SetContent( const OUString& rStr, sal_uInt32 nFmt = 0 );
+    OUString                GetContent( sal_uInt32 nFormat = 0 );
+           void             SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 );
 
     inline bool             IsValid() const;
     inline void             ChgValid( bool bNew );
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField
     virtual SwField*        Copy() const SAL_OVERRIDE;
 
 public:
-    SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0);
+    SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFormat = 0);
 
     virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
     virtual void            SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 8f10c195d0e6..64c1e269f2f6 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -157,7 +157,7 @@ protected:
     sal_uInt16          nZoom;          // In percent.
     SvxZoomType     eZoom;              // 'enum' for zoom.
 
-    sal_uInt8            nTblDest;      // Destination for table background.
+    sal_uInt8            nTableDest;      // Destination for table background.
 
 #ifdef DBG_UTIL
     // Corresponds to statements in ui/config/cfgvw.src.
@@ -236,8 +236,8 @@ public:
     inline void SetSoftHyph( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); }
 
-    inline bool IsFldName() const       { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
-    inline void SetFldName( bool b )
+    inline bool IsFieldName() const       { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
+    inline void SetFieldName( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); }
 
     inline bool IsPostIts() const
@@ -462,7 +462,7 @@ public:
 
     SvxZoomType    GetZoomType()      const { return eZoom; }
 
-    sal_uInt8   GetTblDest() const    { return nTblDest; }
+    sal_uInt8   GetTableDest() const    { return nTableDest; }
 
     void   SetViewVScrollBar(bool b)
         { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); }
@@ -480,7 +480,7 @@ public:
         { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); }
 
     void            SetZoomType     (SvxZoomType eZoom_){ eZoom = eZoom_;  }
-    void            SetTblDest( sal_uInt8 nNew )    { nTblDest = nNew;  }
+    void            SetTableDest( sal_uInt8 nNew )    { nTableDest = nNew;  }
 
     const OUString& GetSymbolFont() const {return sSymbolFont;}
     void            SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;}
@@ -597,7 +597,7 @@ inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
 inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
 {
     nUIOptions = rVOpt.nUIOptions;
-    nTblDest = rVOpt.nTblDest;
+    nTableDest = rVOpt.nTableDest;
     nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
 }
 
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index fee06ba39842..b63eaeffd284 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -70,7 +70,7 @@ class SwRegionRects;
 class SwFrm;
 class SvtAccessibilityOptions;
 class SwPagePreviewLayout;
-class SwTxtFrm;
+class SwTextFrm;
 class BitmapEx;
 
 struct SwAccessibilityOptions;
@@ -381,7 +381,7 @@ public:
     void CalcPagesForPrint( sal_uInt16 nMax );
 
     // All about fields.
-    void UpdateFlds(bool bCloseDB = false);
+    void UpdateFields(bool bCloseDB = false);
     bool IsAnyFieldInDoc() const;
     // Update all charts, for that exists any table.
     void UpdateAllCharts();
@@ -520,18 +520,18 @@ public:
 
         @author OD
 
-        @param _pFromTxtFrm
+        @param _pFromTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated
 
-        @param _pToTxtFrm
+        @param _pToTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_TO relation has to be invalidated
     */
-    void InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
-                                               const SwTxtFrm* _pToTxtFrm );
+    void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+                                               const SwTextFrm* _pToTextFrm );
 
     /** invalidate text selection for paragraphs
 
@@ -546,10 +546,10 @@ public:
 
         @author OD
 
-        @param rTxtFrm
+        @param rTextFrm
         input parameter - paragraph frame, whose attributes have changed
     */
-    void InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
+    void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm );
 
     SwAccessibleMap* GetAccessibleMap();
 
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 99b25f761f22..a15dbd30b04b 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -28,7 +28,7 @@
 
 class SwCrsrShell;
 class SwShellCrsr;
-class SwTxtInputFld;
+class SwTextInputField;
 
 // From here classes/methods for non-text cursor.
 
@@ -40,7 +40,7 @@ class SwVisCrsr
     bool m_bIsVisible;
     bool m_bIsDragCrsr;
 
-    vcl::Cursor m_aTxtCrsr;
+    vcl::Cursor m_aTextCrsr;
     const SwCrsrShell* m_pCrsrShell;
 
     void _SetPosAndShow();
@@ -79,10 +79,10 @@ class SwSelPaintRects : public SwRects
     void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { m_pCursorOverlay = pNew; }
 #endif
 
-    bool m_bShowTxtInputFldOverlay;
-    sw::overlay::OverlayRangesOutline* m_pTxtInputFldOverlay;
+    bool m_bShowTextInputFieldOverlay;
+    sw::overlay::OverlayRangesOutline* m_pTextInputFieldOverlay;
 
-    void HighlightInputFld();
+    void HighlightInputField();
 
 public:
     SwSelPaintRects( const SwCrsrShell& rCSh );
@@ -100,9 +100,9 @@ public:
     void Hide();
     void Invalidate( const SwRect& rRect );
 
-    inline void SetShowTxtInputFldOverlay( const bool bShow )
+    inline void SetShowTextInputFieldOverlay( const bool bShow )
     {
-        m_bShowTxtInputFldOverlay = bShow;
+        m_bShowTextInputFieldOverlay = bShow;
     }
 
     const SwCrsrShell* GetShell() const { return m_pCursorShell; }
@@ -152,7 +152,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
 
     virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
 
     bool UpDown( bool bUp, sal_uInt16 nCnt = 1 );
 
@@ -192,7 +192,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
 
     virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
 
     // true: Cursor can be set to this position.
     virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE;
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index 562bcfe98d7e..b1d0b4cc58ea 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -71,11 +71,11 @@ public class AccessibleRelationSet {
             "didn't gain correct relation type for paragraph 0", types[2],
             types[firstrelation]);
 
-        XAccessibleText paraTxt2 =
+        XAccessibleText paraText2 =
           UnoRuntime.queryInterface(XAccessibleText.class, para2);
         assertEquals(
             "didn't gain correct target paragraph", atarget.getText(),
-            paraTxt2.getText());
+            paraText2.getText());
     }
 
     @Test public void contents_flows_from() {
@@ -131,21 +131,21 @@ public class AccessibleRelationSet {
             "didn't gain correct relation type for paragraph 1", types[1],
             types[relationtypes[0]]);
 
-        XAccessibleText paraTxt1 =
+        XAccessibleText paraText1 =
           UnoRuntime.queryInterface(XAccessibleText.class, para1);
         assertEquals(
             "didn't gain correct target paragraph", atargets[0].getText(),
-            paraTxt1.getText());
+            paraText1.getText());
 
         assertEquals(
             "didn't gain correct relation type for paragraph 3", types[2],
             types[relationtypes[1]]);
 
-        XAccessibleText paraTxt3 =
+        XAccessibleText paraText3 =
           UnoRuntime.queryInterface(XAccessibleText.class, para3);
         assertEquals(
             "didn't gain correct target paragraph", atargets[1].getText(),
-            paraTxt3.getText());
+            paraText3.getText());
     }
 
     @Before public void before()
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java
index 508ca6cf6a04..651604b439b7 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -33,7 +33,7 @@ public class CheckCrossReferences {
 
     private com.sun.star.container.XEnumeration xParaEnum;
     private com.sun.star.container.XEnumeration xPortionEnum;
-    private com.sun.star.util.XRefreshable xFldsRefresh;
+    private com.sun.star.util.XRefreshable xFieldsRefresh;
 
     public com.sun.star.text.XTextField getNextField()
         throws com.sun.star.uno.Exception
@@ -86,18 +86,18 @@ public class CheckCrossReferences {
     public void checkField( com.sun.star.text.XTextField xField,
             com.sun.star.beans.XPropertySet xProps,
             short nFormat,
-            String aExpectedFldResult )
+            String aExpectedFieldResult )
         throws com.sun.star.uno.Exception
     {
         // set requested format
         xProps.setPropertyValue("ReferenceFieldPart", Short.valueOf(nFormat));
 
         // refresh fields in order to get new format applied
-        xFldsRefresh.refresh();
+        xFieldsRefresh.refresh();
 
-        String aFldResult = xField.getPresentation( false );
+        String aFieldResult = xField.getPresentation( false );
         assertEquals( "set reference field format doesn't result in correct field result",
-                      aExpectedFldResult, aFldResult);
+                      aExpectedFieldResult, aFieldResult);
     }
 
     @Test public void checkCrossReferences() throws com.sun.star.uno.Exception {
@@ -114,25 +114,25 @@ public class CheckCrossReferences {
             com.sun.star.text.XTextFieldsSupplier xFieldSupp =
                     UnoRuntime.queryInterface(
             com.sun.star.text.XTextFieldsSupplier.class, document);
-            xFldsRefresh = UnoRuntime.queryInterface(
+            xFieldsRefresh = UnoRuntime.queryInterface(
                     com.sun.star.util.XRefreshable.class, xFieldSupp.getTextFields());
         }
 
         // check first reference field
         {
             // strings for checking
-            final String FldResult1 = "*i*";
-            final String FldResult2 = "+b+*i*";
-            final String FldResult3 = "-1-+b+*i*";
-            final String FldResult4 = "1";
-            final String FldResult5 = "1";
-            final String FldResult6 = "A.1";
-            final String FldResult7 = "2(a)";
-            final String FldResult8 = "2(b)";
-            final String FldResult9 = "2";
-            final String FldResult10 = "1(a)";
-            final String FldResult11 = "(b)";
-            final String FldResult12 = "(a)";
+            final String FieldResult1 = "*i*";
+            final String FieldResult2 = "+b+*i*";
+            final String FieldResult3 = "-1-+b+*i*";
+            final String FieldResult4 = "1";
+            final String FieldResult5 = "1";
+            final String FieldResult6 = "A.1";
+            final String FieldResult7 = "2(a)";
+            final String FieldResult8 = "2(b)";
+            final String FieldResult9 = "2";
+            final String FieldResult10 = "1(a)";
+            final String FieldResult11 = "(b)";
+            final String FieldResult12 = "(a)";
 
             // variables for current field
             com.sun.star.text.XTextField xField = null;
@@ -140,75 +140,75 @@ public class CheckCrossReferences {
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult2 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult2 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult3 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult5 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult5 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult7 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult8 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult11 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult8 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult8 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult11 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult8 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult9 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult9 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult9 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult4 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult10 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult10 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult10 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult10 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
         }
 
         // insert a certain cross-reference bookmark and a reference field to this bookmark
@@ -267,7 +267,7 @@ public class CheckCrossReferences {
                         UnoRuntime.queryInterface(
                 com.sun.star.text.XTextRange.class, xParaEnum.nextElement());
                 xNewField.attach(xFieldTextRange.getEnd());
-                xFldsRefresh.refresh();
+                xFieldsRefresh.refresh();
             }
 
             // check inserted reference field
@@ -278,7 +278,7 @@ public class CheckCrossReferences {
                           "J", xField.getPresentation( false ) );
 
             xParaTextRange.getStart().setString( "Hallo new bookmark: " );
-            xFldsRefresh.refresh();
+            xFieldsRefresh.refresh();
             assertEquals( "inserted reference field doesn't has correct field result",
                           "Hallo new bookmark: J", xField.getPresentation( false ) );
         }
diff --git a/sw/qa/complex/writer/CheckTable.java b/sw/qa/complex/writer/CheckTable.java
index 83b92da818f8..e4d33d3ee6f1 100644
--- a/sw/qa/complex/writer/CheckTable.java
+++ b/sw/qa/complex/writer/CheckTable.java
@@ -275,7 +275,7 @@ public class CheckTable
         // get anchor
         XTextRange xAnchor = xTable.getAnchor();
         // check all properties on the anchor - shouldn't crash despite
-        // pointing to a non-SwTxtNode
+        // pointing to a non-SwTextNode
         XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xAnchor);
         XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
         Property[] props = xPropsInfo.getProperties();
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index c754bb431517..5b90d8acfe80 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -193,14 +193,14 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     SwPaM aPaM(aIdx);
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("A"));
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("A"));
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     aPaM.Move(fnMoveBackward, fnGoNode);
     aPaM.Move(fnMoveBackward, fnGoNode);
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.SetMark();
     aPaM.Move(fnMoveForward, fnGoDoc);
     IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
@@ -210,7 +210,7 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     // select so pMark start position is on a node that is fully deleted
     aPaM.Move(fnMoveBackward, fnGoNode);
     // must leave un-selected content in last node to get the bJoinPrev flag!
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.Exchange();
     aPaM.Move(fnMoveBackward, fnGoDoc);
     // delete
@@ -219,8 +219,8 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     for (IDocumentMarkAccess::const_iterator_t i = rIDMA.getAllMarksBegin(); i != rIDMA.getAllMarksEnd(); ++i)
     {
         // problem was that the nContent was pointing at deleted node
-        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetCntntNode() ==
-            static_cast<const SwCntntNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
+        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetContentNode() ==
+            static_cast<const SwContentNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
     }
 }
 
@@ -232,11 +232,11 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
     SwPaM aPaM(aIdx);
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("ABC"));
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.SetMark();
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
     sw::mark::IMark *pMark =
         rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
@@ -435,18 +435,18 @@ void SwMacrosTest::testFindReplace()
     // we need a full document with view and layout etc. because ::GetNode()
     Reference<lang::XComponent> const xComponent =
         loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
-    SwXTextDocument *const pTxtDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwDoc *const pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     // use a UnoCrsr so it will be corrected when deleting nodes
     SwUnoCrsr *const pPaM(pDoc->CreateUnoCrsr(SwPosition(aIdx), false));
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
     rIDCO.InsertString(*pPaM, OUString("foo"));
-    rIDCO.AppendTxtNode(*pPaM->GetPoint());
+    rIDCO.AppendTextNode(*pPaM->GetPoint());
     rIDCO.InsertString(*pPaM, OUString("bar"));
-    rIDCO.AppendTxtNode(*pPaM->GetPoint());
+    rIDCO.AppendTextNode(*pPaM->GetPoint());
     rIDCO.InsertString(*pPaM, OUString("baz"));
     pPaM->Move(fnMoveBackward, fnGoDoc);
 
@@ -467,7 +467,7 @@ void SwMacrosTest::testFindReplace()
             opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_BODY, false);
     CPPUNIT_ASSERT(bFound);
     CPPUNIT_ASSERT(pPaM->HasMark());
-    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
 
     // now do another Find, inside the selection from the first Find
 //    opts.searchFlags = 71680;
@@ -475,7 +475,7 @@ void SwMacrosTest::testFindReplace()
             opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_SEL, false);
     CPPUNIT_ASSERT(bFound);
     CPPUNIT_ASSERT(pPaM->HasMark());
-    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
 
     rIDCO.ReplaceRange(*pPaM, " ", true);
 
@@ -484,10 +484,10 @@ void SwMacrosTest::testFindReplace()
 
     // problem was that after the 2nd Find, the wrong newline was selected
     CPPUNIT_ASSERT_EQUAL(OUString("foo bar"),
-            pPaM->Start()->nNode.GetNode().GetTxtNode()->GetTxt());
+            pPaM->Start()->nNode.GetNode().GetTextNode()->GetText());
     pPaM->Move(fnMoveForward, fnGoNode);
     CPPUNIT_ASSERT_EQUAL(OUString("baz"),
-            pPaM->End()->nNode.GetNode().GetTxtNode()->GetTxt());
+            pPaM->End()->nNode.GetNode().GetTextNode()->GetText());
 }
 
 SwMacrosTest::SwMacrosTest()
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index 7c16c18b03a6..e768c210ce2b 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -104,8 +104,8 @@ ToxLinkProcessorTest::LinkIsCreatedCorrectly()
     sut.StartNewLink(0, STYLE_NAME_1);
     sut.CloseLink(1, URL_1);
 
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFormat.GetValue());
 }
 
 void
@@ -122,18 +122,18 @@ ToxLinkProcessorTest::LinkSequenceIsPreserved()
 
     // check first closed element
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
-            STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
+            STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
-            POOL_ID_2, sut.mClosedLinks.at(0).mINetFmt.GetINetFmtId());
+            POOL_ID_2, sut.mClosedLinks.at(0).mINetFormat.GetINetFormatId());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
-            URL_2, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+            URL_2, sut.mClosedLinks.at(0).mINetFormat.GetValue());
     // check second closed element
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
-            STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFmt.GetVisitedFmt());
+            STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFormat.GetVisitedFormat());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
-            POOL_ID_1, sut.mClosedLinks.at(1).mINetFmt.GetINetFmtId());
+            POOL_ID_1, sut.mClosedLinks.at(1).mINetFormat.GetINetFormatId());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
-            URL_1, sut.mClosedLinks.at(1).mINetFmt.GetValue());
+            URL_1, sut.mClosedLinks.at(1).mINetFormat.GetValue());
 }
 
 // Put the test suite in the registry
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 2101c4a8b825..0dcda9f18717 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -86,7 +86,7 @@ void
 ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet()
 {
     MockedSortTab sortTab;
-    sortTab.pTxtMark = NULL;
+    sortTab.pTextMark = NULL;
 
     OUString expected("");
     OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -97,7 +97,7 @@ void
 ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
 {
     MockedSortTab sortTab;
-    sortTab.pTxtMark = reinterpret_cast<SwTxtTOXMark*>(1);
+    sortTab.pTextMark = reinterpret_cast<SwTextTOXMark*>(1);
 
     OUString expected("");
     OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -107,7 +107,7 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
 class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
 public:
     virtual HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const SAL_OVERRIDE {
         (void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid unused warnings.
         return HandledTabStopToken();
@@ -128,7 +128,7 @@ public:
 private:
     SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const SAL_OVERRIDE {
+            const SwContentFrm* contentFrame, const SwContentNode *contentNode) const SAL_OVERRIDE {
         // get rid of 'unused-parameters' warnings
         (void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
         return mChapterField;
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6e7e3092942f..966a2aa23bbf 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -270,30 +270,30 @@ void SwDocTest::testUserPerceivedCharCount()
     CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1);
 }
 
-SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument(SwDoc *pDoc)
 {
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    SwFmtFtn aFtn;
-    aFtn.SetNumStr(OUString("foo"));
+    SwFormatFootnote aFootnote;
+    aFootnote.SetNumStr(OUString("foo"));
 
-    pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA BBBBB "));
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
-    pTxtNode->InsertItem(aFtn, nPos, nPos);
+    pTextNode->InsertItem(aFootnote, nPos, nPos);
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" CCCCC "));
     nPos = aPaM.GetPoint()->nContent.GetIndex();
-    pTxtNode->InsertItem(aFtn, nPos, nPos);
+    pTextNode->InsertItem(aFootnote, nPos, nPos);
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" DDDDD"));
-    CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == (4*5) + 5 + 2);
+    CPPUNIT_ASSERT(pTextNode->GetText().getLength() == (4*5) + 5 + 2);
 
     //set start of selection to first B
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 6);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 6);
     aPaM.SetMark();
     //set end of selection to last C
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 14);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 14);
     //set character attribute hidden on range
     SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
     pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aHidden );
@@ -305,24 +305,24 @@ SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
     CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
 
     //set start of selection to last A
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 4);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 4);
     aPaM.SetMark();
     //set end of selection to second last B
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 9);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 9);
     pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);    //redline-aware deletion api
     aPaM.DeleteMark();
 
-    return pTxtNode;
+    return pTextNode;
 }
 
-SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(pDoc);
 
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA"));
     IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess();
     sw::mark::IFieldmark *pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(
@@ -333,28 +333,28 @@ SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
     (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
     (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(sal_Int32(0));
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("CCCCC"));
-    pTxtNode = aPaM.GetNode().GetTxtNode();
+    pTextNode = aPaM.GetNode().GetTextNode();
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
-            pTxtNode->GetTxt().getLength());
+            pTextNode->GetText().getLength());
 
-    return pTxtNode;
+    return pTextNode;
 }
 
 void SwDocTest::testModelToViewHelperPassthrough()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::PassThrough);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::PassThrough);
     OUString sViewText = aModelToViewHelper.getViewText();
-    OUString sModelText = pTxtNode->GetTxt();
+    OUString sModelText = pTextNode->GetText();
     CPPUNIT_ASSERT_EQUAL(sModelText, sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA BBBBB foo CCCCC foo DDDDD"), sViewText);
@@ -362,9 +362,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
             ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -382,9 +382,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
 
 void SwDocTest::testModelToViewHelperExpandFields()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA BBBBB  CCCCC  DDDDD"), sViewText);
@@ -392,9 +392,9 @@ void SwDocTest::testModelToViewHelperExpandFields()
 
 void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAA BBBBB  CCCCC  DDDDD"),
@@ -407,9 +407,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -418,9 +418,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideDeletions);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideDeletions);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAABB " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -429,18 +429,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAA CCCCC foo DDDDD"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -456,9 +456,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteRepl
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAABB foo CCCCC foo DDDDD"), sViewText);
@@ -466,9 +466,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote(
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -486,9 +486,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteR
 
 void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
     OUString sViewText = aModelToViewHelper.getViewText();
     OUStringBuffer aBuffer;
     aBuffer.append("AAAACCCCC ");
@@ -499,18 +499,18 @@ void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAACCCCC foo DDDDD"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(sViewText,
@@ -525,18 +525,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpand
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote2()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAABBBBBCCCCC"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode2()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -555,16 +555,16 @@ void SwDocTest::testSwScanner()
     SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
 
-    CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTxtNode);
+    CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTextNode);
 
     //See https://bugs.libreoffice.org/show_bug.cgi?id=40449
     //See https://bugs.libreoffice.org/show_bug.cgi?id=39365
     //Use a temporary OUString as the arg, as that's the trouble behind
     //fdo#40449 and fdo#39365
     {
-        SwScanner aScanner(*pTxtNode,
+        SwScanner aScanner(*pTextNode,
             OUString("Hello World"),
             0, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0,
             RTL_CONSTASCII_LENGTH("Hello World"));
@@ -595,8 +595,8 @@ void SwDocTest::testSwScanner()
         m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
 
         SwDocStat aDocStat;
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
 
         CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nChar == 2);
         CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nCharExcludingSpaces == 2);
@@ -621,7 +621,7 @@ void SwDocTest::testSwScanner()
             0x0020, 0x0064, 0x006F, 0x0065, 0x0073, 0x0020, 0x0074, 0x0068,
             0x0069, 0x0073, 0x0020, 0x0064, 0x006F, 0x003F, 0x0020, 0x0020
         };
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(test,
             SAL_N_ELEMENTS(test)));
 
@@ -631,8 +631,8 @@ void SwDocTest::testSwScanner()
         m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
 
         SwDocStat aDocStat;
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
         CPPUNIT_ASSERT_MESSAGE("58 words", aDocStat.nWord == 58);
         CPPUNIT_ASSERT_MESSAGE("43 Asian characters and Korean syllables", aDocStat.nAsianWord == 43);
         CPPUNIT_ASSERT_MESSAGE("105 non-whitespace chars", aDocStat.nCharExcludingSpaces == 105);
@@ -650,10 +650,10 @@ void SwDocTest::testSwScanner()
             0x0065, 0x0065, 0x2019
         };
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree)));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
         CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
 
         const sal_Unicode aShouldBeFive[] = {
@@ -667,11 +667,11 @@ void SwDocTest::testSwScanner()
             0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
         };
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
         CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5);
     }
 
@@ -679,47 +679,47 @@ void SwDocTest::testSwScanner()
     {
         SwDocStat aDocStat;
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
-        SwFmtFtn aFtn;
-        aFtn.SetNumStr(OUString("banana"));
-        SwTxtAttr* pTA = pTxtNode->InsertItem(aFtn, nPos, nPos);
+        SwFormatFootnote aFootnote;
+        aFootnote.SetNumStr(OUString("banana"));
+        SwTextAttr* pTA = pTextNode->InsertItem(aFootnote, nPos, nPos);
         CPPUNIT_ASSERT(pTA);
-        CPPUNIT_ASSERT(pTxtNode->Len() == 6); //Apple + 0x02
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        CPPUNIT_ASSERT(pTextNode->Len() == 6); //Apple + 0x02
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("footnote should be expanded", aDocStat.nChar == 11);
 
         const sal_Int32 nNextPos = aPaM.GetPoint()->nContent.GetIndex();
         CPPUNIT_ASSERT(nNextPos == nPos+1);
-        SwFmtRefMark aRef(OUString("refmark"));
-        pTA = pTxtNode->InsertItem(aRef, nNextPos, nNextPos);
+        SwFormatRefMark aRef(OUString("refmark"));
+        pTA = pTextNode->InsertItem(aRef, nNextPos, nNextPos);
         CPPUNIT_ASSERT(pTA);
 
         aDocStat.Reset();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("refmark anchor should not be counted", aDocStat.nChar == 11);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
 
         DateTime aDate(DateTime::SYSTEM);
         SwPostItField aPostIt(
-            static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), OUString("An Author"),
+            static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), OUString("An Author"),
             OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate );
-        m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFmtFld(aPostIt));
+        m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFormatField(aPostIt));
 
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("postit anchor should effectively not exist", aDocStat.nChar == 10);
-        CPPUNIT_ASSERT(pTxtNode->Len() == 11);
+        CPPUNIT_ASSERT(pTextNode->Len() == 11);
 
         aDocStat.Reset();
     }
@@ -729,10 +729,10 @@ void SwDocTest::testSwScanner()
         SwDocStat aDocStat;
 
         const char aString[] = "Lorem ipsum";
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aString));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2));
 
         //turn on red-lining and show changes
@@ -742,17 +742,17 @@ void SwDocTest::testSwScanner()
 
         //delete everything except the first word
         aPaM.SetMark(); //set start of selection to current pos
-        aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 5);   //set end of selection to fifth char of current node
+        aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 5);   //set end of selection to fifth char of current node
         m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);    //redline-aware deletion api
         //"real underlying text should be the same"
-        CPPUNIT_ASSERT_EQUAL(pTxtNode->GetTxt(), OUString(aString));
+        CPPUNIT_ASSERT_EQUAL(pTextNode->GetText(), OUString(aString));
 
         aDocStat.Reset();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
 
-        pTxtNode->SetWordCountDirty(true);
+        pTextNode->SetWordCountDirty(true);
 
         //keep red-lining on but hide changes
         m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON);
@@ -760,28 +760,28 @@ void SwDocTest::testSwScanner()
         CPPUNIT_ASSERT_MESSAGE("redlines should be invisible", !IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
 
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
 
-        OUString sLorem = pTxtNode->GetTxt();
+        OUString sLorem = pTextNode->GetText();
         CPPUNIT_ASSERT(sLorem == "Lorem");
 
-        const SwRedlineTbl& rTbl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rTable = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable();
 
         SwNodes& rNds = m_pDoc->GetNodes();
-        CPPUNIT_ASSERT(rTbl.size() == 1);
+        CPPUNIT_ASSERT(rTable.size() == 1);
 
-        SwNodeIndex* pNodeIdx = rTbl[0]->GetContentIdx();
+        SwNodeIndex* pNodeIdx = rTable[0]->GetContentIdx();
         CPPUNIT_ASSERT(pNodeIdx);
 
-        pTxtNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTxtNode();        //first deleted txtnode
-        CPPUNIT_ASSERT(pTxtNode);
+        pTextNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTextNode();        //first deleted txtnode
+        CPPUNIT_ASSERT(pTextNode);
 
-        OUString sIpsum = pTxtNode->GetTxt();
+        OUString sIpsum = pTextNode->GetText();
         CPPUNIT_ASSERT(sIpsum == " ipsum");
 
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nWord);
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nChar);
 
@@ -789,18 +789,18 @@ void SwDocTest::testSwScanner()
         // redline *added* text though
         m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT);
         aPaM.DeleteMark();
-        aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 0);
+        aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0);
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "redline-new-text ");
         aDocStat.Reset();
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord);
         //redline-new-text Lorem ipsum
         //+++++++++++++++++     ------
         //select start of original text and part of deleted text
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 17, 25);
+        pTextNode->CountWords(aDocStat, 17, 25);
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(5), aDocStat.nChar);
     }
 
@@ -810,73 +810,73 @@ void SwDocTest::testSwScanner()
 
         OUString sTemplate("ThisXis a test.");
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', ' '));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 12 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 14 &&
                        aDocStat.nChar == 18);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '_'));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '-'));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2012));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2015));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
@@ -884,19 +884,19 @@ void SwDocTest::testSwScanner()
 
         //But default configuration should, msword-alike treak emdash
         //and endash as word separators for word-counting
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2013));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2014));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
@@ -904,10 +904,10 @@ void SwDocTest::testSwScanner()
 
         const sal_Unicode aChunk[] = {' ', 0x2013, ' '};
         OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
@@ -921,26 +921,26 @@ void SwDocTest::testMergePortionsDeleteNotSorted()
     SwPaM aPaM(aIdx);
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("  AABBCC"));
 
-    SwCharFmt *const pCharFmt(m_pDoc->MakeCharFmt("foo", 0));
-    SwFmtCharFmt const charFmt(pCharFmt);
+    SwCharFormat *const pCharFormat(m_pDoc->MakeCharFormat("foo", 0));
+    SwFormatCharFormat const charFormat(pCharFormat);
 
-    SwFmtINetFmt const inetFmt("http://example.com", "");
+    SwFormatINetFormat const inetFormat("http://example.com", "");
 
     IDocumentContentOperations & rIDCO(m_pDoc->getIDocumentContentOperations());
     aPaM.SetMark();
     aPaM.GetPoint()->nContent = 2;
     aPaM.GetMark()->nContent = 4;
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
     aPaM.GetPoint()->nContent = 2;
     aPaM.GetMark()->nContent = 5;
-    rIDCO.InsertPoolItem(aPaM, inetFmt);
+    rIDCO.InsertPoolItem(aPaM, inetFormat);
     aPaM.GetPoint()->nContent = 6;
     aPaM.GetMark()->nContent = 8;
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
     aPaM.GetPoint()->nContent = 4;
     aPaM.GetMark()->nContent = 6;
     // this triggered an STL assert in SwpHints::MergePortions()
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
 }
 
 //See https://bugs.libreoffice.org/show_bug.cgi?id=40599
@@ -952,34 +952,34 @@ void SwDocTest::testGraphicAnchorDeletion()
     SwPaM aPaM(aIdx);
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 1"));
-    m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("graphic anchor>><<graphic anchor"));
     SwNodeIndex nPara2 = aPaM.GetPoint()->nNode;
-    m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
 
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
 
     //Insert a graphic at X of >>X<< in paragraph 2
     SfxItemSet aFlySet(m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
-    SwFmtAnchor aAnchor(FLY_AS_CHAR);
+    SwFormatAnchor aAnchor(FLY_AS_CHAR);
     aAnchor.SetAnchor(aPaM.GetPoint());
     aFlySet.Put(aAnchor);
-    SwFlyFrmFmt *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
+    SwFlyFrameFormat *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
     CPPUNIT_ASSERT_MESSAGE("Expected frame", pFrame != NULL);
 
     CPPUNIT_ASSERT_MESSAGE("Should be 1 graphic", m_pDoc->GetFlyCount(FLYCNTTYPE_GRF) == 1);
 
     //Delete >X<
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(),
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(),
         RTL_CONSTASCII_LENGTH("graphic anchor>><")+1);
     aPaM.SetMark();
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
     m_pDoc->getIDocumentContentOperations().DeleteRange(aPaM);
 
 #ifdef DEBUG_AS_HTML
@@ -1143,7 +1143,7 @@ translitTest(SwDoc & rDoc, SwPaM & rPaM, sal_uInt32 const nType)
     utl::TransliterationWrapper aTrans(
             ::comphelper::getProcessComponentContext(), nType);
     rDoc.getIDocumentContentOperations().TransliterateText(rPaM, aTrans);
-    return rPaM.GetTxt();
+    return rPaM.GetText();
 }
 
 void SwDocTest::testTransliterate()
@@ -1154,7 +1154,7 @@ void SwDocTest::testTransliterate()
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("foobar"));
     aPaM.SetMark();
     aPaM.GetPoint()->nContent = 0;
-    CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetText());
 
     CPPUNIT_ASSERT_EQUAL(OUString("FOOBAR"),
             translitTest(*m_pDoc, aPaM,
@@ -1223,13 +1223,13 @@ void SwDocTest::testMarkMove()
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
         pMarksAccess->makeMark(aPaM, OUString("Para1"), IDocumentMarkAccess::MarkType::BOOKMARK);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 2"));
         aPaM.SetMark();
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
         pMarksAccess->makeMark(aPaM, OUString("Para2"), IDocumentMarkAccess::MarkType::BOOKMARK);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
         aPaM.SetMark();
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
@@ -1239,7 +1239,7 @@ void SwDocTest::testMarkMove()
     // join paragraph 2 and 3 and check
     {
         SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -2);
-        SwTxtNode& rParaNode2 = dynamic_cast<SwTxtNode&>(aIdx.GetNode());
+        SwTextNode& rParaNode2 = dynamic_cast<SwTextNode&>(aIdx.GetNode());
         rParaNode2.JoinNext();
     }
     ::sw::mark::IMark* pBM1 = pMarksAccess->findMark("Para1")->get();
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 0126b711d4d3..b1abdec46fd8 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -164,9 +164,9 @@ void Test::testLinkedGraphicRT()
         xComponent->dispose();
         mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument");
 
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pDoc);
         SwNodes& aNodes = pDoc->GetNodes();
 
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index 52a29e2fdb91..973b8304bda1 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -28,10 +28,10 @@ class HtmlImportTest : public SwModelTestBase
 
 DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     // The document contains two pictures stored as a link.
-    sfx2::LinkManager& rLinkManager = pTxtDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
+    sfx2::LinkManager& rLinkManager = pTextDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
     CPPUNIT_ASSERT_EQUAL(size_t(2), rLinkManager.GetLinks().size());
     rLinkManager.Remove(0,2);
     CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
@@ -44,11 +44,11 @@ DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
 
 DECLARE_HTMLIMPORT_TEST(testInlinedImage, "inlined_image.html")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     // The document contains only one embedded picture inlined in img's src attribute.
 
-    SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     SwEditShell* pEditShell = pDoc->GetEditShell();
     CPPUNIT_ASSERT(pEditShell);
 
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index fd9472624c6c..a3bda095bf37 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -304,9 +304,9 @@ private:
         xmlTextWriterStartDocument(pXmlWriter, NULL, NULL, NULL);
 
         // create the dump
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT(pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT(pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         SwRootFrm* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
         pLayout->dumpAsXml(pXmlWriter);
 
@@ -327,9 +327,9 @@ protected:
 
     void calcLayout()
     {
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT(pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT(pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
     }
 
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 2c9e164bea24..42d2385387a1 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -47,9 +47,9 @@ public:
         {
             if (mnCurOutputType == text::MailMergeType::SHELL)
             {
-                SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
-                CPPUNIT_ASSERT(pTxtDoc);
-                pTxtDoc->GetDocShell()->DoClose();
+                SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
+                CPPUNIT_ASSERT(pTextDoc);
+                pTextDoc->GetDocShell()->DoClose();
             }
             else
                 mxMMComponent->dispose();
@@ -235,9 +235,9 @@ protected:
 
 int MMTest::documentStartPageNumber( int document ) const
 {   // See SwMailMergeOutputPage::documentStartPageNumber() .
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* shell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* shell = pTextDoc->GetDocShell()->GetWrtShell();
     IDocumentMarkAccess* marks = shell->GetDoc()->getIDocumentMarkAccess();
     // Unfortunately, the pages are marked using UNO bookmarks, which have internals names, so they cannot be referred to by their names.
     // Assume that there are no other UNO bookmarks than the ones used by mail merge, and that they are in the sorted order.
@@ -266,9 +266,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored
 {
     executeMailMerge();
 
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    sal_uInt16 nPhysPages = pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    sal_uInt16 nPhysPages = pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
     CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), nPhysPages);
 
     uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxMMComponent, uno::UNO_QUERY);
@@ -303,8 +303,8 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, "missing-default-line-c
     uno::Reference<beans::XPropertySet> xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY);
     // Lines do not have a line color.
     CPPUNIT_ASSERT( !xPropertySet->getPropertySetInfo()->hasPropertyByName( "LineColor" ));
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     uno::Reference< lang::XMultiServiceFactory > xFact( mxComponent, uno::UNO_QUERY );
     uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY );
     CPPUNIT_ASSERT( xDefaults.is());
@@ -369,9 +369,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
     // SwMailMergeOutputPage::documentStartPageNumber() ).
     executeMailMerge();
     // Here getPages() works on the source document, so get pages of the resulting one.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
     for( int doc = 0;
          doc < 10;
          ++doc )
@@ -383,9 +383,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
 DECLARE_SHELL_MAILMERGE_TEST(testPageBoundaries2Pages, "simple-mail-merge-2pages.odt", "10-testing-addresses.ods", "testing-addresses")
 {
     executeMailMerge();
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
     for( int doc = 0;
          doc < 10;
          ++doc )
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 625905da206e..4ed43afa89b4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -331,9 +331,9 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
 }
 
-DECLARE_ODFIMPORT_TEST(testCalcFtnCntnt, "ooo32780-1.odt")
+DECLARE_ODFIMPORT_TEST(testCalcFootnoteContent, "ooo32780-1.odt")
 {
-    //this was a CalcFtnCntnt crash
+    //this was a CalcFootnoteContent crash
 }
 
 DECLARE_ODFIMPORT_TEST(testMoveSubTree, "ooo77837-1.odt")
@@ -431,36 +431,36 @@ DECLARE_ODFIMPORT_TEST(testTdf89802, "tdf89802.fodt")
 
 DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     {
         pWrtShell->SelAll(); // Selects A1.
-        SwTxtNode& rCellEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+        SwTextNode& rCellEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
         // fdo#72486 This was "Hello.", i.e. a single select-all selected the whole document, not just the cell only.
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetText());
 
         pWrtShell->SelAll(); // Selects the whole table.
         pWrtShell->SelAll(); // Selects the whole document.
-        SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+        SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-        SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+        SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
         // This was "A1", i.e. Ctrl-A only selected the A1 cell of the table, not the whole document.
-        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
     }
 
     {
         pWrtShell->SttEndDoc(false); // Go to the end of the doc.
         pWrtShell->SelAll(); // And now that we're outside of the table, try Ctrl-A again.
-        SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+        SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
         // This was "Hello", i.e. Ctrl-A did not select the starting table.
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-        SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+        SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
     }
 
     {
@@ -468,17 +468,17 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
         // And make sure the table got deleted as well.
         SwNodes& rNodes = pWrtShell->GetDoc()->GetNodes();
         SwNodeIndex nNode(rNodes.GetEndOfExtras());
-        SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
+        SwContentNode* pContentNode = rNodes.GoNext(&nNode);
         // First content node was in a table -> table wasn't deleted.
-        CPPUNIT_ASSERT(!pCntntNode->FindTableNode());
+        CPPUNIT_ASSERT(!pContentNode->FindTableNode());
     }
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     // Ctrl-A
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
@@ -506,46 +506,46 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
 {
     // The test doc is special in that it starts with a table and it also has a footnote.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
     pWrtShell->SelAll(); // Selects the whole document.
-    SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+    SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
     // This was "Footnote.", as Ctrl-A also selected footnotes, but it should not.
-    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-    CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetTxt());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+    CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetText());
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
 {
     // The test doc is special in that it starts with a table and it also has a header.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
     pWrtShell->SelAll(); // Selects the whole document.
-    SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+    SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
     // This was "", as Ctrl-A also selected headers, but it should not.
-    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-    CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+    CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
 }
 
 DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, "spellmenu-redline.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     OUString aParaText;
     uno::Reference<linguistic2::XSpellAlternatives> xAlt;
     SwSpellPopup aPopup(pWrtShell, xAlt, aParaText);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 19c079ede5ef..2f45f74bd6d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -79,7 +79,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
 {
     // The problem was that in 'MSWordExportBase::SectionProperties' function in 'wrt8sty.cxx'
     // it checked if it 'IsPlausableSingleWordSection'.
-    // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrmFmt' objects.
+    // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrameFormat' objects.
     // One of the checks was 'do both formats have the same distance from the top and bottom ?'
     // This check is correct if both have headers or both don't have headers.
     // However - if one has a header, and the other one has an empty header (no header) - it is not correct to compare
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index a7f6078c6f7d..47589f6dafc0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -761,7 +761,7 @@ DECLARE_OOXMLEXPORT_TEST(testHeaderBorder, "header-border.docx")
     }
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTblpprShape, "tblppr-shape.docx")
+DECLARE_OOXMLEXPORT_TEST(testTablepprShape, "tblppr-shape.docx")
 {
     // Unhandled exception due to unexpected w:tblpPr resulted in not importing page size, either.
     uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2014bc870df4..66b844005f03 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1366,7 +1366,7 @@ DECLARE_OOXMLIMPORT_TEST(testTableWidth, "table_width.docx")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(xFrames->getByIndex(0), "FrameWidthPercent"));
 }
 
-DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTbllook, "conditionalstyles-tbllook.docx")
+DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTablelook, "conditionalstyles-tbllook.docx")
 {
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b42f05cd3f56..da6fdb5235ec 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -125,7 +125,7 @@ void SwTiledRenderingTest::testPostKeyEvent()
     pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
     pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
     // Did we manage to insert the character after the first one?
-    CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTxtNode()->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
 }
 
 void SwTiledRenderingTest::testPostMouseEvent()
@@ -155,19 +155,19 @@ void SwTiledRenderingTest::testSetTextSelection()
     pWrtShell->SelWrd();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
     // Did we indeed manage to select the second word?
-    CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetText());
 
     // Now use setTextSelection() to move the start of the selection 1000 twips left.
     Point aStart = pShellCrsr->GetSttPos();
     aStart.setX(aStart.getX() - 1000);
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_START, aStart.getX(), aStart.getY());
     // The new selection must include the first word, too -- but not the ending dot.
-    CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetText());
 
     // Next: test that LOK_SETTEXTSELECTION_RESET + LOK_SETTEXTSELECTION_END can be used to create a selection.
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_RESET, aStart.getX(), aStart.getY());
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aStart.getX() + 1000, aStart.getY());
-    CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetText());
 }
 
 void SwTiledRenderingTest::testSetGraphicSelection()
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e8ffdd78b976..43aeb6317661 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -143,18 +143,18 @@ SwDoc* SwUiWriterTest::createDoc(const char* pName)
         pName = "empty.odt";
     load(DATA_DIRECTORY, pName);
 
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    return pTxtDoc->GetDocShell()->GetDoc();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    return pTextDoc->GetDocShell()->GetDoc();
 }
 
 //Replacement tests
 
 static void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
 {
-    rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), first);
+    rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), first);
     rPaM.SetMark();
-    rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), end);
+    rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
 }
 
 static const OUString ORIGINAL_REPLACE_CONTENT("toto titi tutu");
@@ -171,15 +171,15 @@ void SwUiWriterTest::testReplaceForward()
 
     pDoc->getIDocumentContentOperations().InsertString(aPaM, ORIGINAL_REPLACE_CONTENT);
 
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     lcl_selectCharacters(aPaM, 5, 9);
     pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
 
-    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
 
     rUndoManager.Undo();
 
-    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
 }
 
 void SwUiWriterTest::testFdo75110()
@@ -220,16 +220,16 @@ void SwUiWriterTest::testReplaceBackward()
     SwPaM aPaM(aIdx);
 
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("toto titi tutu"));
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     lcl_selectCharacters(aPaM, 9, 5);
 
     pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
 
-    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
 
     rUndoManager.Undo();
 
-    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
 }
 
 void SwUiWriterTest::testFdo69893()
@@ -241,9 +241,9 @@ void SwUiWriterTest::testFdo69893()
     pWrtShell->SelAll(); // Selects the whole document.
 
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
     // Selection did not include the para after table, this was "B1".
-    CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetText());
 }
 
 void SwUiWriterTest::testFdo70807()
@@ -292,8 +292,8 @@ void SwUiWriterTest::testImportRTF()
     CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
 
     sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
-    CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTxtNode()->GetTxt());
-    CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTxtNode()->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTextNode()->GetText());
+    CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTextNode()->GetText());
 }
 
 void SwUiWriterTest::testExportRTF()
@@ -339,13 +339,13 @@ void SwUiWriterTest::testFdo74981()
     // create a document with an input field
     SwDoc* pDoc = createDoc();
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-    SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
+    SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFieldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
     pWrtShell->Insert(aField);
 
     // expect hints
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
-    SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(pTxtNode->HasHints());
+    SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(pTextNode->HasHints());
 
     // go to the begin of the paragraph and split this node
     pWrtShell->Left(CRSR_SKIP_CHARS, false, 100, false);
@@ -353,11 +353,11 @@ void SwUiWriterTest::testFdo74981()
 
     // expect only the second paragraph to have hints
     aIdx = SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1);
-    pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(pTxtNode->HasHints());
+    pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(pTextNode->HasHints());
     --aIdx;
-    pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(!pTxtNode->HasHints());
+    pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(!pTextNode->HasHints());
 }
 
 void SwUiWriterTest::testShapeTextboxSelect()
@@ -368,14 +368,14 @@ void SwUiWriterTest::testShapeTextboxSelect()
     SdrObject* pObject = pPage->GetObj(1);
     SwContact* pTextBox = static_cast<SwContact*>(pObject->GetUserCall());
     // First, make sure that pTextBox is a fly frame (textbox of a shape).
-    CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFmt()->Which()));
+    CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFormat()->Which()));
 
     // Then select it.
     pWrtShell->SelectObj(Point(), 0, pObject);
     const SdrMarkList& rMarkList = pWrtShell->GetDrawView()->GetMarkedObjectList();
     SwDrawContact* pShape = static_cast<SwDrawContact*>(rMarkList.GetMark(0)->GetMarkedSdrObj()->GetUserCall());
     // And finally make sure the shape got selected, not just the textbox itself.
-    CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFmt()->Which()));
+    CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFormat()->Which()));
 }
 
 void SwUiWriterTest::testShapeTextboxDelete()
@@ -400,22 +400,22 @@ void SwUiWriterTest::testCp1000071()
     SwDoc* pDoc = createDoc("cp1000071.odt");
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
-    const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
-    sal_uLong redlineStart0NodeIndex = rTbl[ 0 ]->Start()->nNode.GetIndex();
-    sal_Int32 redlineStart0Index = rTbl[ 0 ]->Start()->nContent.GetIndex();
-    sal_uLong redlineEnd0NodeIndex = rTbl[ 0 ]->End()->nNode.GetIndex();
-    sal_Int32 redlineEnd0Index = rTbl[ 0 ]->End()->nContent.GetIndex();
-    sal_uLong redlineStart1NodeIndex = rTbl[ 1 ]->Start()->nNode.GetIndex();
-    sal_Int32 redlineStart1Index = rTbl[ 1 ]->Start()->nContent.GetIndex();
-    sal_uLong redlineEnd1NodeIndex = rTbl[ 1 ]->End()->nNode.GetIndex();
-    sal_Int32 redlineEnd1Index = rTbl[ 1 ]->End()->nContent.GetIndex();
+    const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+    sal_uLong redlineStart0NodeIndex = rTable[ 0 ]->Start()->nNode.GetIndex();
+    sal_Int32 redlineStart0Index = rTable[ 0 ]->Start()->nContent.GetIndex();
+    sal_uLong redlineEnd0NodeIndex = rTable[ 0 ]->End()->nNode.GetIndex();
+    sal_Int32 redlineEnd0Index = rTable[ 0 ]->End()->nContent.GetIndex();
+    sal_uLong redlineStart1NodeIndex = rTable[ 1 ]->Start()->nNode.GetIndex();
+    sal_Int32 redlineStart1Index = rTable[ 1 ]->Start()->nContent.GetIndex();
+    sal_uLong redlineEnd1NodeIndex = rTable[ 1 ]->End()->nNode.GetIndex();
+    sal_Int32 redlineEnd1Index = rTable[ 1 ]->End()->nContent.GetIndex();
 
     // Change the document layout to be 2 columns, and then undo.
     pWrtShell->SelAll();
     SwSectionData section(CONTENT_SECTION, pWrtShell->GetUniqueSectionName());
     SfxItemSet set( pDoc->GetDocShell()->GetPool(), RES_COL, RES_COL, 0 );
-    SwFmtCol col;
+    SwFormatCol col;
     col.Init( 2, 0, 10000 );
     set.Put( col );
     pWrtShell->InsertSection( section, &set );
@@ -423,15 +423,15 @@ void SwUiWriterTest::testCp1000071()
     rUndoManager.Undo();
 
     // Check that redlines are the same like at the beginning.
-    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
-    CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTbl[ 0 ]->Start()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTbl[ 0 ]->Start()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTbl[ 0 ]->End()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTbl[ 0 ]->End()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTbl[ 1 ]->Start()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTbl[ 1 ]->Start()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTbl[ 1 ]->End()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTbl[ 1 ]->End()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+    CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTable[ 0 ]->Start()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTable[ 0 ]->Start()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTable[ 0 ]->End()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTable[ 0 ]->End()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTable[ 1 ]->Start()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTable[ 1 ]->Start()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTable[ 1 ]->End()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTable[ 1 ]->End()->nContent.GetIndex());
 }
 
 void SwUiWriterTest::testShapeTextboxVertadjust()
@@ -439,9 +439,9 @@ void SwUiWriterTest::testShapeTextboxVertadjust()
     SwDoc* pDoc = createDoc("shape-textbox-vertadjust.odt");
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
     SdrObject* pObject = pPage->GetObj(1);
-    SwFrmFmt* pFmt = static_cast<SwContact*>(pObject->GetUserCall())->GetFmt();
+    SwFrameFormat* pFormat = static_cast<SwContact*>(pObject->GetUserCall())->GetFormat();
     // This was SDRTEXTVERTADJUST_TOP.
-    CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFmt->GetTextVertAdjust().GetValue());
+    CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFormat->GetTextVertAdjust().GetValue());
 }
 
 void SwUiWriterTest::testShapeTextboxAutosize()
@@ -464,7 +464,7 @@ void SwUiWriterTest::testFdo82191()
 {
     SwDoc* pDoc = createDoc("fdo82191.odt");
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
-    std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+    std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
     // Make sure we have a single draw shape.
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), SwTextBoxHelper::getCount(pPage, aTextBoxes));
 
@@ -531,8 +531,8 @@ void SwUiWriterTest::testChineseConversionBlank()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(OUString(), pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(OUString(), pTextNode->GetText());
 
 }
 
@@ -557,8 +557,8 @@ void SwUiWriterTest::testChineseConversionNonChineseText()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTextNode->GetText());
 
 }
 
@@ -583,8 +583,8 @@ void SwUiWriterTest::testChineseConversionTraditionalToSimplified()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTextNode->GetText());
 
 }
 
@@ -609,8 +609,8 @@ void SwUiWriterTest::testChineseConversionSimplifiedToTraditional()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTextNode->GetText());
 
 }
 
@@ -648,7 +648,7 @@ void SwUiWriterTest::testAutoCorr()
     pWrtShell->Insert("tset");
     pWrtShell->AutoCorrect(corr, cIns);
     sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
-    CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTxtNode*>(pDoc->GetNodes()[nIndex])->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex])->GetText());
 
     //AutoCorrect with change style to bolt
     pWrtShell->Insert("Bolt");
@@ -830,8 +830,8 @@ void SwUiWriterTest::testTdf68183()
 
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(false, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(false, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
 
     // Then enable storing of RSID and make sure that the attribute is inserted.
     SW_MOD()->GetModuleConfig()->SetStoreRsid(true);
@@ -839,7 +839,7 @@ void SwUiWriterTest::testTdf68183()
     pWrtShell->DelToStartOfLine();
     pWrtShell->Insert2("X");
 
-    CPPUNIT_ASSERT_EQUAL(true, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+    CPPUNIT_ASSERT_EQUAL(true, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
 }
 
 void SwUiWriterTest::testCp1000115()
@@ -888,14 +888,14 @@ void SwUiWriterTest::testSearchWithTransliterate()
     //transliteration option set so that at least one of the search strings is not found
     sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
-    CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
     CPPUNIT_ASSERT_EQUAL(0,(int)case1);
     SearchOpt.searchString = "paragraph";
     SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
     //transliteration option set so that all search strings are found
     sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
     pShellCrsr = pWrtShell->getShellCrsr(true);
-    CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText());
     CPPUNIT_ASSERT_EQUAL(1,(int)case2);
 }
 
@@ -933,13 +933,13 @@ void SwUiWriterTest::testUndoCharAttribute()
         pCrsr->Move(fnMoveBackward);
     }
     // Check that correct text was selected
-    CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetText());
     // Apply a "Bold" attribute to selection
     SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
     rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
     SfxItemSet aSet( pDoc->GetAttrPool(), RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT);
     // Adds selected text's attributes to aSet
-    pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+    pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
     SfxPoolItem const * aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
     SfxPoolItem& ampPoolItem = aWeightItem;
     // Check that bold is active on the selection; checks if it's in aSet
@@ -948,7 +948,7 @@ void SwUiWriterTest::testUndoCharAttribute()
     rUndoManager.Undo();
     // Check that bold is no longer active
     aSet.ClearItem(RES_CHRATR_WEIGHT);
-    pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+    pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
     aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
     CPPUNIT_ASSERT_EQUAL((*aPoolItem == ampPoolItem), false);
 }
@@ -957,8 +957,8 @@ void SwUiWriterTest::testTdf86639()
 {
     SwDoc* pDoc = createDoc("tdf86639.rtf");
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-    SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName("Heading");
-    pWrtShell->SetTxtFmtColl(pColl);
+    SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName("Heading");
+    pWrtShell->SetTextFormatColl(pColl);
     OUString aExpected = pColl->GetAttrSet().GetFont().GetFamilyName();
     // This was Calibri, should be Liberation Sans.
     CPPUNIT_ASSERT_EQUAL(aExpected, getProperty<OUString>(getRun(getParagraph(1), 1), "CharFontName"));
@@ -970,7 +970,7 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
     pWrtShell->Down(true);
     SwSelBoxes aBoxes;
-    ::GetTblSel( *pWrtShell, aBoxes );
+    ::GetTableSel( *pWrtShell, aBoxes );
     CPPUNIT_ASSERT_EQUAL( 2, (int)aBoxes.size() );
     Point pos ( aBoxes[0]->GetCoordinates() );
     CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() );
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 95db0b4281b4..f31ac913105b 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -246,7 +246,7 @@ class CheckTable(unittest.TestCase):
         xAnchor = xTable.getAnchor()
 
     # check all properties on the anchor - shouldn't crash despite
-    # pointing to a non-SwTxtNode
+    # pointing to a non-SwTextNode
         xPropsInfo = xAnchor.getPropertySetInfo()
         for i in xPropsInfo.getProperties():
             try:
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 9e3189f8653a..6080438fcd1d 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -55,7 +55,7 @@ interface BaseText
     SID_ATTR_BRUSH_CHAR // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetTxtCtrlState ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -1180,26 +1180,26 @@ interface BaseText
     ]
     SID_ATTR_PARA_SPLIT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_KEEP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_WIDOWS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_ORPHANS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_PAGEBREAK // status(final|play)
@@ -1271,49 +1271,49 @@ interface BaseText
     ]
     SID_ATTR_PARA_HYPHENZONE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
-        ExecMethod = ExecTxtCtrl ;
+        ExecMethod = ExecTextCtrl ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_COLOR_BACKGROUND // status()
@@ -1342,68 +1342,68 @@ interface BaseText
     ]
     SID_ATTR_CHAR_COLOR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_UNDERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_OVERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_FLASH // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_STRIKEOUT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_UNDERLINE_DOUBLE // status(final|play)
@@ -1414,26 +1414,26 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CONTOUR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_SHADOWED // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SET_SUPER_SCRIPT
@@ -1450,20 +1450,20 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CASEMAP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_CHAR_DLG // status(final|play)
@@ -1484,8 +1484,8 @@ interface BaseText
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_GROW_FONT_SIZE // status(final|play)
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 53ed9110ef09..4bdcea5e7135 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -159,49 +159,49 @@ interface TextDrawText
     SID_ATTR_CHAR_WEIGHT // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_POSTURE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_UNDERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_OVERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_CONTOUR
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_SHADOWED
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_STRIKEOUT
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -473,7 +473,7 @@ interface TextDrawText
     SID_AUTOSPELL_CHECK
     [
         ExecMethod = Execute;
-        StateMethod = GetDrawTxtCtrlState
+        StateMethod = GetDrawTextCtrlState
     ]
 
     SID_SEARCH_DLG
@@ -622,13 +622,13 @@ interface TextDrawText
     FN_GROW_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SHRINK_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 }
@@ -639,57 +639,57 @@ interface TextDrawFont
     SID_ATTR_CHAR_FONT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_FONTHEIGHT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_COLOR // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index c00514fbc736..e0dd9ee1b259 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -24,9 +24,9 @@ struct SwLineNumber
     BOOL    CountLines          MID_LINENUMBER_COUNT;
     INT32   StartValue          MID_LINENUMBER_STARTVALUE;
 };
-item SwLineNumber SwFmtLineNumber;
+item SwLineNumber SwFormatLineNumber;
 
-struct INetFmt
+struct INetFormat
 {
     String      URL             MID_URL_URL;
     String      Target          MID_URL_TARGET;
@@ -34,7 +34,7 @@ struct INetFmt
     String      VisitedFormat   MID_URL_VISITED_FMT;
     String      UnvisitedFormat MID_URL_UNVISITED_FMT;
 };
-item INetFmt SwFmtINetFmt;
+item INetFormat SwFormatINetFormat;
 
 struct Drop
 {
@@ -44,7 +44,7 @@ struct Drop
     BOOL    WholeWord   MID_DROPCAP_WHOLE_WORD;
 //    String  Style       MID_DROPCAP_CHAR_STYLE_NAME;
 };
-item Drop SwFmtDrop;
+item Drop SwFormatDrop;
 
 struct Envelope
 {
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c7d9dfdda9e3..76987c789f3b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1846,7 +1846,7 @@ SfxVoidItem FormatColumns FN_FORMAT_COLUMN
     GroupId = GID_FORMAT;
 ]
 
-SwFmtDrop FormatDropcap FN_FORMAT_DROPCAPS
+SwFormatDrop FormatDropcap FN_FORMAT_DROPCAPS
 
 [
     /* flags: */
@@ -8785,7 +8785,7 @@ SfxUInt16Item NumNewStartAt FN_NUMBER_NEWSTART_AT
     GroupId = GID_FORMAT;
 ]
 
-SwFmtLineNumber LineNumber FN_FORMAT_LINENUMBER
+SwFormatLineNumber LineNumber FN_FORMAT_LINENUMBER
 
 [
     /* flags: */
@@ -8887,7 +8887,7 @@ SfxVoidItem JumpToFootnoteArea FN_TO_FOOTNOTE_AREA
     GroupId = GID_NAVIGATOR;
 ]
 
-SwFmtINetFmt HyperlinkAttributes FN_TXTATR_INET
+SwFormatINetFormat HyperlinkAttributes FN_TXTATR_INET
 
 [
     /* flags: */
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index f2f635e6d643..4df069ef3087 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -33,13 +33,13 @@ interface TextTable : BaseTextTable
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 /*
-    SvxFmtSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
+    SvxFormatSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;
         GroupId = GID_TABLE ;
     ]
-    SvxFmtKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
+    SvxFormatKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index a8821bbbec2d..ff59bddf23f8 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -25,16 +25,16 @@
 #include <IDocumentListItems.hxx>
 #include <doc.hxx>
 
-SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode )
+SwNodeNum::SwNodeNum( SwTextNode* pTextNode )
     : SwNumberTreeNode(),
-      mpTxtNode( pTxtNode ),
+      mpTextNode( pTextNode ),
       mpNumRule( 0 )
 {
 }
 
 SwNodeNum::SwNodeNum( SwNumRule* pNumRule )
     : SwNumberTreeNode(),
-      mpTxtNode( 0 ),
+      mpTextNode( 0 ),
       mpNumRule( pNumRule )
 {
 }
@@ -47,26 +47,26 @@ SwNodeNum::~SwNodeNum()
 
 void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
 {
-    OSL_ENSURE( GetNumRule() && GetTxtNode(),
+    OSL_ENSURE( GetNumRule() && GetTextNode(),
             "<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+        GetNumRule()->RemoveTextNode( *(GetTextNode()) );
     }
 
     mpNumRule = &rNumRule;
 
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+        GetNumRule()->AddTextNode( *(GetTextNode()) );
     }
 }
 
 SwPosition SwNodeNum::GetPosition() const
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::GetPosition()> - no text node set at <SwNodeNum> instance" );
-    return SwPosition(*mpTxtNode);
+    return SwPosition(*mpTextNode);
 }
 
 SwNumberTreeNode * SwNodeNum::Create() const
@@ -78,45 +78,45 @@ SwNumberTreeNode * SwNodeNum::Create() const
 
 void SwNodeNum::PreAdd()
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::PreAdd()> - no text node set at <SwNodeNum> instance" );
-    if ( !GetNumRule() && GetTxtNode() )
+    if ( !GetNumRule() && GetTextNode() )
     {
-        mpNumRule = GetTxtNode()->GetNumRule();
+        mpNumRule = GetTextNode()->GetNumRule();
     }
     OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PreAdd()> - no list style set at <SwNodeNum> instance" );
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+        GetNumRule()->AddTextNode( *(GetTextNode()) );
     }
 
     {
-        if ( GetTxtNode() &&
-             GetTxtNode()->GetNodes().IsDocNodes() )
+        if ( GetTextNode() &&
+             GetTextNode()->GetNodes().IsDocNodes() )
         {
-            GetTxtNode()->getIDocumentListItems().addListItem( *this );
+            GetTextNode()->getIDocumentListItems().addListItem( *this );
         }
     }
 }
 
 void SwNodeNum::PostRemove()
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::PostRemove()> - no text node set at <SwNodeNum> instance" );
     OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PostRemove()> - no list style set at <SwNodeNum> instance" );
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
-        GetTxtNode()->getIDocumentListItems().removeListItem( *this );
+        GetTextNode()->getIDocumentListItems().removeListItem( *this );
     }
 
     if ( GetNumRule() )
     {
-        if ( GetTxtNode() )
+        if ( GetTextNode() )
         {
-            GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+            GetNumRule()->RemoveTextNode( *(GetTextNode()) );
         }
         mpNumRule = 0;
     }
@@ -126,8 +126,8 @@ bool SwNodeNum::IsNotifiable() const
 {
     bool aResult = true;
 
-    if ( GetTxtNode() )
-        aResult = GetTxtNode()->IsNotifiable();
+    if ( GetTextNode() )
+        aResult = GetTextNode()->IsNotifiable();
 
     return aResult;
 }
@@ -136,8 +136,8 @@ bool SwNodeNum::IsNotificationEnabled() const
 {
     bool aResult = true;
 
-    if ( GetTxtNode() )
-        aResult = GetTxtNode()->IsNotificationEnabled();
+    if ( GetTextNode() )
+        aResult = GetTextNode()->IsNotificationEnabled();
 
     return aResult;
 }
@@ -167,11 +167,11 @@ bool SwNodeNum::IsCounted() const
 {
     bool aResult = false;
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
         // #i59559#
-        // <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
-        aResult = GetTxtNode()->IsCountedInList();
+        // <SwTextNode::IsCounted()> determines, if a text node is counted for numbering
+        aResult = GetTextNode()->IsCountedInList();
     }
     else
         aResult = SwNumberTreeNode::IsCounted();
@@ -208,18 +208,18 @@ bool SwNodeNum::IsCountedForNumbering() const
 {
     return IsCounted() &&
            ( IsPhantom() ||                 // phantoms
-             !GetTxtNode() ||               // root node
-             GetTxtNode()->HasNumber() ||   // text node
-             GetTxtNode()->HasBullet() );   // text node
+             !GetTextNode() ||               // root node
+             GetTextNode()->HasNumber() ||   // text node
+             GetTextNode()->HasBullet() );   // text node
 }
 
 void SwNodeNum::NotifyNode()
 {
     ValidateMe();
 
-    if (mpTxtNode)
+    if (mpTextNode)
     {
-        mpTxtNode->NumRuleChgd();
+        mpTextNode->NumRuleChgd();
     }
 }
 
@@ -228,13 +228,13 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
     bool bResult = false;
     const SwNodeNum & rTmpNode = static_cast<const SwNodeNum &>(rNode);
 
-    if (mpTxtNode == NULL && rTmpNode.mpTxtNode != NULL)
+    if (mpTextNode == NULL && rTmpNode.mpTextNode != NULL)
         bResult = true;
-    else if (mpTxtNode != NULL && rTmpNode.mpTxtNode != NULL)
+    else if (mpTextNode != NULL && rTmpNode.mpTextNode != NULL)
     {
         // #i83479# - refactoring
         // simplify comparison by comparing the indexes of the text nodes
-        bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() );
+        bResult = ( mpTextNode->GetIndex() < rTmpNode.mpTextNode->GetIndex() );
     }
 
     return bResult;
@@ -244,9 +244,9 @@ bool SwNodeNum::IsRestart() const
 {
     bool bIsRestart = false;
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
-        bIsRestart = GetTxtNode()->IsListRestart();
+        bIsRestart = GetTextNode()->IsListRestart();
     }
 
     return bIsRestart;
@@ -273,9 +273,9 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
 {
     SwNumberTree::tSwNumTreeNumber aResult = 1;
 
-    if ( IsRestart() && GetTxtNode() )
+    if ( IsRestart() && GetTextNode() )
     {
-        aResult = GetTxtNode()->GetActualListStartValue();
+        aResult = GetTextNode()->GetActualListStartValue();
     }
     else
     {
@@ -287,10 +287,10 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
 
             if (nLevel >= 0 && nLevel < MAXLEVEL)
             {
-                const SwNumFmt * pFmt = pRule->GetNumFmt( static_cast<sal_uInt16>(nLevel));
+                const SwNumFormat * pFormat = pRule->GetNumFormat( static_cast<sal_uInt16>(nLevel));
 
-                if (pFmt)
-                    aResult = pFmt->GetStart();
+                if (pFormat)
+                    aResult = pFormat->GetStart();
             }
         }
     }
@@ -343,10 +343,10 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
 
     if ( !bIsPhantom )
     {
-        SwTxtNode* pTxtNode( rNodeNum.GetTxtNode() );
-        if ( pTxtNode )
+        SwTextNode* pTextNode( rNodeNum.GetTextNode() );
+        if ( pTextNode )
         {
-            pTxtNode->RemoveFromList();
+            pTextNode->RemoveFromList();
             // --> clear all list attributes and the list style
             std::set<sal_uInt16> aResetAttrsArray;
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ID );
@@ -355,8 +355,8 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_RESTARTVALUE );
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISCOUNTED );
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_NUMRULE );
-            SwPaM aPam( *pTxtNode );
-            pTxtNode->GetDoc()->ResetAttrs( aPam, false,
+            SwPaM aPam( *pTextNode );
+            pTextNode->GetDoc()->ResetAttrs( aPam, false,
                                             aResetAttrsArray,
                                             false );
         }
@@ -364,17 +364,17 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
 }
 
 // #i81002#
-const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const
+const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const
 {
     const SwNodeNum* pPrecedingNodeNum( 0 );
 
     // #i83479#
-    SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
+    SwNodeNum aNodeNumForTextNode( const_cast<SwTextNode*>(&rTextNode) );
 
     pPrecedingNodeNum = dynamic_cast<const SwNodeNum*>(
                             GetRoot()
-                            ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTxtNode )
-                            : GetPrecedingNodeOf( aNodeNumForTxtNode ) );
+                            ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTextNode )
+                            : GetPrecedingNodeOf( aNodeNumForTextNode ) );
 
     return pPrecedingNodeNum;
 }
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index b52f9a476eef..4bab7aca9f32 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -337,13 +337,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
 
 // XAccessibleValue
 
-SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
+SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
 {
     assert(GetFrm());
     assert(GetFrm()->IsCellFrm());
 
     const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
-    return pCellFrm->GetTabBox()->GetFrmFmt();
+    return pCellFrm->GetTabBox()->GetFrameFormat();
 }
 
 //Implement TableCell currentValue
@@ -354,7 +354,7 @@ uno::Any SwAccessibleCell::getCurrentValue( )
     CHECK_FOR_DEFUNC( XAccessibleValue );
 
     uno::Any aAny;
-    aAny <<= GetTblBoxFormat()->GetTblBoxValue().GetValue();
+    aAny <<= GetTableBoxFormat()->GetTableBoxValue().GetValue();
     return aAny;
 }
 
@@ -368,8 +368,8 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
     bool bValid = (aNumber >>= fValue);
     if( bValid )
     {
-        SwTblBoxValue aValue( fValue );
-        GetTblBoxFormat()->SetFmtAttr( aValue );
+        SwTableBoxValue aValue( fValue );
+        GetTableBoxFormat()->SetFormatAttr( aValue );
     }
     return bValid;
 }
@@ -418,10 +418,10 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
     SolarMutexGuard g;
 
     ::com::sun::star::uno::Any strRet;
-    SwFrmFmt *pFrmFmt = GetTblBoxFormat();
-    assert(pFrmFmt);
+    SwFrameFormat *pFrameFormat = GetTableBoxFormat();
+    assert(pFrameFormat);
 
-    const SwTblBoxFormula& tbl_formula = pFrmFmt->GetTblBoxFormula();
+    const SwTableBoxFormula& tbl_formula = pFrameFormat->GetTableBoxFormula();
 
     OUString strFormula = ReplaceFourChar(tbl_formula.GetFormula());
     OUString strFor("Formula:");
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 1a9991ff7e1a..5049b560b5d2 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -26,7 +26,7 @@
 
 class SwCellFrm;
 class SwAccessibleTable;
-class SwFrmFmt;
+class SwFrameFormat;
 
 class SwAccessibleCell : public SwAccessibleContext,
                   ::com::sun::star::accessibility::XAccessibleValue,
@@ -113,7 +113,7 @@ public:
     ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
 private:
-    SwFrmFmt* GetTblBoxFormat() const;
+    SwFrameFormat* GetTableBoxFormat() const;
 
 public:
     virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 30b19f62f059..09e5372440cb 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -920,22 +920,22 @@ void SAL_CALL SwAccessibleContext::grabFocus()
     }
     else
     {
-        const SwCntntFrm *pCFrm = 0;
-        if( GetFrm()->IsCntntFrm() )
-            pCFrm = static_cast< const SwCntntFrm * >( GetFrm() );
+        const SwContentFrm *pCFrm = 0;
+        if( GetFrm()->IsContentFrm() )
+            pCFrm = static_cast< const SwContentFrm * >( GetFrm() );
         else if( GetFrm()->IsLayoutFrm() )
-            pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsCntnt();
+            pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent();
 
-        if( pCFrm && pCFrm->IsTxtFrm() )
+        if( pCFrm && pCFrm->IsTextFrm() )
         {
-            const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pCFrm );
-            const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
-            if( pTxtNd )
+            const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm );
+            const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+            if( pTextNd )
             {
                 // create pam for selection
-                SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
-                                pTxtFrm->GetOfst() );
-                SwPosition aStartPos( *pTxtNd, aIndex );
+                SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+                                pTextFrm->GetOfst() );
+                SwPosition aStartPos( *pTextNd, aIndex );
                 SwPaM aPaM( aStartPos );
 
                 // set PaM at cursor shell
@@ -1425,7 +1425,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren()
 {
     bool bRet( false );
 
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1442,7 +1442,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 {
     vcl::Window* pAdditionalAccessibleChild( 0 );
 
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1458,7 +1458,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 /** #i88070# - get all additional accessible children */
 void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren )
 {
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 435a2474be5a..d31a6f3be31c 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -593,32 +593,32 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sAttrName = "line-number:";
 
-        SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
+        SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
         SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm();
         sal_uLong nLineNum = 0;
-        SwTxtFrm* pTxtFrm = NULL;
-        SwTxtFrm* pCurrTxtFrm = NULL;
-        pTxtFrm = static_cast< SwTxtFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsCntnt());
+        SwTextFrm* pTextFrm = NULL;
+        SwTextFrm* pCurrTextFrm = NULL;
+        pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent());
         if (pCurrFrm->IsInFly())//such as, graphic,chart
         {
             SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm();
-            const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
+            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
             RndStdIds eAnchorId = rAnchor.GetAnchorId();
             if(eAnchorId == FLY_AS_CHAR)
             {
                 const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm();
-                if(pSwFrm->IsTxtFrm())
-                    pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSwFrm));
+                if(pSwFrm->IsTextFrm())
+                    pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm));
             }
         }
         else
-            pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm* >(pCurrFrm));
+            pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm));
         //check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer
-        SwFrm* pFrm = pCurrTxtFrm;
+        SwFrm* pFrm = pCurrTextFrm;
         while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
             pFrm = pFrm->GetUpper();
         if ( pFrm )
-            pCurrTxtFrm = NULL;
+            pCurrTextFrm = NULL;
         //check shape
         if(pCrsrShell->Imp()->GetDrawView())
         {
@@ -626,48 +626,48 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
             for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
             {
                 SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj();
-                SwFrmFmt* pFmt = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFmt();
-                const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
+                const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                 if( FLY_AS_CHAR != rAnchor.GetAnchorId() )
-                    pCurrTxtFrm = NULL;
+                    pCurrTextFrm = NULL;
             }
         }
         //calculate line number
-        if (pCurrTxtFrm && pTxtFrm)
+        if (pCurrTextFrm && pTextFrm)
         {
-            if (!(pCurrTxtFrm->IsInTab() || pCurrTxtFrm->IsInFtn()))
+            if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote()))
             {
-                while( pTxtFrm != pCurrTxtFrm )
+                while( pTextFrm != pCurrTextFrm )
                 {
                     //check header/footer
-                    pFrm = pTxtFrm;
+                    pFrm = pTextFrm;
                     while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
                         pFrm = pFrm->GetUpper();
                     if ( pFrm )
                     {
-                        pTxtFrm = static_cast< SwTxtFrm*>(pTxtFrm->GetNextCntntFrm());
+                        pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm());
                         continue;
                     }
-                    if (!(pTxtFrm->IsInTab() || pTxtFrm->IsInFtn() || pTxtFrm->IsInFly()))
-                        nLineNum += pTxtFrm->GetThisLines();
-                    pTxtFrm = static_cast< SwTxtFrm* >(pTxtFrm ->GetNextCntntFrm());
+                    if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly()))
+                        nLineNum += pTextFrm->GetThisLines();
+                    pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm());
                 }
                 SwPaM* pCaret = pCrsrShell->GetCrsr();
-                if (!pCurrTxtFrm->IsEmpty() && pCaret)
+                if (!pCurrTextFrm->IsEmpty() && pCaret)
                 {
-                    if (pCurrTxtFrm->IsTxtFrm())
+                    if (pCurrTextFrm->IsTextFrm())
                     {
                         const SwPosition* pPoint = NULL;
-                        if(pCurrTxtFrm->IsInFly())
+                        if(pCurrTextFrm->IsInFly())
                         {
-                            SwFlyFrm *pFlyFrm = pCurrTxtFrm->FindFlyFrm();
-                            const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
-                            pPoint= rAnchor.GetCntntAnchor();
+                            SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm();
+                            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+                            pPoint= rAnchor.GetContentAnchor();
                         }
                         else
                             pPoint = pCaret->GetPoint();
                         const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                        nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+                        nLineNum += pCurrTextFrm->GetLineCount( nActPos );
                     }
                     else//graphic, form, shape, etc.
                     {
@@ -676,7 +676,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
                         if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) )
                         {
                             const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                            nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+                            nLineNum += pCurrTextFrm->GetLineCount( nActPos );
                         }
                     }
                 }
@@ -722,8 +722,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sAttrName = "total-columns:";
 
-        const SwFmtCol &rFmtCol=pCurrPage->GetAttrSet()->GetCol();
-        sal_uInt16 nColCount=rFmtCol.GetNumCols();
+        const SwFormatCol &rFormatCol=pCurrPage->GetAttrSet()->GetCol();
+        sal_uInt16 nColCount=rFormatCol.GetNumCols();
         nColCount = nColCount>0?nColCount:1;
         sValue += sAttrName;
         sValue += OUString::number( nColCount ) ;
@@ -772,8 +772,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
             //section-total-columns
             sAttrName = "section-total-columns:";
-            const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
-            sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols();
+            const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+            sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols();
             nSctColCount = nSctColCount>0?nSctColCount:1;
             sValue += sAttrName;
             sValue += OUString::number( nSctColCount ) ;
@@ -868,24 +868,24 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
         if ( pCrsrShell )
         {
             SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr;
-            SwCntntNode* pPrevNode = NULL;
+            SwContentNode* pPrevNode = NULL;
             std::vector<SwFrm*> vFrmList;
             do
             {
                 if ( _pStartCrsr && _pStartCrsr->HasMark() )
                 {
-                    SwCntntNode* pCntntNode = _pStartCrsr->GetCntntNode();
-                    if ( pCntntNode == pPrevNode )
+                    SwContentNode* pContentNode = _pStartCrsr->GetContentNode();
+                    if ( pContentNode == pPrevNode )
                     {
                         continue;
                     }
-                    SwFrm* pFrm = pCntntNode ? pCntntNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
+                    SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
                     if ( pFrm )
                     {
                         vFrmList.push_back( pFrm );
                     }
 
-                    pPrevNode = pCntntNode;
+                    pPrevNode = pContentNode;
                 }
             }
 
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 90eabf85d952..57684d5e55d3 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -113,11 +113,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation
     if( pFFrm )
     {
         style = "style:";
-        SwCntntFrm* pCFrm;
-        pCFrm = pFFrm->ContainsCntnt();
+        SwContentFrm* pCFrm;
+        pCFrm = pFFrm->ContainsContent();
         if( pCFrm )
         {
-            SwCntntNode* pCNode = pCFrm->GetNode();
+            SwContentNode* pCNode = pCFrm->GetNode();
             if( pCNode )
             {
                 style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 84d728dec50b..c71e3fab4690 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -45,10 +45,10 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess
 SwAccessibleFootnote::SwAccessibleFootnote(
         SwAccessibleMap* pInitMap,
         bool bIsEndnote,
-        const SwFtnFrm *pFtnFrm ) :
+        const SwFootnoteFrm *pFootnoteFrm ) :
     SwAccessibleContext( pInitMap,
         bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
-        pFtnFrm )
+        pFootnoteFrm )
 {
     SolarMutexGuard aGuard;
 
@@ -56,12 +56,12 @@ SwAccessibleFootnote::SwAccessibleFootnote(
                                    : STR_ACCESS_FOOTNOTE_NAME;
 
     OUString sArg;
-    const SwTxtFtn *pTxtFtn =
-        static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
-    if( pTxtFtn )
+    const SwTextFootnote *pTextFootnote =
+        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+    if( pTextFootnote )
     {
         const SwDoc *pDoc = GetShell()->GetDoc();
-        sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+        sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
     SetName( GetResource( nResId, &sArg ) );
@@ -83,12 +83,12 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
         : STR_ACCESS_FOOTNOTE_DESC ;
 
     OUString sArg;
-    const SwTxtFtn *pTxtFtn =
-        static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
-    if( pTxtFtn )
+    const SwTextFootnote *pTextFootnote =
+        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+    if( pTextFootnote )
     {
         const SwDoc *pDoc = GetMap()->GetShell()->GetDoc();
-        sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+        sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
     return GetResource( nResId, &sArg );
@@ -128,10 +128,10 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm )
 {
-    const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr();
-    return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ;
+    const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr();
+    return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index b0862a25b661..d03b94f0e1ed 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -24,7 +24,7 @@
 #include <acccontext.hxx>
 
 class SwAccessibleMap;
-class SwFtnFrm;
+class SwFootnoteFrm;
 
 class SwAccessibleFootnote : public SwAccessibleContext
 {
@@ -34,7 +34,7 @@ protected:
 public:
     SwAccessibleFootnote( SwAccessibleMap* pInitMap,
                           bool bIsEndnote,
-                          const SwFtnFrm *pFtnFrm );
+                          const SwFootnoteFrm *pFootnoteFrm );
 
     // XAccessibleContext
 
@@ -64,7 +64,7 @@ public:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    static bool IsEndnote( const SwFtnFrm *pFrm );
+    static bool IsEndnote( const SwFootnoteFrm *pFrm );
 };
 
 #endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 9a34ec721236..6582cca998b0 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -433,12 +433,12 @@ const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
 OUString SwAccessibleFrame::GetFormattedPageNumber() const
 {
     sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum();
-    sal_uInt32 nFmt = GetFrm()->FindPageFrm()->GetPageDesc()
+    sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc()
                               ->GetNumType().GetNumberingType();
-    if( SVX_NUM_NUMBER_NONE == nFmt )
-        nFmt = SVX_NUM_ARABIC;
+    if( SVX_NUM_NUMBER_NONE == nFormat )
+        nFormat = SVX_NUM_ARABIC;
 
-    OUString sRet( FormatNumber( nPageNum, nFmt ) );
+    OUString sRet( FormatNumber( nPageNum, nFormat ) );
     return sRet;
 }
 
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index d5bb32af6ae3..bfffd2dc871a 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -99,22 +99,22 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
     sal_uInt8 nType = ND_TEXTNODE;
     if( pFlyFrm->Lower() )
     {
-         if( pFlyFrm->Lower()->IsNoTxtFrm() )
+         if( pFlyFrm->Lower()->IsNoTextFrm() )
         {
-            const SwCntntFrm *pCntFrm =
-                static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
+            const SwContentFrm *pCntFrm =
+                static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
             nType = pCntFrm->GetNode()->GetNodeType();
         }
     }
     else
     {
-        const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
+        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
         if( pNdIdx )
         {
-            const SwCntntNode *pCNd =
-                (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetCntntNode();
+            const SwContentNode *pCNd =
+                (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetContentNode();
             if( pCNd )
                 nType = pCNd->GetNodeType();
         }
@@ -132,10 +132,10 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
-    SetName( pFrmFmt->GetName() );
+    SetName( pFrameFormat->GetName() );
 
     bIsSelected = IsSelected();
 }
@@ -221,14 +221,14 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
     case RES_NAME_CHANGED:
         if(  pFlyFrm )
         {
-            const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-            assert(pFrmFmt == GetRegisteredIn() && "invalid frame");
+            const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+            assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
 
             const OUString sOldName( GetName() );
             assert( !pOld ||
                     static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName());
 
-            SetName( pFrmFmt->GetName() );
+            SetName( pFrameFormat->GetName() );
             assert( !pNew ||
                     static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName());
 
@@ -250,8 +250,8 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
 
     case RES_FMT_CHG:
         if( pOld &&
-            static_cast< const SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() &&
-            static_cast< const SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() )
+            static_cast< const SwFormatChg * >(pNew)->pChangedFormat == GetRegisteredIn() &&
+            static_cast< const SwFormatChg * >(pOld)->pChangedFormat->IsFormatInDTOR() )
             GetRegisteredInNonConst()->Remove( this );
         break;
 
@@ -306,18 +306,18 @@ bool SwAccessibleFrameBase::GetSelectedState( )
 
     // SELETED.
     SwFlyFrm* pFlyFrm = getFlyFrm();
-    const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
-    const SwPosition *pPos = pAnchor.GetCntntAnchor();
+    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+    const SwPosition *pPos = pAnchor.GetContentAnchor();
     if( !pPos )
         return false;
     int pIndex = pPos->nContent.GetIndex();
-    if( pPos->nNode.GetNode().GetTxtNode() )
+    if( pPos->nNode.GetNode().GetTextNode() )
     {
         SwPaM* pCrsr = GetCrsr();
         if( pCrsr != NULL )
         {
-            const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+            const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
             sal_uLong nHere = pNode->GetIndex();
 
             // iterate over ring
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index c6c40fa28088..ce9d3d875e3e 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const
     }
     else if ( mpDrawObj )
     {
-        const SwFrmFmt* mpFrmFmt = ::FindFrmFmt( mpDrawObj );
-        bRet = mpFrmFmt
-               && (FLY_AS_CHAR == mpFrmFmt->GetAnchor().GetAnchorId());
+        const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj );
+        bRet = mpFrameFormat
+               && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId());
     }
     else if ( mpWindow )
     {
@@ -351,9 +351,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
         OSL_ENSURE( pContact, "sdr contact is missing" );
         if( pContact )
         {
-            const SwFrmFmt *pFrmFmt = pContact->GetFmt();
-            OSL_ENSURE( pFrmFmt, "frame format is missing" );
-            if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+            const SwFrameFormat *pFrameFormat = pContact->GetFormat();
+            OSL_ENSURE( pFrameFormat, "frame format is missing" );
+            if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pContact->GetAnchorFrm();
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 773e1baa4beb..05168a432a36 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -76,7 +76,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
             }
         }
     }
-    else if( rFrm.IsTxtFrm() )
+    else if( rFrm.IsTextFrm() )
     {
         const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
         if ( pObjs )
@@ -153,7 +153,7 @@ bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
 {
     return ( rFrm.IsPageFrm() &&
              static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
-           ( rFrm.IsTxtFrm() &&
+           ( rFrm.IsTextFrm() &&
              rFrm.GetDrawObjs() );
 }
 
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 68f9fbfd4b48..348eabc7bca1 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -46,7 +46,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
                 aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
             }
         }
-        else if( rFrm.IsTxtFrm() )
+        else if( rFrm.IsTextFrm() )
         {
             const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
             if ( pObjs && pObjs->size() )
@@ -112,7 +112,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
                     ? (*pObjs)[nNextObj++]->GetDrawObj()
                     : static_cast< const SdrObject *>( 0 );
         }
-        else if( rFrm.IsTxtFrm() )
+        else if( rFrm.IsTextFrm() )
         {
             const SwSortedObjs* pObjs = rFrm.GetDrawObjs();
             const size_t nObjsCount = pObjs ? pObjs->size() : 0;
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 661ae5e1abda..ed4138e4c1d4 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if (aURL.GetMap())
         return AccessibleRole::IMAGE_MAP;
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 09d2d69a70b2..7b9e25b94382 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -44,22 +44,22 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( size_t nHPos,
 {
 }
 
-const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
+const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const
 {
-    const SwTxtAttr *pTxtAttr = 0;
+    const SwTextAttr *pTextAttr = 0;
     if( xPara.is() && xPara->GetMap() )
     {
-        const SwTxtNode *pTxtNd = xPara->GetTxtNode();
-        const SwpHints *pHints = pTxtNd->GetpSwpHints();
+        const SwTextNode *pTextNd = xPara->GetTextNode();
+        const SwpHints *pHints = pTextNd->GetpSwpHints();
         if( pHints && nHintPos < pHints->Count() )
         {
-            const SwTxtAttr *pHt = (*pHints)[nHintPos];
+            const SwTextAttr *pHt = (*pHints)[nHintPos];
             if( RES_TXTATR_INETFMT == pHt->Which() )
-                pTxtAttr = pHt;
+                pTextAttr = pHt;
         }
     }
 
-    return pTxtAttr;
+    return pTextAttr;
 }
 
 // XAccessibleAction
@@ -78,24 +78,24 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
 
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
-    if( pTxtAttr )
+    const SwTextAttr *pTextAttr = GetTextAttr();
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        if( !rINetFmt.GetValue().isEmpty() )
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        if( !rINetFormat.GetValue().isEmpty() )
         {
             SwViewShell *pVSh = xPara->GetShell();
             if( pVSh )
             {
-                LoadURL(*pVSh, rINetFmt.GetValue(), URLLOAD_NOFILTER,
-                         rINetFmt.GetTargetFrame());
-                OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(),
+                LoadURL(*pVSh, rINetFormat.GetValue(), URLLOAD_NOFILTER,
+                         rINetFormat.GetTargetFrame());
+                OSL_ENSURE( pTextAttr == rINetFormat.GetTextINetFormat(),
                          "lost my txt attr" );
-                const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt();
-                if( pTxtAttr2 )
+                const SwTextINetFormat* pTextAttr2 = rINetFormat.GetTextINetFormat();
+                if( pTextAttr2 )
                 {
-                    const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisited(true);
-                    const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisitedValid(true);
+                    const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisited(true);
+                    const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisitedValid(true);
                 }
                 bRet = true;
             }
@@ -112,11 +112,11 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
 
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
-    if( pTxtAttr )
+    const SwTextAttr *pTextAttr = GetTextAttr();
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        return rINetFmt.GetValue();
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        return rINetFormat.GetValue();
     }
 
     return OUString();
@@ -169,12 +169,12 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
 
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
+    const SwTextAttr *pTextAttr = GetTextAttr();
     OUString retText;
-    if( pTxtAttr )
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        retText = OUString( rINetFmt.GetValue() );
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        retText = OUString( rINetFormat.GetValue() );
     }
     uno::Any aRet;
     aRet <<= retText;
@@ -199,12 +199,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid(  )
     SolarMutexGuard aGuard;
     if (xPara.is())
     {
-        const SwTxtAttr *pTxtAttr = GetTxtAttr();
+        const SwTextAttr *pTextAttr = GetTextAttr();
         OUString sText;
-        if( pTxtAttr )
+        if( pTextAttr )
         {
-            const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-            sText = OUString( rINetFmt.GetValue() );
+            const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+            sText = OUString( rINetFormat.GetValue() );
             OUString sToken = "#";
             sal_Int32 nPos = sText.indexOf(sToken);
             if (nPos==0)//document link
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index ba71c62d2f57..06570c899969 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -26,7 +26,7 @@
 #include <fmtinfmt.hxx>
 
 class SwAccessibleParagraph;
-class SwTxtAttr;
+class SwTextAttr;
 
 class SwAccessibleHyperlink :
         public ::cppu::WeakImplHelper<
@@ -43,7 +43,7 @@ class SwAccessibleHyperlink :
                            SwAccessibleParagraph *p,
                               sal_Int32 nStt, sal_Int32 nEnd    );
 
-    const SwTxtAttr *GetTxtAttr() const;
+    const SwTextAttr *GetTextAttr() const;
     void Invalidate();
 
 public:
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index eb081e77c9ba..e35b58718a70 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -23,21 +23,21 @@
 #include <cppuhelper/weakref.hxx>
 #include <map>
 
-class SwTxtAttr;
+class SwTextAttr;
 namespace com { namespace sun { namespace star {
     namespace accessibility { class XAccessibleHyperlink; }
 } } }
 
-typedef ::std::less< const SwTxtAttr * > SwTxtAttrPtrLess;
+typedef ::std::less< const SwTextAttr * > SwTextAttrPtrLess;
 
 class SwAccessibleHyperTextData
 {
 public:
-    typedef const SwTxtAttr *                                           key_type;
+    typedef const SwTextAttr *                                           key_type;
     typedef ::com::sun::star::uno::WeakReference<
         com::sun::star::accessibility::XAccessibleHyperlink >           mapped_type;
     typedef std::pair<const key_type,mapped_type>                       value_type;
-    typedef SwTxtAttrPtrLess                                            key_compare;
+    typedef SwTextAttrPtrLess                                            key_compare;
     typedef std::map<key_type,mapped_type,key_compare>::iterator        iterator;
 private:
     std::map<key_type,mapped_type,key_compare> maMap;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b4c0782d42b8..7e47ad3c6dd5 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -556,7 +556,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
 // There are two reason for this. First of all, a new accessible shape
 // for the XShape might be created soon. It's then cheaper if the XShape
 // still exists. The other reason are situations where an accessible shape
-// is destroyed within an SwFrmFmt::Modify. In this case, destroying
+// is destroyed within an SwFrameFormat::Modify. In this case, destroying
 // the XShape at the same time (indirectly by destroying the accessible
 // shape) leads to an assert, because a client of the Modify is destroyed
 // within a Modify call.
@@ -1162,14 +1162,14 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                 bool bMarked = false;
                 SwAccessibleChild pFrm( (*aIter).first );
 
-                const SwFrmFmt *pFrmFmt = (*aIter).first ? ::FindFrmFmt( (*aIter).first ) : nullptr;
-                if( !pFrmFmt )
+                const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr;
+                if( !pFrameFormat )
                 {
                     ++aIter;
                     continue;
                 }
-                const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
-                const SwPosition *pPos = pAnchor.GetCntntAnchor();
+                const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+                const SwPosition *pPos = pAnchor.GetContentAnchor();
 
                 if(pAnchor.GetAnchorId() == FLY_AT_PAGE)
                 {
@@ -1186,12 +1186,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                     ++aIter;
                     continue;
                 }
-                if( pPos->nNode.GetNode().GetTxtNode() )
+                if( pPos->nNode.GetNode().GetTextNode() )
                 {
                     int pIndex = pPos->nContent.GetIndex();
                     if( pCrsr != NULL )
                     {
-                        const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+                        const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
                         sal_uLong nHere = pNode->GetIndex();
 
                         for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
@@ -1286,10 +1286,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                     if (bFrmChanged)
                     {
                         const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
-                        const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-                        if (pFrmFmt)
+                        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                        if (pFrameFormat)
                         {
-                            const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                            const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                             if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                             {
                                 uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent();
@@ -1335,16 +1335,16 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                 while(nStartIndex <= nEndIndex)
                 {
                     SwFrm *pFrm = NULL;
-                    if(nStartIndex.GetNode().IsCntntNode())
+                    if(nStartIndex.GetNode().IsContentNode())
                     {
-                        SwCntntNode* pCNd = static_cast<SwCntntNode*>(&(nStartIndex.GetNode()));
-                        pFrm = SwIterator<SwFrm, SwCntntNode>(*pCNd).First();
+                        SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode()));
+                        pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First();
                     }
                     else if( nStartIndex.GetNode().IsTableNode() )
                     {
                         SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode()));
-                        SwTableFmt* pFmt = const_cast<SwTableFmt*>(pTable->GetTable().GetFrmFmt());
-                        pFrm = SwIterator<SwFrm, SwTableFmt>(*pFmt).First();
+                        SwTableFormat* pFormat = const_cast<SwTableFormat*>(pTable->GetTable().GetFrameFormat());
+                        pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First();
                     }
 
                     if( pFrm && mpFrmMap)
@@ -1557,10 +1557,10 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
             if (pAccShape)
             {
                 SdrObject *pObj = GetSdrObjectFromXShape(pAccShape->GetXShape());
-                SwFrmFmt *pFrmFmt = pObj ? FindFrmFmt( pObj ) : NULL;
-                if (pFrmFmt)
+                SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : NULL;
+                if (pFrameFormat)
                 {
-                    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                     if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                     {
                         uno::Reference< XAccessible > xPara = pAccShape->getAccessibleParent();
@@ -1891,7 +1891,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                 case FRM_TXT:
                     mnPara++;
                     pAcc = new SwAccessibleParagraph( *this,
-                                    static_cast< const SwTxtFrm& >( *pFrm ) );
+                                    static_cast< const SwTextFrm& >( *pFrm ) );
                     break;
                 case FRM_HEADER:
                     pAcc = new SwAccessibleHeaderFooter( this,
@@ -1903,13 +1903,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                     break;
                 case FRM_FTN:
                     {
-                        const SwFtnFrm *pFtnFrm =
-                            static_cast < const SwFtnFrm * >( pFrm );
+                        const SwFootnoteFrm *pFootnoteFrm =
+                            static_cast < const SwFootnoteFrm * >( pFrm );
                         bool bIsEndnote =
-                            SwAccessibleFootnote::IsEndnote( pFtnFrm );
+                            SwAccessibleFootnote::IsEndnote( pFootnoteFrm );
                         pAcc = new SwAccessibleFootnote( this, bIsEndnote,
                                     /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
-                                    pFtnFrm );
+                                    pFootnoteFrm );
                     }
                     break;
                 case FRM_FLY:
@@ -2318,7 +2318,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
                 (xParentAccImpl.is() || xShapeAccImpl.is()) )
             {
                 // Keep a reference to the XShape to avoid that it
-                // is deleted with a SwFrmFmt::Modify.
+                // is deleted with a SwFrameFormat::Modify.
                 uno::Reference < drawing::XShape > xShape(
                     const_cast< SdrObject * >( pObj )->getUnoShape(),
                     uno::UNO_QUERY );
@@ -2469,7 +2469,7 @@ so the new graphic accessible 'parent is NULL,
 so run here: save the parent's SwFrm not the accessible object parent,
 */
             bool bIsValidFrm = false;
-            bool bIsTxtParent = false;
+            bool bIsTextParent = false;
             if (aFrmOrObj.GetSwFrm())
             {
                 int nType = pFrm->GetType();
@@ -2483,12 +2483,12 @@ so run here: save the parent's SwFrm not the accessible object parent,
                 int nType = pParent->GetType();
                 if (FRM_TXT == nType)
                 {
-                    bIsTxtParent =true;
+                    bIsTextParent =true;
                 }
             }
 //          bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
 //          bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
-            if((bIsValidFrm || bIsTxtParent) )
+            if((bIsValidFrm || bIsTextParent) )
             {
                 if( GetShell()->ActionPend() )
                 {
@@ -2544,9 +2544,9 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm )
+void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
 {
-    SwAccessibleChild aFrmOrObj( &rTxtFrm );
+    SwAccessibleChild aFrmOrObj( &rTextFrm );
     if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
@@ -2922,17 +2922,17 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster,
 }
 
 // invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph
-void SwAccessibleMap::InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
                                                   const bool _bFrom )
 {
-    _InvalidateRelationSet( &_rTxtFrm, _bFrom );
+    _InvalidateRelationSet( &_rTextFrm, _bFrom );
 }
 
 // invalidation of text selection of a paragraph
-void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
+void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
 {
     // first, see if this frame is accessible, and if so, get the respective
-    SwAccessibleChild aFrmOrObj( &_rTxtFrm );
+    SwAccessibleChild aFrmOrObj( &_rTextFrm );
     if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
@@ -2960,7 +2960,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::CARET_OR_STATES,
                     pAccImpl,
-                    SwAccessibleChild( &_rTxtFrm ),
+                    SwAccessibleChild( &_rTextFrm ),
                     AccessibleStates::TEXT_SELECTION_CHANGED );
                 AppendEvent( aEvent );
             }
@@ -3443,8 +3443,8 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
         // for a selection the cursor has to have a mark.
         // for safety reasons assure that point and mark are in text nodes
         if ( pCrsr->HasMark() &&
-             pCrsr->GetPoint()->nNode.GetNode().IsTxtNode() &&
-             pCrsr->GetMark()->nNode.GetNode().IsTxtNode() )
+             pCrsr->GetPoint()->nNode.GetNode().IsTextNode() &&
+             pCrsr->GetMark()->nNode.GetNode().IsTextNode() )
         {
             SwPosition* pStartPos = pCrsr->Start();
             SwPosition* pEndPos = pCrsr->End();
@@ -3452,24 +3452,24 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
             SwNodeIndex aIdx( pStartPos->nNode );
             for ( ; aIdx.GetIndex() <= pEndPos->nNode.GetIndex(); ++aIdx )
             {
-                SwTxtNode* pTxtNode( aIdx.GetNode().GetTxtNode() );
-                if ( pTxtNode )
+                SwTextNode* pTextNode( aIdx.GetNode().GetTextNode() );
+                if ( pTextNode )
                 {
                     // loop on all text frames registered at the text node.
-                    SwIterator<SwTxtFrm,SwTxtNode> aIter( *pTxtNode );
-                    for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm; pTxtFrm = aIter.Next() )
+                    SwIterator<SwTextFrm,SwTextNode> aIter( *pTextNode );
+                    for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm; pTextFrm = aIter.Next() )
                         {
                             uno::WeakReference < XAccessible > xWeakAcc;
                             SwAccessibleContextMap_Impl::iterator aMapIter =
-                                                    mpFrmMap->find( pTxtFrm );
+                                                    mpFrmMap->find( pTextFrm );
                             if( aMapIter != mpFrmMap->end() )
                             {
                                 xWeakAcc = (*aMapIter).second;
                                 SwAccessibleParaSelection aDataEntry(
-                                    pTxtNode == &(pStartPos->nNode.GetNode())
+                                    pTextNode == &(pStartPos->nNode.GetNode())
                                                 ? pStartPos->nContent.GetIndex()
                                                 : 0,
-                                    pTxtNode == &(pEndPos->nNode.GetNode())
+                                    pTextNode == &(pEndPos->nNode.GetNode())
                                                 ? pEndPos->nContent.GetIndex()
                                                 : -1 );
                                 SwAccessibleSelectedParas_Impl::value_type
@@ -3552,13 +3552,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                                 static_cast<SwAccessibleContext*>( xAcc.get() ) );
                     if ( xAccImpl.is() && xAccImpl->GetFrm() )
                     {
-                        const SwTxtFrm* pTxtFrm(
-                            dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                        OSL_ENSURE( pTxtFrm,
+                        const SwTextFrm* pTextFrm(
+                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+                        OSL_ENSURE( pTextFrm,
                                 "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                        if ( pTxtFrm )
+                        if ( pTextFrm )
                         {
-                            InvalidateParaTextSelection( *pTxtFrm );
+                            InvalidateParaTextSelection( *pTextFrm );
                         }
                     }
                 }
@@ -3580,13 +3580,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                             static_cast<SwAccessibleContext*>( xAcc.get() ) );
                 if ( xAccImpl.is() && xAccImpl->GetFrm() )
                 {
-                    const SwTxtFrm* pTxtFrm(
-                            dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                    OSL_ENSURE( pTxtFrm,
+                    const SwTextFrm* pTextFrm(
+                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+                    OSL_ENSURE( pTextFrm,
                             "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                    if ( pTxtFrm )
+                    if ( pTextFrm )
                     {
-                        InvalidateParaTextSelection( *pTxtFrm );
+                        InvalidateParaTextSelection( *pTextFrm );
                     }
                 }
             }
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 4be902866469..cee5edbcf05b 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -41,18 +41,18 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using utl::AccessibleRelationSetHelper;
 
-const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const
+const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const
 {
-    const SwNoTxtNode *pNd  = 0;
+    const SwNoTextNode *pNd  = 0;
     const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm *>( GetFrm() );
-    if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
+    if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
     {
-        const SwCntntFrm *pCntFrm =
-            static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
-        const SwCntntNode* pSwCntntNode = pCntFrm->GetNode();
-        if(pSwCntntNode != NULL)
+        const SwContentFrm *pCntFrm =
+            static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
+        const SwContentNode* pSwContentNode = pCntFrm->GetNode();
+        if(pSwContentNode != NULL)
         {
-            pNd = pSwCntntNode->GetNoTxtNode();
+            pNd = pSwContentNode->GetNoTextNode();
         }
     }
 
@@ -64,11 +64,11 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
         sal_Int16 nInitRole,
         const SwFlyFrm* pFlyFrm  ) :
     SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrm ),
-    aDepend( this, const_cast < SwNoTxtNode * >( GetNoTxtNode() ) ),
+    aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
     msTitle(),
     msDesc()
 {
-    const SwNoTxtNode* pNd = GetNoTxtNode();
+    const SwNoTextNode* pNd = GetNoTextNode();
     // #i73249#
     // consider new attributes Title and Description
     if( pNd )
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
             return; // probably was deleted - avoid doing anything
     }
 
-    const SwNoTxtNode *pNd = GetNoTxtNode();
+    const SwNoTextNode *pNd = GetNoTextNode();
     OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
     switch( nWhich )
     {
@@ -308,7 +308,7 @@ throw (uno::RuntimeException, std::exception)
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
 
     sal_Int32 nCount = 0;
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if(aURL.GetMap() || !aURL.GetURL().isEmpty())
         nCount = 1;
@@ -325,7 +325,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if( nLinkIndex > 0 )
         throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 4776cdb1a471..196b8eaf6c30 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -30,7 +30,7 @@ namespace com { namespace star {
 } }
 
 class SwFlyFrm;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwAccessibleNoTextHyperlink;
 
 class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
@@ -47,7 +47,7 @@ class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
 protected:
     virtual ~SwAccessibleNoTextFrame();
 
-    const SwNoTxtNode *GetNoTxtNode() const;
+    const SwNoTextNode *GetNoTextNode() const;
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 4044c3e541a4..ba6117b33c8b 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount()
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -72,7 +72,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
         throw lang::IndexOutOfBoundsException();
 
     bool bRet = false;
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -113,7 +113,7 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
     if(nIndex < 0 || nIndex >= getAccessibleActionCount())
         throw lang::IndexOutOfBoundsException();
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -141,7 +141,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL
         throw lang::IndexOutOfBoundsException();
 
     bool bIsValid = false;
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -197,7 +197,7 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject(
     if(nIndex < 0 || nIndex >= getAccessibleActionCount())
         throw lang::IndexOutOfBoundsException();
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     OUString retText;
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
@@ -231,7 +231,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid(  )
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
 
     if( aURL.GetMap() || !aURL.GetURL().isEmpty() )
         return sal_True;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 0dae5fef8256..79a9b9817bc8 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -37,9 +37,9 @@ class SwAccessibleNoTextHyperlink :
     ::rtl::Reference< SwAccessibleNoTextFrame > xFrame;
     const SwFrm *mpFrm;
 
-    SwFrmFmt *GetFmt()
+    SwFrameFormat *GetFormat()
     {
-        return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFmt();
+        return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFormat();
     }
 public:
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 87580385fe97..fab40746f65c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -119,12 +119,12 @@ namespace com { namespace sun { namespace star {
 const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
 
-const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const
+const SwTextNode* SwAccessibleParagraph::GetTextNode() const
 {
     const SwFrm* pFrm = GetFrm();
-    OSL_ENSURE( pFrm->IsTxtFrm(), "The text frame has mutated!" );
+    OSL_ENSURE( pFrm->IsTextFrm(), "The text frame has mutated!" );
 
-    const SwTxtNode* pNode = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
+    const SwTextNode* pNode = static_cast<const SwTextFrm*>(pFrm)->GetTextNode();
     OSL_ENSURE( pNode != NULL, "A text frame without a text node." );
 
     return pNode;
@@ -150,7 +150,7 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
 
     if( pCaret != NULL )
     {
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
 
         // check whether the point points into 'our' node
         SwPosition* pPoint = pCaret->GetPoint();
@@ -162,8 +162,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
             if(!GetPortionData().IsValidCorePosition( nIndex ) ||
                 ( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
             {
-                const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
-                bool bFormat = (pTxtFrm && pTxtFrm->HasPara());
+                const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+                bool bFormat = (pTextFrm && pTextFrm->HasPara());
                 if(bFormat)
                 {
                     ClearPortionData();
@@ -208,7 +208,7 @@ bool SwAccessibleParagraph::GetSelection(
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -346,8 +346,8 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection )
 
 bool SwAccessibleParagraph::IsHeading() const
 {
-    const SwTxtNode *pTxtNd = GetTxtNode();
-    return pTxtNd->IsOutline();
+    const SwTextNode *pTextNd = GetTextNode();
+    return pTextNd->IsOutline();
 }
 
 void SwAccessibleParagraph::GetStates(
@@ -369,9 +369,9 @@ void SwAccessibleParagraph::GetStates(
 
     // FOCUSED (simulates node index of cursor)
     SwPaM* pCaret = GetCursor( false ); // #i27301# - consider adjusted method signature
-    const SwTxtNode* pTxtNd = GetTxtNode();
-    if( pCaret != 0 && pTxtNd != 0 &&
-        pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
+    const SwTextNode* pTextNd = GetTextNode();
+    if( pCaret != 0 && pTextNd != 0 &&
+        pTextNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
         nOldCaretPos != -1)
     {
         vcl::Window *pWin = GetWindow();
@@ -532,9 +532,9 @@ void SwAccessibleParagraph::_InvalidateFocus()
 
 SwAccessibleParagraph::SwAccessibleParagraph(
         SwAccessibleMap& rInitMap,
-        const SwTxtFrm& rTxtFrm )
-    : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) // #i108125#
-    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTxtFrm )
+        const SwTextFrm& rTextFrm )
+    : SwClient( const_cast<SwTextNode*>(rTextFrm.GetTextNode()) ) // #i108125#
+    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrm )
     , sDesc()
     , pPortionData( NULL )
     , pHyperTextData( NULL )
@@ -543,7 +543,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
     //Get the real heading level, Heading1 ~ Heading10
     , nHeadingLevel (-1)
     , aSelectionHelper( *this )
-    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // #i108125#
+    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrm ) ) // #i108125#
     , m_bLastHasSelection(false)  //To add TEXT_SELECTION_CHANGED event
 {
     SolarMutexGuard aGuard;
@@ -577,13 +577,13 @@ void SwAccessibleParagraph::UpdatePortionData()
 {
     // obtain the text frame
     OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
-    const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
 
     // build new portion data
     delete pPortionData;
     pPortionData = new SwAccessiblePortionData(
-        pFrm->GetTxtNode(), GetMap()->GetShell()->GetViewOptions() );
+        pFrm->GetTextNode(), GetMap()->GetShell()->GetViewOptions() );
     pFrm->VisitPortions( *pPortionData );
 
     OSL_ENSURE( pPortionData != NULL, "UpdatePortionData() failed" );
@@ -637,10 +637,10 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
                         GetPortionData().GetModelPosition( nEndIndex );
 
     // create UNO cursor
-    SwTxtNode* pTxtNode = const_cast<SwTxtNode*>( GetTxtNode() );
-    SwIndex aIndex( pTxtNode, nStart );
-    SwPosition aStartPos( *pTxtNode, aIndex );
-    SwUnoCrsr* pUnoCursor = pTxtNode->GetDoc()->CreateUnoCrsr( aStartPos );
+    SwTextNode* pTextNode = const_cast<SwTextNode*>( GetTextNode() );
+    SwIndex aIndex( pTextNode, nStart );
+    SwPosition aStartPos( *pTextNode, aIndex );
+    SwUnoCrsr* pUnoCursor = pTextNode->GetDoc()->CreateUnoCrsr( aStartPos );
     pUnoCursor->SetMark();
     pUnoCursor->GetMark()->nContent = nEnd;
 
@@ -675,10 +675,10 @@ bool SwAccessibleParagraph::IsValidRange(
 
 SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
 {
-    const SwTxtNode* pTxtNd = GetTxtNode();
-    if( pTxtNd )
+    const SwTextNode* pTextNd = GetTextNode();
+    if( pTextNd )
     {
-        const SwSectionNode * pSectNd = pTxtNd->FindSectionNode();
+        const SwSectionNode * pSectNd = pTextNd->FindSectionNode();
         if( pSectNd )
         {
             const SwSection * pSect = &pSectNd->GetSection();
@@ -691,7 +691,7 @@ SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
                 for(size_t nIndex = 0; nIndex<nSize; nIndex++ )
                 {
                     pSortBase = pTOXBaseSect->GetTOXSortTabBases()[nIndex];
-                    if( pSortBase->pTOXNd == pTxtNd )
+                    if( pSortBase->pTOXNd == pTextNd )
                         break;
                 }
 
@@ -713,7 +713,7 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
     if ( pCrSr )
     {
         SwPosition* pStart = pCrSr->Start();
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         if ( pNode )
         {
             const SwDoc* pDoc = pNode->GetDoc();
@@ -757,7 +757,7 @@ bool SwAccessibleParagraph::GetWordBoundary(
         // get locale for this position
         const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
         lang::Locale aLocale = g_pBreakIt->GetLocale(
-                              GetTxtNode()->GetLang( nModelPos ) );
+                              GetTextNode()->GetLang( nModelPos ) );
 
         // which type of word are we interested in?
         // (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.)
@@ -844,7 +844,7 @@ bool SwAccessibleParagraph::GetGlyphBoundary(
         // get locale for this position
         const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
         lang::Locale aLocale = g_pBreakIt->GetLocale(
-                              GetTxtNode()->GetLang( nModelPos ) );
+                              GetTextNode()->GetLang( nModelPos ) );
 
         // get word boundary, as the Break-Iterator sees fit.
         const sal_Int16 nIterMode = i18n::CharacterIteratorMode::SKIPCELL;
@@ -945,14 +945,14 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
 {
     SolarMutexGuard aGuard;
 
-    const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
-    if( !pTxtFrm )
+    const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+    if( !pTextFrm )
     {
         THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" );
     }
 
-    const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
-    lang::Locale aLoc( g_pBreakIt->GetLocale( pTxtNd->GetLang( 0 ) ) );
+    const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+    lang::Locale aLoc( g_pBreakIt->GetLocale( pTextNd->GetLang( 0 ) ) );
 
     return aLoc;
 }
@@ -966,12 +966,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
 
     utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
 
-    const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm());
-    OSL_ENSURE( pTxtFrm,
+    const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(GetFrm());
+    OSL_ENSURE( pTextFrm,
             "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
-    if ( pTxtFrm )
+    if ( pTextFrm )
     {
-        const SwCntntFrm* pPrevCntFrm( pTxtFrm->FindPrevCnt( true ) );
+        const SwContentFrm* pPrevCntFrm( pTextFrm->FindPrevCnt( true ) );
         if ( pPrevCntFrm )
         {
             uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -981,7 +981,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
             pHelper->AddRelation( aAccRel );
         }
 
-        const SwCntntFrm* pNextCntFrm( pTxtFrm->FindNextCnt( true ) );
+        const SwContentFrm* pNextCntFrm( pTextFrm->FindNextCnt( true ) );
         if ( pNextCntFrm )
         {
             uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -1005,18 +1005,18 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
     // get cursor shell
     SwCrsrShell *pCrsrSh = GetCrsrShell();
     SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    const SwTxtNode* pTxtNd = pTxtFrm->GetTxtNode();
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    const SwTextNode* pTextNd = pTextFrm->GetTextNode();
 
-    if( pCrsrSh != 0 && pTxtNd != 0 &&
+    if( pCrsrSh != 0 && pTextNd != 0 &&
         ( pCrsr == 0 ||
-           pCrsr->GetPoint()->nNode.GetIndex() != pTxtNd->GetIndex() ||
-          !pTxtFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
+           pCrsr->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
+          !pTextFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
     {
         // create pam for selection
-        SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
-                        pTxtFrm->GetOfst() );
-        SwPosition aStartPos( *pTxtNd, aIndex );
+        SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+                        pTextFrm->GetOfst() );
+        SwPosition aStartPos( *pTextNd, aIndex );
         SwPaM aPaM( aStartPos );
 
         // set PaM at cursor shell
@@ -1321,7 +1321,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
     if( pCrsrShell != NULL )
     {
         // create pam for selection
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
         SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nIndex));
         SwPosition aStartPos( *pNode, aIndex );
         SwPaM aPaM( aStartPos );
@@ -1373,7 +1373,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
     aMoveState.bRealHeight = true;
     aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
     /*  #i12332# FillSpecialPos does not accept nIndex ==
          GetString().getLength(). In that case nPos is set to the
@@ -1381,7 +1381,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
          returns the rectangle for a cursor at the end of the
          paragraph. */
     const sal_Int32 nPos = bBehindText
-        ? pNode->GetTxt().getLength()
+        ? pNode->GetText().getLength()
         : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
 
     // call GetCharRect
@@ -1392,7 +1392,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
 
     // already get the caret position
     com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs;
-    const sal_Int32 nStrLen = GetTxtNode()->GetTxt().getLength();
+    const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
     if( nStrLen > 0 )
     {
         SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
@@ -1432,38 +1432,38 @@ struct IndexCompare
 OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
 {
     OUString strTypeName;
-    SwFldMgr aMgr;
-    SwTxtFld* pTxtFld = NULL;
-    SwTxtNode* pTxtNd = const_cast<SwTxtNode*>( GetTxtNode() );
-    SwIndex fldIndex( pTxtNd, nIndex );
-    sal_Int32 nFldIndex = GetPortionData().GetFieldIndex(nIndex);
-    if (nFldIndex >= 0)
-    {
-        const SwpHints* pSwpHints = GetTxtNode()->GetpSwpHints();
+    SwFieldMgr aMgr;
+    SwTextField* pTextField = NULL;
+    SwTextNode* pTextNd = const_cast<SwTextNode*>( GetTextNode() );
+    SwIndex fldIndex( pTextNd, nIndex );
+    sal_Int32 nFieldIndex = GetPortionData().GetFieldIndex(nIndex);
+    if (nFieldIndex >= 0)
+    {
+        const SwpHints* pSwpHints = GetTextNode()->GetpSwpHints();
         if (pSwpHints)
         {
             const size_t nSize = pSwpHints->Count();
             for( size_t i = 0; i < nSize; ++i )
             {
-                const SwTxtAttr* pHt = (*pSwpHints)[i];
+                const SwTextAttr* pHt = (*pSwpHints)[i];
                 if ( ( pHt->Which() == RES_TXTATR_FIELD
                        || pHt->Which() == RES_TXTATR_ANNOTATION
                        || pHt->Which() == RES_TXTATR_INPUTFIELD )
-                     && (nFldIndex-- == 0))
+                     && (nFieldIndex-- == 0))
                 {
-                    pTxtFld = const_cast<SwTxtFld*>(
-                                static_txtattr_cast<SwTxtFld const*>(pHt));
+                    pTextField = const_cast<SwTextField*>(
+                                static_txtattr_cast<SwTextField const*>(pHt));
                     break;
                 }
                 else if (pHt->Which() == RES_TXTATR_REFMARK
-                         && (nFldIndex-- == 0))
+                         && (nFieldIndex-- == 0))
                     strTypeName = "set reference";
             }
         }
     }
-    if (pTxtFld)
+    if (pTextField)
     {
-        const SwField* pField = (pTxtFld->GetFmtFld()).GetField();
+        const SwField* pField = (pTextField->GetFormatField()).GetField();
         if (pField)
         {
             strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId());
@@ -1481,10 +1481,10 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
                     {
                     case REF_BOOKMARK:
                         {
-                            const SwGetRefField* pRefFld = dynamic_cast<const SwGetRefField*>(pField);
-                            if ( pRefFld && pRefFld->IsRefToHeadingCrossRefBookmark() )
+                            const SwGetRefField* pRefField = dynamic_cast<const SwGetRefField*>(pField);
+                            if ( pRefField && pRefField->IsRefToHeadingCrossRefBookmark() )
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Headings"));
-                            else if ( pRefFld && pRefFld->IsRefToNumItemCrossRefBookmark() )
+                            else if ( pRefField && pRefField->IsRefToNumItemCrossRefBookmark() )
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Numbered Paragraphs"));
                             else
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks"));
@@ -1683,10 +1683,10 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
 
         pValues = aValues.getArray();
 
-        const SwTxtNode* pTxtNode( GetTxtNode() );
+        const SwTextNode* pTextNode( GetTextNode() );
         PropertyValue& rValue = pValues[aValues.getLength() - 1 ];
         rValue.Name = "NumberingPrefix";
-        OUString sNumBullet = pTxtNode->GetNumString();
+        OUString sNumBullet = pTextNode->GetNumString();
         rValue.Value <<= sNumBullet;
         rValue.Handle = -1;
         rValue.State = PropertyState_DIRECT_VALUE;
@@ -1740,11 +1740,11 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
         const bool bOnlyCharAttrs )
 {
     // retrieve default attributes
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
     ::boost::scoped_ptr<SfxItemSet> pSet;
     if ( !bOnlyCharAttrs )
     {
-        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                                RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                                RES_PARATR_BEGIN, RES_PARATR_END - 1,
                                RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
@@ -1752,7 +1752,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
     }
     else
     {
-        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                                RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                                0 ) );
     }
@@ -1760,26 +1760,26 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
     // attributes are the character attributes, which are set at the paragraph style
     // of the paragraph. The character attributes set at the automatic paragraph
     // style of the paragraph are treated as run attributes.
-    //    pTxtNode->SwCntntNode::GetAttr( *pSet );
+    //    pTextNode->SwContentNode::GetAttr( *pSet );
     // get default paragraph attributes, if needed, and merge these into <pSet>
     if ( !bOnlyCharAttrs )
     {
-        SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                              RES_PARATR_BEGIN, RES_PARATR_END - 1,
                              RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
                              0 );
-        pTxtNode->SwCntntNode::GetAttr( aParaSet );
+        pTextNode->SwContentNode::GetAttr( aParaSet );
         pSet->Put( aParaSet );
     }
     // get default character attributes and merge these into <pSet>
-    OSL_ENSURE( pTxtNode->GetTxtColl(),
+    OSL_ENSURE( pTextNode->GetTextColl(),
             "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" );
-    if ( pTxtNode->GetTxtColl() )
+    if ( pTextNode->GetTextColl() )
     {
-        SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                              RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                              0 );
-        SetPutRecursive( aCharSet, pTxtNode->GetTxtColl()->GetAttrSet() );
+        SetPutRecursive( aCharSet, pTextNode->GetTextColl()->GetAttrSet() );
         pSet->Put( aCharSet );
     }
 
@@ -1811,13 +1811,13 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
 
         // #i72800#
         // add property value entry for the paragraph style
-        if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() )
+        if ( !bOnlyCharAttrs && pTextNode->GetTextColl() )
         {
             if ( aDefAttrSeq.find( UNO_NAME_PARA_STYLE_NAME ) == aDefAttrSeq.end() )
             {
                 PropertyValue rPropVal;
                 rPropVal.Name = UNO_NAME_PARA_STYLE_NAME;
-                uno::Any aVal( uno::makeAny( pTxtNode->GetTxtColl()->GetName() ) );
+                uno::Any aVal( uno::makeAny( pTextNode->GetTextColl()->GetName() ) );
                 rPropVal.Value = aVal;
                 rPropVal.Handle = -1;
                 rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
@@ -1957,11 +1957,11 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
     // create PaM for character at position <nIndex>
     SwPaM* pPaM( 0 );
     {
-        const SwTxtNode* pTxtNode( GetTxtNode() );
-        SwPosition* pStartPos = new SwPosition( *pTxtNode );
-        pStartPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex );
-        SwPosition* pEndPos = new SwPosition( *pTxtNode );
-        pEndPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex+1 );
+        const SwTextNode* pTextNode( GetTextNode() );
+        SwPosition* pStartPos = new SwPosition( *pTextNode );
+        pStartPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex );
+        SwPosition* pEndPos = new SwPosition( *pTextNode );
+        pEndPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex+1 );
 
         pPaM = new SwPaM( *pStartPos, *pEndPos );
 
@@ -1980,13 +1980,13 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
     //    SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
     // get character attributes from automatic paragraph style and merge these into <aSet>
     {
-        const SwTxtNode* pTxtNode( GetTxtNode() );
-        if ( pTxtNode->HasSwAttrSet() )
+        const SwTextNode* pTextNode( GetTextNode() );
+        if ( pTextNode->HasSwAttrSet() )
         {
             SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc()->GetAttrPool(),
                                                      RES_CHRATR_BEGIN, RES_CHRATR_END -1,
                                                      0 );
-            aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), false );
+            aAutomaticParaStyleCharAttrs.Put( *(pTextNode->GetpSwAttrSet()), false );
             aSet.Put( aAutomaticParaStyleCharAttrs );
         }
     }
@@ -2101,9 +2101,9 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
         const uno::Sequence< OUString >& aRequestedAttributes,
         tAccParaPropValMap& rSupplementalAttrSeq )
 {
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
     ::boost::scoped_ptr<SfxItemSet> pSet;
-    pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+    pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
         RES_PARATR_ADJUST, RES_PARATR_ADJUST,
         RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
         RES_PARATR_LINESPACING, RES_PARATR_LINESPACING,
@@ -2113,13 +2113,13 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
         RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
         0 ) );
 
-    if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+    if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
     {
-        pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
+        pSet->Put( pTextNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
     }
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_UL_SPACE) );
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_LR_SPACE) );
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_PARATR_ADJUST) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_UL_SPACE) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_LR_SPACE) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_PARATR_ADJUST) );
 
     tAccParaPropValMap aSupplementalAttrSeq;
     {
@@ -2227,7 +2227,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
 
     PropertyValue* pValues = rValues.getArray();
 
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
 
     sal_Int32 nValues = rValues.getLength();
     for (sal_Int32 i = 0;  i < nValues;  ++i)
@@ -2291,12 +2291,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             SwCrsrShell* pCrsrShell = GetCrsrShell();
             if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
             {
-                const SwWrongList* pWrongList = pTxtNode->GetWrong();
+                const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( NULL != pWrongList )
                 {
                     sal_Int32 nBegin = nIndex;
                     sal_Int32 nLen = 1;
-                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
                     {
                         rValue.Value <<= (sal_uInt16)UNDERLINE_WAVE;
                     }
@@ -2312,12 +2312,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             SwCrsrShell* pCrsrShell = GetCrsrShell();
             if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
             {
-                const SwWrongList* pWrongList = pTxtNode->GetWrong();
+                const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( NULL != pWrongList )
                 {
                     sal_Int32 nBegin = nIndex;
                     sal_Int32 nLen = 1;
-                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
                     {
                         rValue.Value <<= (sal_Int32)0x00ff0000;
                         continue;
@@ -2367,10 +2367,10 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
         //number bullet
         if (rValue.Name == UNO_NAME_NUMBERING_RULES)
         {
-            if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+            if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
             {
                 uno::Any aVal;
-                SwNumRule* pNumRule = pTxtNode->GetNumRule();
+                SwNumRule* pNumRule = pTextNode->GetNumRule();
                 if (pNumRule)
                 {
                     uno::Reference< container::XIndexReplace >  xNum = new SwXNumberingRules(*pNumRule);
@@ -2416,7 +2416,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
     aMoveState.bRealHeight = true;
     aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
     /**  #i12332# FillSpecialPos does not accept nIndex ==
          GetString().getLength(). In that case nPos is set to the
@@ -2424,7 +2424,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
          returns the rectangle for a cursor at the end of the
          paragraph. */
     const sal_Int32 nPos = bBehindText
-        ? pNode->GetTxt().getLength()
+        ? pNode->GetText().getLength()
         : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
 
     // call GetCharRect
@@ -2467,7 +2467,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
 
     // construct SwPosition (where GetCrsrOfst() will put the result into)
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
     SwIndex aIndex( pNode, 0);
     SwPosition aPos( *pNode, aIndex );
 
@@ -2500,14 +2500,14 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
 
     // ask core for position
     OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
-    const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
     SwCrsrMoveState aMoveState;
     aMoveState.bPosMatchesBounds = true;
     const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
 
-    SwIndex aCntntIdx = aPos.nContent;
-    const sal_Int32 nIndex = aCntntIdx.GetIndex();
+    SwIndex aContentIdx = aPos.nContent;
+    const sal_Int32 nIndex = aContentIdx.GetIndex();
     if ( nIndex > 0 )
     {
         SwRect aResultRect;
@@ -2594,7 +2594,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
     if( pCrsrShell != NULL )
     {
         // create pam for selection
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
         SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nStartIndex));
         SwPosition aStartPos( *pNode, aIndex );
         SwPaM aPaM( aStartPos );
@@ -2914,7 +2914,7 @@ sal_Bool SwAccessibleParagraph::replaceText(
         if( !IsEditableState() )
             return sal_False;
 
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
         // translate positions
         sal_Int32 nStart;
@@ -3089,31 +3089,31 @@ class SwHyperlinkIter_Impl
     size_t nPos;
 
 public:
-    SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm );
-    const SwTxtAttr *next();
+    SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
+    const SwTextAttr *next();
     size_t getCurrHintPos() const { return nPos-1; }
 
     sal_Int32 startIdx() const { return nStt; }
     sal_Int32 endIdx() const { return nEnd; }
 };
 
-SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm ) :
-    pHints( pTxtFrm->GetTxtNode()->GetpSwpHints() ),
-    nStt( pTxtFrm->GetOfst() ),
+SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ) :
+    pHints( pTextFrm->GetTextNode()->GetpSwpHints() ),
+    nStt( pTextFrm->GetOfst() ),
     nPos( 0 )
 {
-    const SwTxtFrm *pFollFrm = pTxtFrm->GetFollow();
-    nEnd = pFollFrm ? pFollFrm->GetOfst() : pTxtFrm->GetTxtNode()->Len();
+    const SwTextFrm *pFollFrm = pTextFrm->GetFollow();
+    nEnd = pFollFrm ? pFollFrm->GetOfst() : pTextFrm->GetTextNode()->Len();
 }
 
-const SwTxtAttr *SwHyperlinkIter_Impl::next()
+const SwTextAttr *SwHyperlinkIter_Impl::next()
 {
-    const SwTxtAttr *pAttr = 0;
+    const SwTextAttr *pAttr = 0;
     if( pHints )
     {
         while( !pAttr && nPos < pHints->Count() )
         {
-            const SwTxtAttr *pHt = (*pHints)[nPos];
+            const SwTextAttr *pHt = (*pHints)[nPos];
             if( RES_TXTATR_INETFMT == pHt->Which() )
             {
                 const sal_Int32 nHtStt = pHt->GetStart();
@@ -3142,8 +3142,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
     sal_Int32 nCount = 0;
     // #i77108# - provide hyperlinks also in editable documents.
 
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aIter( pTxtFrm );
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    SwHyperlinkIter_Impl aIter( pTextFrm );
     while( aIter.next() )
         nCount++;
 
@@ -3159,11 +3159,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aHIter( pTxtFrm );
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    SwHyperlinkIter_Impl aHIter( pTextFrm );
     sal_Int32 nTIndex = -1;
     SwTOXSortTabBase* pTBase = GetTOXSortTabBase();
-    SwTxtAttr* pHt = const_cast<SwTxtAttr*>(aHIter.next());
+    SwTextAttr* pHt = const_cast<SwTextAttr*>(aHIter.next());
     while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex)
     {
         sal_Int32 nHStt = -1;
@@ -3227,7 +3227,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
         // iterate next
         if( bH )
             // iterate next hyperlink
-            pHt = const_cast<SwTxtAttr*>(aHIter.next());
+            pHt = const_cast<SwTextAttr*>(aHIter.next());
         else if(bTOC)
             continue;
         else
@@ -3256,12 +3256,12 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
     sal_Int32 nRet = -1;
     // #i77108#
     {
-        const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-        SwHyperlinkIter_Impl aHIter( pTxtFrm );
+        const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+        SwHyperlinkIter_Impl aHIter( pTextFrm );
 
         const sal_Int32 nIdx = GetPortionData().GetModelPosition( nCharIndex );
         sal_Int32 nPos = 0;
-        const SwTxtAttr *pHt = aHIter.next();
+        const SwTextAttr *pHt = aHIter.next();
         while( pHt && !(nIdx >= pHt->GetStart() && nIdx < *pHt->GetAnyEnd()) )
         {
             pHt = aHIter.next();
@@ -3298,7 +3298,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3323,7 +3323,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount(  )
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -3398,7 +3398,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
         bool bRet = false;
 
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -3523,7 +3523,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3558,7 +3558,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3696,7 +3696,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index d0e53dccda8f..bc604fbb5a65 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -34,8 +34,8 @@
 #include <unordered_map>
 
 class SwField;
-class SwTxtFrm;
-class SwTxtNode;
+class SwTextFrm;
+class SwTextNode;
 class SwPaM;
 class SwAccessiblePortionData;
 class SwAccessibleHyperTextData;
@@ -90,8 +90,8 @@ class SwAccessibleParagraph :
 
     SwParaChangeTrackingInfo* mpParaChangeTrackInfo; // #i108125#
 
-    /// get the SwTxtNode (requires frame; check before)
-    const SwTxtNode* GetTxtNode() const;
+    /// get the SwTextNode (requires frame; check before)
+    const SwTextNode* GetTextNode() const;
 
     /// get the (accessible) text string (requires frame; check before)
     OUString GetString();
@@ -240,7 +240,7 @@ protected:
 public:
 
     SwAccessibleParagraph( SwAccessibleMap& rInitMap,
-                           const SwTxtFrm& rTxtFrm );
+                           const SwTextFrm& rTextFrm );
 
     inline operator ::com::sun::star::accessibility::XAccessibleText *();
 
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index f9359fe76666..486c40c432fd 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -66,10 +66,10 @@ using i18n::Boundary;
 #define PORATTR_TERM        128
 
 SwAccessiblePortionData::SwAccessiblePortionData(
-    const SwTxtNode* pTxtNd,
+    const SwTextNode* pTextNd,
     const SwViewOption* pViewOpt ) :
     SwPortionHandler(),
-    pTxtNode( pTxtNd ),
+    pTextNode( pTextNd ),
     aBuffer(),
     nModelPosition( 0 ),
     pViewOptions( pViewOpt ),
@@ -85,7 +85,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
     bFinished( false ),
     bLastIsSpecial( false )
 {
-    OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" );
+    OSL_ENSURE( pTextNode != NULL, "Text node is needed!" );
 
     // reserve some space to reduce memory allocations
     aLineBreaks.reserve( 5 );
@@ -103,7 +103,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
 
 void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
 {
-    OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
                 "portion exceeds model string!" );
 
     OSL_ENSURE( !bFinished, "We are already done!" );
@@ -121,15 +121,15 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3
     aPortionAttrs.push_back( nAttr );
 
     // update buffer + nModelPosition
-    aBuffer.append( pTxtNode->GetTxt().copy(nModelPosition, nLength) );
+    aBuffer.append( pTextNode->GetText().copy(nModelPosition, nLength) );
     nModelPosition += nLength;
 
     bLastIsSpecial = false;
 }
 
-void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
+void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType )
 {
-    aAttrFieldType.push_back(nAttrFldType);
+    aAttrFieldType.push_back(nAttrFieldType);
     return;
 }
 
@@ -137,7 +137,7 @@ void SwAccessiblePortionData::Special(
     sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/)
 {
     OSL_ENSURE( nModelPosition >= 0, "illegal position" );
-    OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
                 "portion exceeds model string!" );
 
     OSL_ENSURE( !bFinished, "We are already done!" );
@@ -187,7 +187,7 @@ void SwAccessiblePortionData::Special(
         // #i111768# - apply patch from kstribley:
         // Include the control characters.
         case POR_CONTROLCHAR:
-            sDisplay = rText + OUString( pTxtNode->GetTxt()[nModelPosition] );
+            sDisplay = rText + OUString( pTextNode->GetText()[nModelPosition] );
             break;
         default:
             sDisplay = rText;
@@ -235,7 +235,7 @@ void SwAccessiblePortionData::Skip(sal_Int32 nLength)
 {
     OSL_ENSURE( !bFinished, "We are already done!" );
     OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );
-    OSL_ENSURE( nLength <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( nLength <= pTextNode->GetText().getLength(),
             "skip exceeds model string!" );
 
     nModelPosition += nLength;
@@ -278,7 +278,7 @@ bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const
 bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
 {
     // gray portions?
-    // Compare with: inftxt.cxx, SwTxtPaintInfo::DrawViewOpt(...)
+    // Compare with: inftxt.cxx, SwTextPaintInfo::DrawViewOpt(...)
     bool bGray = false;
     switch( nType )
     {
@@ -390,7 +390,7 @@ sal_Int32 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
     }
     // else: return nStartPos unmodified
 
-    OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTxtNode" );
+    OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTextNode" );
     return nStartPos;
 }
 
@@ -505,7 +505,7 @@ void SwAccessiblePortionData::GetSentenceBoundary(
 
                 sal_Int32 nNew = g_pBreakIt->GetBreakIter()->endOfSentence(
                     sAccessibleString, nCurrent,
-                    g_pBreakIt->GetLocale(pTxtNode->GetLang(nModelPos)) ) + 1;
+                    g_pBreakIt->GetLocale(pTextNode->GetLang(nModelPos)) ) + 1;
 
                 if( (nNew < 0) && (nNew > nLength) )
                     nNew = nLength;
@@ -536,7 +536,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
     Boundary& rBound,
     sal_Int32 nPos) const
 {
-    OSL_ENSURE( pTxtNode != NULL, "Need SwTxtNode!" );
+    OSL_ENSURE( pTextNode != NULL, "Need SwTextNode!" );
 
     // attribute boundaries can only occur on portion boundaries
     FillBoundary( rBound, aAccessiblePositions,
@@ -545,7 +545,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
 
 sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_Int32 nPos ) const
 {
-    OSL_ENSURE( nPos <= pTxtNode->GetTxt().getLength(), "illegal position" );
+    OSL_ENSURE( nPos <= pTextNode->GetText().getLength(), "illegal position" );
 
     // find the portion number
     // #i70538# - consider "empty" model portions - e.g. number portion
@@ -614,7 +614,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
 
         // if we have anything except plain text, compute nExtend + nRefPos
         if( (nModelEndPos - nModelPos == 1) &&
-            (pTxtNode->GetTxt()[nModelPos] != sAccessibleString[nPos]))
+            (pTextNode->GetText()[nModelPos] != sAccessibleString[nPos]))
         {
             // case 1: a one-character, non-text portion
             // reference position is the first accessibilty for our
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index d3f879862b05..5650b25998da 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -25,7 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vector>
 
-class SwTxtNode;
+class SwTextNode;
 struct SwSpecialPos;
 class SwViewOption;
 namespace com { namespace sun { namespace star {
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
 class SwAccessiblePortionData : public SwPortionHandler
 {
     // the node this portion is referring to
-    const SwTxtNode* pTxtNode;
+    const SwTextNode* pTextNode;
 
     // variables used while collecting the data
     OUStringBuffer aBuffer;
@@ -92,7 +92,7 @@ class SwAccessiblePortionData : public SwPortionHandler
                          sal_Int32& nCorePos, bool& bEdit ) const;
 
 public:
-    SwAccessiblePortionData( const SwTxtNode* pTxtNd,
+    SwAccessiblePortionData( const SwTextNode* pTextNd,
                              const SwViewOption* pViewOpt = NULL );
     virtual ~SwAccessiblePortionData();
 
@@ -103,7 +103,7 @@ public:
     virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE;
     virtual void Finish() SAL_OVERRIDE;
 
-    virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;
+    virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) SAL_OVERRIDE;
     bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
     bool IsIndexInFootnode(sal_Int32 nIndex);
     bool IsInGrayPortion( sal_Int32 nPos );
@@ -146,7 +146,7 @@ public:
     sal_Int32 GetModelPosition( sal_Int32 nPos ) const;
 
     /// fill a SwSpecialPos structure, suitable for calling
-    /// SwTxtFrm->GetCharRect
+    /// SwTextFrm->GetCharRect
     /// Returns the core position, and fills rpPos either with NULL or
     /// with the &rPos, after putting the appropriate data into it.
     sal_Int32 FillSpecialPos( sal_Int32 nPos,
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 3211f0b8e73e..cec061212223 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -301,10 +301,10 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
             }
             else
             {
-                const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-                if (pFrmFmt)
+                const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                if (pFrameFormat)
                 {
-                    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                     if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                     {
                         const SwFrm  *pParaFrm =  SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview() );
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 0c96b054f421..0deb99b4b10e 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -775,12 +775,12 @@ SwAccessibleTable::SwAccessibleTable(
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
-    SetName( pFrmFmt->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+    SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
-    const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFmt()->GetName() );
+    const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFormat()->GetName() );
     const OUString sArg2( GetFormattedPageNumber() );
 
     sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
@@ -803,11 +803,11 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew
     case RES_NAME_CHANGED:
         if( pTabFrm )
         {
-            const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-            OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+            const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+            OSL_ENSURE( pFrameFormat == GetRegisteredIn(), "invalid frame" );
 
             const OUString sOldName( GetName() );
-            const OUString sNewTabName = pFrmFmt->GetName();
+            const OUString sNewTabName = pFrameFormat->GetName();
 
             SetName( sNewTabName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
@@ -1520,7 +1520,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // if we have a selection in a table, check if it's in the
     // same table that we're trying to select in
-    const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTbl();
+    const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTable();
     if( pSelectedTable != NULL )
     {
         // get top-most table line
@@ -1535,7 +1535,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // create the new selection
     const SwStartNode* pStartNode = pBox->GetSttNd();
-    if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() )
+    if( pSelectedTable == NULL || !pCrsrShell->GetTableCrs() )
     {
         pCrsrShell->StartAction();
         // Set cursor into current cell. This deletes any table cursor.
@@ -1547,7 +1547,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         pCrsrShell->SetMark();
         pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
         // now set the cursor into the cell again.
-        SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+        SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                     : pCrsrShell->GetCrsr();
         *pPaM->GetPoint() = *pPaM->GetMark();
         pCrsrShell->EndAction();
@@ -1561,7 +1561,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         SwPaM aPaM( *pStartNode );
         aPaM.Move( fnMoveForward, fnGoNode );
         aPaM.SetMark();
-        const SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+        const SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                     : pCrsrShell->GetCrsr();
         *(aPaM.GetMark()) = *pPaM->GetMark();
         Select( aPaM );
@@ -1681,7 +1681,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     // If we unselect point, then set cursor to mark. If we clear another
     // selected box, then set cursor to point.
     // reduce selection to mark.
-    SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+    SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                 : pCrsrShell->GetCrsr();
     bool bDeselectPoint =
         pBox->GetSttNd() ==
@@ -1698,7 +1698,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     pCrsrShell->SetMark();
     pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
     // now set the cursor into the cell again.
-    pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+    pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                         : pCrsrShell->GetCrsr();
     *pPaM->GetPoint() = *pPaM->GetMark();
     pCrsrShell->EndAction();
@@ -1867,9 +1867,9 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
-    const OUString aName = pFrmFmt->GetName() + "-ColumnHeaders";
+    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
+    const OUString aName = pFrameFormat->GetName() + "-ColumnHeaders";
 
     SetName( aName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index b176c49c54de..cc88805cf511 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -50,11 +50,11 @@ SwAccessibleTextFrame::SwAccessibleTextFrame(
     msTitle(),
     msDesc()
 {
-    const SwFlyFrmFmt* pFlyFrmFmt =
-                    dynamic_cast<const SwFlyFrmFmt*>( rFlyFrm.GetFmt() );
-    msTitle = pFlyFrmFmt->GetObjTitle();
+    const SwFlyFrameFormat* pFlyFrameFormat =
+                    dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() );
+    msTitle = pFlyFrameFormat->GetObjTitle();
 
-    msDesc = pFlyFrmFmt->GetObjDescription();
+    msDesc = pFlyFrameFormat->GetObjDescription();
     if ( msDesc.isEmpty() &&
          msTitle != GetName() )
     {
@@ -101,9 +101,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
             aEvent.NewValue <<= msTitle;
             FireAccessibleEvent( aEvent );
 
-            const SwFlyFrmFmt* pFlyFrmFmt =
-                            dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
-            if (!pFlyFrmFmt || !pFlyFrmFmt->GetObjDescription().isEmpty())
+            const SwFlyFrameFormat* pFlyFrameFormat =
+                            dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+            if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty())
             {
                 break;
             }
@@ -115,9 +115,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
             {
                 const OUString sOldDesc( msDesc );
 
-                const SwFlyFrmFmt* pFlyFrmFmt =
-                                dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
-                const OUString& rDesc = pFlyFrmFmt->GetObjDescription();
+                const SwFlyFrameFormat* pFlyFrameFormat =
+                                dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+                const OUString& rDesc = pFlyFrameFormat->GetObjDescription();
                 msDesc = rDesc;
                 if ( msDesc.isEmpty() &&
                      msTitle != GetName() )
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index f9d2d5fa6b8a..405f4228f327 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -31,7 +31,7 @@
 #include <algorithm>
 
 namespace {
-    void initChangeTrackTextMarkupLists( const SwTxtFrm& rTxtFrm,
+    void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm,
                                          SwWrongList*& opChangeTrackInsertionTextMarkupList,
                                          SwWrongList*& opChangeTrackDeletionTextMarkupList,
                                          SwWrongList*& opChangeTrackFormatChangeTextMarkupList )
@@ -40,14 +40,14 @@ namespace {
         opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
         opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
 
-        if ( !rTxtFrm.GetTxtNode() )
+        if ( !rTextFrm.GetTextNode() )
         {
-            OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
+            OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" );
             return;
         }
-        const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) );
+        const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) );
 
-        const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
+        const IDocumentRedlineAccess* pIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() );
         if ( !pIDocChangeTrack )
         {
             OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
@@ -55,47 +55,47 @@ namespace {
         }
 
         if ( !IDocumentRedlineAccess::IsShowChanges( pIDocChangeTrack->GetRedlineMode() ) ||
-             pIDocChangeTrack->GetRedlineTbl().empty() )
+             pIDocChangeTrack->GetRedlineTable().empty() )
         {
             // nothing to do --> empty change track text markup lists.
             return;
         }
 
-        const sal_uInt16 nIdxOfFirstRedlineForTxtNode =
-                    pIDocChangeTrack->GetRedlinePos( rTxtNode, USHRT_MAX );
-        if ( nIdxOfFirstRedlineForTxtNode == USHRT_MAX )
+        const sal_uInt16 nIdxOfFirstRedlineForTextNode =
+                    pIDocChangeTrack->GetRedlinePos( rTextNode, USHRT_MAX );
+        if ( nIdxOfFirstRedlineForTextNode == USHRT_MAX )
         {
             // nothing to do --> empty change track text markup lists.
             return;
         }
 
-        const sal_Int32 nTxtFrmTextStartPos = rTxtFrm.IsFollow()
-                                               ? rTxtFrm.GetOfst()
+        const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow()
+                                               ? rTextFrm.GetOfst()
                                                : 0;
-        const sal_Int32 nTxtFrmTextEndPos = rTxtFrm.HasFollow()
-                                             ? rTxtFrm.GetFollow()->GetOfst()
-                                             : rTxtFrm.GetTxt().getLength();
+        const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow()
+                                             ? rTextFrm.GetFollow()->GetOfst()
+                                             : rTextFrm.GetText().getLength();
 
         // iteration over the redlines which overlap with the text node.
-        const SwRedlineTbl& rRedlineTbl = pIDocChangeTrack->GetRedlineTbl();
-        const sal_uInt16 nRedlineCount( rRedlineTbl.size() );
-        for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTxtNode;
+        const SwRedlineTable& rRedlineTable = pIDocChangeTrack->GetRedlineTable();
+        const sal_uInt16 nRedlineCount( rRedlineTable.size() );
+        for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTextNode;
               nActRedline < nRedlineCount;
               ++nActRedline)
         {
-            const SwRangeRedline* pActRedline = rRedlineTbl[ nActRedline ];
-            if ( pActRedline->Start()->nNode > rTxtNode.GetIndex() )
+            const SwRangeRedline* pActRedline = rRedlineTable[ nActRedline ];
+            if ( pActRedline->Start()->nNode > rTextNode.GetIndex() )
             {
                 break;
             }
 
-            sal_Int32 nTxtNodeChangeTrackStart(COMPLETE_STRING);
-            sal_Int32 nTxtNodeChangeTrackEnd(COMPLETE_STRING);
-            pActRedline->CalcStartEnd( rTxtNode.GetIndex(),
-                                       nTxtNodeChangeTrackStart,
-                                       nTxtNodeChangeTrackEnd );
-            if ( nTxtNodeChangeTrackStart > nTxtFrmTextEndPos ||
-                 nTxtNodeChangeTrackEnd < nTxtFrmTextStartPos )
+            sal_Int32 nTextNodeChangeTrackStart(COMPLETE_STRING);
+            sal_Int32 nTextNodeChangeTrackEnd(COMPLETE_STRING);
+            pActRedline->CalcStartEnd( rTextNode.GetIndex(),
+                                       nTextNodeChangeTrackStart,
+                                       nTextNodeChangeTrackEnd );
+            if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos ||
+                 nTextNodeChangeTrackEnd < nTextFrmTextStartPos )
             {
                 // Consider only redlines which overlap with the text frame's text.
                 continue;
@@ -126,23 +126,23 @@ namespace {
             }
             if ( pMarkupList )
             {
-                const sal_Int32 nTxtFrmChangeTrackStart =
-                    std::max(nTxtNodeChangeTrackStart, nTxtFrmTextStartPos);
+                const sal_Int32 nTextFrmChangeTrackStart =
+                    std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos);
 
-                const sal_Int32 nTxtFrmChangeTrackEnd =
-                    std::min(nTxtNodeChangeTrackEnd, nTxtFrmTextEndPos);
+                const sal_Int32 nTextFrmChangeTrackEnd =
+                    std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos);
 
                 pMarkupList->Insert( OUString(), 0,
-                                     nTxtFrmChangeTrackStart,
-                                     nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart,
+                                     nTextFrmChangeTrackStart,
+                                     nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart,
                                      pMarkupList->Count() );
             }
         } // eof iteration over the redlines which overlap with the text node
     }
 } // eof anonymous namespace
 
-SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm )
-    : mrTxtFrm( rTxtFrm )
+SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm )
+    : mrTextFrm( rTextFrm )
     , mpChangeTrackInsertionTextMarkupList( 0 )
     , mpChangeTrackDeletionTextMarkupList( 0 )
     , mpChangeTrackFormatChangeTextMarkupList( 0 )
@@ -176,7 +176,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
         OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0,
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
-        initChangeTrackTextMarkupLists( mrTxtFrm,
+        initChangeTrackTextMarkupLists( mrTextFrm,
                                         mpChangeTrackInsertionTextMarkupList,
                                         mpChangeTrackDeletionTextMarkupList,
                                         mpChangeTrackFormatChangeTextMarkupList );
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 5eaed9e6fe65..a8592529f1f0 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -22,13 +22,13 @@
 
 #include <sal/types.h>
 
-class SwTxtFrm;
+class SwTextFrm;
 class SwWrongList;
 
 class SwParaChangeTrackingInfo
 {
     public:
-        explicit SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm );
+        explicit SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm );
         ~SwParaChangeTrackingInfo();
 
         void reset();
@@ -39,7 +39,7 @@ class SwParaChangeTrackingInfo
         SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
         SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
 
-        const SwTxtFrm& mrTxtFrm;
+        const SwTextFrm& mrTextFrm;
 
         SwWrongList* mpChangeTrackInsertionTextMarkupList;
         SwWrongList* mpChangeTrackDeletionTextMarkupList;
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 2217f9d84c2d..d316b21ba9c2 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star;
 
 // helper functions
 namespace {
-    const SwWrongList* getTextMarkupList( const SwTxtNode& rTxtNode,
+    const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode,
                                           const sal_Int32 nTextMarkupType )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException)
@@ -43,7 +43,7 @@ namespace {
         {
             case text::TextMarkupType::SPELLCHECK:
             {
-                pTextMarkupList = rTxtNode.GetWrong();
+                pTextMarkupList = rTextNode.GetWrong();
             }
             break;
             case text::TextMarkupType::PROOFREADING:
@@ -70,10 +70,10 @@ namespace {
 
 // implementation of class <SwTextMarkupoHelper>
 SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
-                                        const SwTxtNode& rTxtNode )
+                                        const SwTextNode& rTextNode )
     : mrPortionData( rPortionData )
     // #i108125#
-    , mpTxtNode( &rTxtNode )
+    , mpTextNode( &rTextNode )
     , mpTextMarkupList( 0 )
 {
 }
@@ -82,7 +82,7 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD
 SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
                                         const SwWrongList& rTextMarkupList )
     : mrPortionData( rPortionData )
-    , mpTxtNode( 0 )
+    , mpTextNode( 0 )
     , mpTextMarkupList( &rTextMarkupList )
 {
 }
@@ -97,7 +97,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     if ( pTextMarkupList )
     {
         nTextMarkupCount = pTextMarkupList->Count();
@@ -127,7 +127,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     if ( pTextMarkupList )
     {
         const SwWrongArea* pTextMarkup =
@@ -174,7 +174,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups;
     if ( pTextMarkupList )
     {
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index e38dba18ad92..37dd9f073a47 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -30,13 +30,13 @@ struct TextSegment;
 } } } }
 
 class SwAccessiblePortionData;
-class SwTxtNode;
+class SwTextNode;
 class SwWrongList; // #i108125#
 class SwTextMarkupHelper
 {
     public:
         SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
-                            const SwTxtNode& rTxtNode );
+                            const SwTextNode& rTextNode );
         SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
                             const SwWrongList& rTextMarkupList ); // #i108125#
         ~SwTextMarkupHelper() {}
@@ -66,7 +66,7 @@ class SwTextMarkupHelper
         const SwAccessiblePortionData& mrPortionData;
 
         // #i108125#
-        const SwTxtNode* mpTxtNode;
+        const SwTextNode* mpTextNode;
         const SwWrongList* mpTextMarkupList;
 };
 #endif
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 4e56fbaeee75..5cda63a62d3a 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -31,41 +31,41 @@
 #include <calbck.hxx>
 #include <swtable.hxx>
 
-SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
+SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
     : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
 {
 }
 
-bool SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return GetValue() == static_cast<const SwTblBoxNumFormat&>(rAttr).GetValue() &&
-           bAuto == static_cast<const SwTblBoxNumFormat&>(rAttr).bAuto;
+    return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue() &&
+           bAuto == static_cast<const SwTableBoxNumFormat&>(rAttr).bAuto;
 }
 
-SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const
 {
-    return new SwTblBoxNumFormat( GetValue(), bAuto );
+    return new SwTableBoxNumFormat( GetValue(), bAuto );
 }
 
-SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula )
+SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula )
     : SfxPoolItem( RES_BOXATR_FORMULA ),
     SwTableFormula( rFormula ),
     pDefinedIn( 0 )
 {
 }
 
-bool SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxFormula::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return GetFormula() == static_cast<const SwTblBoxFormula&>(rAttr).GetFormula() &&
-           pDefinedIn == static_cast<const SwTblBoxFormula&>(rAttr).pDefinedIn;
+    return GetFormula() == static_cast<const SwTableBoxFormula&>(rAttr).GetFormula() &&
+           pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).pDefinedIn;
 }
 
-SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
 {
     // switch to external rendering
-    SwTblBoxFormula* pNew = new SwTblBoxFormula( GetFormula() );
+    SwTableBoxFormula* pNew = new SwTableBoxFormula( GetFormula() );
     pNew->SwTableFormula::operator=( *this );
     return pNew;
 }
@@ -77,7 +77,7 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
 
     Caution: Must override when inheriting.
 */
-const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
+const SwNode* SwTableBoxFormula::GetNodeOfFormula() const
 {
     const SwNode* pRet = 0;
     if( pDefinedIn )
@@ -89,7 +89,7 @@ const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
     return pRet;
 }
 
-SwTableBox* SwTblBoxFormula::GetTableBox()
+SwTableBox* SwTableBoxFormula::GetTableBox()
 {
     SwTableBox* pBox = 0;
     if( pDefinedIn )
@@ -97,12 +97,12 @@ SwTableBox* SwTblBoxFormula::GetTableBox()
     return pBox;
 }
 
-void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
+void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
 {
     if( !pDefinedIn )
         return ;
 
-    SwTableFmlUpdate* pUpdtFld;
+    SwTableFormulaUpdate* pUpdateField;
     if( !pItem || RES_TABLEFML_UPDATE != pItem->Which() )
     {
         // reset value flag
@@ -110,109 +110,109 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
         return ;
     }
 
-    pUpdtFld = const_cast<SwTableFmlUpdate*>(static_cast<const SwTableFmlUpdate*>(pItem));
+    pUpdateField = const_cast<SwTableFormulaUpdate*>(static_cast<const SwTableFormulaUpdate*>(pItem));
 
     // detect table that contains this attribute
-    const SwTableNode* pTblNd;
+    const SwTableNode* pTableNd;
     const SwNode* pNd = GetNodeOfFormula();
     if( pNd && &pNd->GetNodes() == &pNd->GetDoc()->GetNodes() &&
-        0 != ( pTblNd = pNd->FindTableNode() ))
+        0 != ( pTableNd = pNd->FindTableNode() ))
     {
-        switch( pUpdtFld->eFlags )
+        switch( pUpdateField->eFlags )
         {
         case TBL_CALC:
             // reset value flag
             ChgValid( false );
             break;
         case TBL_BOXNAME:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
                 // use external rendering
-                PtrToBoxNm( pUpdtFld->pTbl );
+                PtrToBoxNm( pUpdateField->pTable );
             break;
         case TBL_BOXPTR:
             // internal rendering
-            BoxNmToPtr( &pTblNd->GetTable() );
+            BoxNmToPtr( &pTableNd->GetTable() );
             break;
         case TBL_RELBOXNAME:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
                 // relative rendering
-                ToRelBoxNm( pUpdtFld->pTbl );
+                ToRelBoxNm( pUpdateField->pTable );
             break;
 
         case TBL_SPLITTBL:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
             {
-                sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTbl(
-                                        pTblNd->GetTable(), GetTableBox() );
-                pUpdtFld->bBehindSplitLine = USHRT_MAX != nLnPos &&
-                                            pUpdtFld->nSplitLine <= nLnPos;
+                sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTable(
+                                        pTableNd->GetTable(), GetTableBox() );
+                pUpdateField->bBehindSplitLine = USHRT_MAX != nLnPos &&
+                                            pUpdateField->nSplitLine <= nLnPos;
             }
             else
-                pUpdtFld->bBehindSplitLine = false;
+                pUpdateField->bBehindSplitLine = false;
             // no break
         case TBL_MERGETBL:
-            if( pUpdtFld->pHistory )
+            if( pUpdateField->pHistory )
             {
                 // for a history record the unchanged formula is needed
-                SwTblBoxFormula aCopy( *this );
-                pUpdtFld->bModified = false;
-                ToSplitMergeBoxNm( *pUpdtFld );
+                SwTableBoxFormula aCopy( *this );
+                pUpdateField->bModified = false;
+                ToSplitMergeBoxNm( *pUpdateField );
 
-                if( pUpdtFld->bModified )
+                if( pUpdateField->bModified )
                 {
                     // external rendering
-                    aCopy.PtrToBoxNm( &pTblNd->GetTable() );
-                    pUpdtFld->pHistory->Add(
+                    aCopy.PtrToBoxNm( &pTableNd->GetTable() );
+                    pUpdateField->pHistory->Add(
                         &aCopy,
                         &aCopy,
                         pNd->FindTableBoxStartNode()->GetIndex());
                 }
             }
             else
-                ToSplitMergeBoxNm( *pUpdtFld );
+                ToSplitMergeBoxNm( *pUpdateField );
             break;
         }
     }
 }
 
-void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
+void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, double& rValue )
 {
     if( !rCalcPara.rCalc.IsCalcError() )
     {
         // create pointers from box names
-        BoxNmToPtr( rCalcPara.pTbl );
-        const OUString sFml( MakeFormula( rCalcPara ));
+        BoxNmToPtr( rCalcPara.pTable );
+        const OUString sFormula( MakeFormula( rCalcPara ));
         if( !rCalcPara.rCalc.IsCalcError() )
-            rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
+            rValue = rCalcPara.rCalc.Calculate( sFormula ).GetDouble();
         else
             rValue = DBL_MAX;
         ChgValid( !rCalcPara.IsStackOverflow() ); // value is now valid again
     }
 }
 
-SwTblBoxValue::SwTblBoxValue()
+SwTableBoxValue::SwTableBoxValue()
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
 {
 }
 
-SwTblBoxValue::SwTblBoxValue( const double nVal )
+SwTableBoxValue::SwTableBoxValue( const double nVal )
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( nVal )
 {
 }
 
-bool SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxValue::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) );
+    SwTableBoxValue const& rOther( static_cast<SwTableBoxValue const&>(rAttr) );
     // items with NaN should be equal to enable pooling
     return ::rtl::math::isNan( nValue )
         ?   ::rtl::math::isNan( rOther.nValue )
         :   ( nValue == rOther.nValue );
 }
 
-SfxPoolItem* SwTblBoxValue::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const
 {
-    return new SwTblBoxValue( nValue );
+    return new SwTableBoxValue( nValue );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 5660cdba5b3e..7cd973a47fb8 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -19,11 +19,11 @@
 
 #include <fmtfollowtextflow.hxx>
 
-TYPEINIT1(SwFmtFollowTextFlow, SfxBoolItem);
+TYPEINIT1(SwFormatFollowTextFlow, SfxBoolItem);
 
-SfxPoolItem*    SwFmtFollowTextFlow::Clone( SfxItemPool * ) const
+SfxPoolItem*    SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
 {
-    return new SwFmtFollowTextFlow(*this);
+    return new SwFormatFollowTextFlow(*this);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 0224f4fb9605..6ee45e2c913e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -25,45 +25,45 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-TYPEINIT1(SwFmtWrapInfluenceOnObjPos, SfxPoolItem);
+TYPEINIT1(SwFormatWrapInfluenceOnObjPos, SfxPoolItem);
 
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
     : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
     mnWrapInfluenceOnPosition( _nWrapInfluenceOnPosition )
 {
 }
 
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy )
     : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
     mnWrapInfluenceOnPosition( _rCpy.GetWrapInfluenceOnObjPos() )
 {
 }
 
-SwFmtWrapInfluenceOnObjPos::~SwFmtWrapInfluenceOnObjPos()
+SwFormatWrapInfluenceOnObjPos::~SwFormatWrapInfluenceOnObjPos()
 {
 }
 
-SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=( const SwFmtWrapInfluenceOnObjPos& _rSource )
+SwFormatWrapInfluenceOnObjPos& SwFormatWrapInfluenceOnObjPos::operator=( const SwFormatWrapInfluenceOnObjPos& _rSource )
 {
     mnWrapInfluenceOnPosition = _rSource.GetWrapInfluenceOnObjPos();
 
     return *this;
 }
 
-bool SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     return ( mnWrapInfluenceOnPosition ==
-                    static_cast<const SwFmtWrapInfluenceOnObjPos&>(rAttr).
+                    static_cast<const SwFormatWrapInfluenceOnObjPos&>(rAttr).
                                                 GetWrapInfluenceOnObjPos() );
 }
 
-SfxPoolItem* SwFmtWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
+SfxPoolItem* SwFormatWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
 {
-    return new SwFmtWrapInfluenceOnObjPos(*this);
+    return new SwFormatWrapInfluenceOnObjPos(*this);
 }
 
-bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -73,13 +73,13 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) co
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
         bRet = false;
     }
     return bRet;
 }
 
-bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = false;
@@ -98,17 +98,17 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId
         }
         else
         {
-            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+            OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
         }
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
     }
     return bRet;
 }
 
-void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+void SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
 {
     // #i35017# - constant names have changed and consider new value <ITERATIVE>
     if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
@@ -119,13 +119,13 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
     }
 }
 
 // #i35017# - add parameter <_bIterativeAsOnceConcurrent> to control, if
 // value <ITERATIVE> has to be treated as <ONCE_CONCURRENT>
-sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
+sal_Int16 SwFormatWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
                                 const bool _bIterativeAsOnceConcurrent ) const
 {
     sal_Int16 nWrapInfluenceOnPosition( mnWrapInfluenceOnPosition );
@@ -139,9 +139,9 @@ sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
     return nWrapInfluenceOnPosition;
 }
 
-void SwFmtWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtWrapInfluenceOnObjPos"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatWrapInfluenceOnObjPos"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWrapInfluenceOnPosition"), BAD_CAST(OString::number(mnWrapInfluenceOnPosition).getStr()));
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 9344426e9b4b..f5df08fa9860 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -38,72 +38,72 @@
 
 using namespace com::sun::star;
 
-TYPEINIT1( SwFmt, SwClient );
+TYPEINIT1( SwFormat, SwClient );
 
-SwFmt::SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-              const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm,
-              sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+              const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
+              sal_uInt16 nFormatWhich )
     : SwModify( pDrvdFrm ),
-    m_aFmtName( OUString::createFromAscii(pFmtNm) ),
+    m_aFormatName( OUString::createFromAscii(pFormatNm) ),
     m_aSet( rPool, pWhichRanges ),
-    m_nWhichId( nFmtWhich ),
-    m_nPoolFmtId( USHRT_MAX ),
+    m_nWhichId( nFormatWhich ),
+    m_nPoolFormatId( USHRT_MAX ),
     m_nPoolHelpId( USHRT_MAX ),
     m_nPoolHlpFileId( UCHAR_MAX )
 {
-    m_bAutoUpdateFmt = false; // LAYER_IMPL
-    m_bAutoFmt = true;
-    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+    m_bAutoUpdateFormat = false; // LAYER_IMPL
+    m_bAutoFormat = true;
+    m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
         m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
-SwFmt::SwFmt( SwAttrPool& rPool, const OUString& rFmtNm,
-              const sal_uInt16* pWhichRanges, SwFmt* pDrvdFrm,
-              sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm,
+              const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrm,
+              sal_uInt16 nFormatWhich )
     : SwModify( pDrvdFrm ),
-    m_aFmtName( rFmtNm ),
+    m_aFormatName( rFormatNm ),
     m_aSet( rPool, pWhichRanges ),
-    m_nWhichId( nFmtWhich ),
-    m_nPoolFmtId( USHRT_MAX ),
+    m_nWhichId( nFormatWhich ),
+    m_nPoolFormatId( USHRT_MAX ),
     m_nPoolHelpId( USHRT_MAX ),
     m_nPoolHlpFileId( UCHAR_MAX )
 {
-    m_bAutoUpdateFmt = false; // LAYER_IMPL
-    m_bAutoFmt = true;
-    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+    m_bAutoUpdateFormat = false; // LAYER_IMPL
+    m_bAutoFormat = true;
+    m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
         m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
-SwFmt::SwFmt( const SwFmt& rFmt )
-    : SwModify( rFmt.DerivedFrom() ),
-    m_aFmtName( rFmt.m_aFmtName ),
-    m_aSet( rFmt.m_aSet ),
-    m_nWhichId( rFmt.m_nWhichId ),
-    m_nPoolFmtId( rFmt.GetPoolFmtId() ),
-    m_nPoolHelpId( rFmt.GetPoolHelpId() ),
-    m_nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
+SwFormat::SwFormat( const SwFormat& rFormat )
+    : SwModify( rFormat.DerivedFrom() ),
+    m_aFormatName( rFormat.m_aFormatName ),
+    m_aSet( rFormat.m_aSet ),
+    m_nWhichId( rFormat.m_nWhichId ),
+    m_nPoolFormatId( rFormat.GetPoolFormatId() ),
+    m_nPoolHelpId( rFormat.GetPoolHelpId() ),
+    m_nPoolHlpFileId( rFormat.GetPoolHlpFileId() )
 {
-    m_bWritten = m_bFmtInDTOR = false; // LAYER_IMPL
-    m_bAutoFmt = rFmt.m_bAutoFmt;
-    m_bHidden = rFmt.m_bHidden;
-    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+    m_bWritten = m_bFormatInDTOR = false; // LAYER_IMPL
+    m_bAutoFormat = rFormat.m_bAutoFormat;
+    m_bHidden = rFormat.m_bHidden;
+    m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
 
-    if( rFmt.DerivedFrom() )
-        m_aSet.SetParent( &rFmt.DerivedFrom()->m_aSet );
+    if( rFormat.DerivedFrom() )
+        m_aSet.SetParent( &rFormat.DerivedFrom()->m_aSet );
     // a few special treatments for attributes
     m_aSet.SetModifyAtAttr( this );
 }
 
-SwFmt &SwFmt::operator=(const SwFmt& rFmt)
+SwFormat &SwFormat::operator=(const SwFormat& rFormat)
 {
-    m_nWhichId = rFmt.m_nWhichId;
-    m_nPoolFmtId = rFmt.GetPoolFmtId();
-    m_nPoolHelpId = rFmt.GetPoolHelpId();
-    m_nPoolHlpFileId = rFmt.GetPoolHlpFileId();
+    m_nWhichId = rFormat.m_nWhichId;
+    m_nPoolFormatId = rFormat.GetPoolFormatId();
+    m_nPoolHelpId = rFormat.GetPoolHelpId();
+    m_nPoolHlpFileId = rFormat.GetPoolHlpFileId();
 
     if ( IsInCache() )
     {
@@ -115,8 +115,8 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
     // copy only array with attributes delta
     SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
               aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
-    m_aSet.Intersect_BC( rFmt.m_aSet, &aOld, &aNew );
-    (void)m_aSet.Put_BC( rFmt.m_aSet, &aOld, &aNew );
+    m_aSet.Intersect_BC( rFormat.m_aSet, &aOld, &aNew );
+    (void)m_aSet.Put_BC( rFormat.m_aSet, &aOld, &aNew );
 
     // a few special treatments for attributes
     m_aSet.SetModifyAtAttr( this );
@@ -129,39 +129,39 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
 
-    if( GetRegisteredIn() != rFmt.GetRegisteredIn() )
+    if( GetRegisteredIn() != rFormat.GetRegisteredIn() )
     {
         if( GetRegisteredIn() )
             GetRegisteredInNonConst()->Remove(this);
-        if( rFmt.GetRegisteredIn() )
+        if( rFormat.GetRegisteredIn() )
         {
-            const_cast<SwFmt&>(rFmt).GetRegisteredInNonConst()->Add(this);
-            m_aSet.SetParent( &rFmt.m_aSet );
+            const_cast<SwFormat&>(rFormat).GetRegisteredInNonConst()->Add(this);
+            m_aSet.SetParent( &rFormat.m_aSet );
         }
         else
         {
             m_aSet.SetParent( 0 );
         }
     }
-    m_bAutoFmt = rFmt.m_bAutoFmt;
-    m_bHidden = rFmt.m_bHidden;
-    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+    m_bAutoFormat = rFormat.m_bAutoFormat;
+    m_bHidden = rFormat.m_bHidden;
+    m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
     return *this;
 }
 
-void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
+void SwFormat::SetName( const OUString& rNewName, bool bBroadcast )
 {
     OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" );
     if( bBroadcast )
     {
-        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFmtName );
+        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName );
         SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
-        m_aFmtName = rNewName;
+        m_aFormatName = rNewName;
         ModifyNotification( &aOld, &aNew );
     }
     else
     {
-        m_aFmtName = rNewName;
+        m_aFormatName = rNewName;
     }
 }
 
@@ -176,7 +176,7 @@ void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
     in which <this> is defined. Currently this is important for DropCaps
     because that contains data that needs to be copied deeply.
 */
-void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
+void SwFormat::CopyAttrs( const SwFormat& rFormat, bool bReplace )
 {
     // copy only array with attributes delta
     if ( IsInCache() )
@@ -187,12 +187,12 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
     SetInSwFntCache( false );
 
     // special treatments for some attributes
-    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFmt.m_aSet);
+    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFormat.m_aSet);
 
     if( !bReplace )     // refresh only those that are not set?
     {
-        if( pChgSet == &rFmt.m_aSet )
-            pChgSet = new SwAttrSet( rFmt.m_aSet );
+        if( pChgSet == &rFormat.m_aSet )
+            pChgSet = new SwAttrSet( rFormat.m_aSet );
         pChgSet->Differentiate( m_aSet );
     }
 
@@ -215,42 +215,42 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
         }
     }
 
-    if( pChgSet != &rFmt.m_aSet ) // was a Set created?
+    if( pChgSet != &rFormat.m_aSet ) // was a Set created?
         delete pChgSet;
 }
 
-SwFmt::~SwFmt()
+SwFormat::~SwFormat()
 {
     // This happens at a ObjectDying message. Thus put all dependent
     // ones on DerivedFrom.
     if( HasWriterListeners() )
     {
-        OSL_ENSURE( DerivedFrom(), "SwFmt::~SwFmt: Def dependents!" );
+        OSL_ENSURE( DerivedFrom(), "SwFormat::~SwFormat: Def dependents!" );
 
-        m_bFmtInDTOR = true;
+        m_bFormatInDTOR = true;
 
-        SwFmt* pParentFmt = DerivedFrom();
-        if( !pParentFmt )
+        SwFormat* pParentFormat = DerivedFrom();
+        if( !pParentFormat )
         {
             SAL_WARN(
                 "sw.core",
-                "~SwFmt: parent format missing from: " << GetName() );
+                "~SwFormat: parent format missing from: " << GetName() );
         }
         else
         {
-            SwFmtChg aOldFmt( this );
-            SwFmtChg aNewFmt( pParentFmt );
-            SwIterator<SwClient,SwFmt> aIter(*this);
-            for(SwClient* pClient = aIter.First(); pClient && pParentFmt; pClient = aIter.Next())
+            SwFormatChg aOldFormat( this );
+            SwFormatChg aNewFormat( pParentFormat );
+            SwIterator<SwClient,SwFormat> aIter(*this);
+            for(SwClient* pClient = aIter.First(); pClient && pParentFormat; pClient = aIter.Next())
             {
-                pParentFmt->Add( pClient );
-                pClient->ModifyNotification( &aOldFmt, &aNewFmt );
+                pParentFormat->Add( pClient );
+                pClient->ModifyNotification( &aOldFormat, &aNewFormat );
             }
         }
     }
 }
 
-void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
     bool bContinue = true; // true = pass on to dependent ones
 
@@ -265,15 +265,15 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
         {
             // If the dying object is the parent format of this format so
             // attach this to the parent of the parent
-            SwFmt* pFmt = static_cast<SwFmt*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
+            SwFormat* pFormat = static_cast<SwFormat*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
 
             // do not move if this is the topmost format
-            if( GetRegisteredIn() && GetRegisteredIn() == pFmt )
+            if( GetRegisteredIn() && GetRegisteredIn() == pFormat )
             {
-                if( pFmt->GetRegisteredIn() )
+                if( pFormat->GetRegisteredIn() )
                 {
                     // if parent so register in new parent
-                    pFmt->DerivedFrom()->Add( this );
+                    pFormat->DerivedFrom()->Add( this );
                     m_aSet.SetParent( &DerivedFrom()->m_aSet );
                 }
                 else
@@ -306,8 +306,8 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 
         // skip my own Modify
         if ( pOldValue && pNewValue &&
-            static_cast<const SwFmtChg*>(pOldValue)->pChangedFmt != this &&
-            static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
+            static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat != this &&
+            static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
         {
             // attach Set to new parent
             m_aSet.SetParent( DerivedFrom() ? &DerivedFrom()->m_aSet : 0 );
@@ -322,7 +322,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
             // mba: move the code that ignores this event to the clients
 
             // pass Hint only to dependent formats (no Frames)
-            //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) );
+            //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFormat) );
             //bContinue = false;
         }
         break;
@@ -345,17 +345,17 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
     }
 }
 
-bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
+bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom)
 {
     if ( pDerFrom )
     {
-        const SwFmt* pFmt = pDerFrom;
-        while ( pFmt != 0 )
+        const SwFormat* pFormat = pDerFrom;
+        while ( pFormat != 0 )
         {
-            if ( pFmt == this )
+            if ( pFormat == this )
                 return false;
 
-            pFmt=pFmt->DerivedFrom();
+            pFormat=pFormat->DerivedFrom();
         }
     }
     else
@@ -384,19 +384,19 @@ bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     pDerFrom->Add( this );
     m_aSet.SetParent( &pDerFrom->m_aSet );
 
-    SwFmtChg aOldFmt( this );
-    SwFmtChg aNewFmt( this );
-    ModifyNotification( &aOldFmt, &aNewFmt );
+    SwFormatChg aOldFormat( this );
+    SwFormatChg aNewFormat( this );
+    ModifyNotification( &aOldFormat, &aNewFormat );
 
     return true;
 }
 
-bool SwFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
+const SfxPoolItem& SwFormat::GetFormatAttr( sal_uInt16 nWhich, bool bInParents ) const
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
@@ -415,12 +415,12 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
     return m_aSet.Get( nWhich, bInParents );
 }
 
-SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
+SfxItemState SwFormat::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
-        SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFmt::GetBackgroundStat (simple fallback is in place and used)");
+        SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFormat::GetBackgroundStat (simple fallback is in place and used)");
         const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
 
         // check if the new fill attributes are used
@@ -450,7 +450,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
     return m_aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
-SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
+SfxItemState SwFormat::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
@@ -478,7 +478,7 @@ SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent)
     return eRet;
 }
 
-bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr )
 {
     if ( IsInCache() || IsInSwFntCache() )
     {
@@ -529,19 +529,19 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     }
 
     // if Modify is locked then no modifications will be sent;
-    // but call Modify always for FrmFmts
-    const sal_uInt16 nFmtWhich = Which();
+    // but call Modify always for FrameFormats
+    const sal_uInt16 nFormatWhich = Which();
     if( IsModifyLocked() ||
         ( !HasWriterListeners() &&
-          (RES_GRFFMTCOLL == nFmtWhich  ||
-           RES_TXTFMTCOLL == nFmtWhich ) ) )
+          (RES_GRFFMTCOLL == nFormatWhich  ||
+           RES_TXTFMTCOLL == nFormatWhich ) ) )
     {
         if( ( bRet = (0 != m_aSet.Put( rAttr ))) )
             m_aSet.SetModifyAtAttr( this );
         // #i71574#
-        if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
+        if ( nFormatWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
         {
-            TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+            TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
         }
     }
     else
@@ -564,7 +564,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     return bRet;
 }
 
-bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
+bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
 {
     if( !rSet.Count() )
         return false;
@@ -634,19 +634,19 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
     }
 
     // if Modify is locked then no modifications will be sent;
-    // but call Modify always for FrmFmts
-    const sal_uInt16 nFmtWhich = Which();
+    // but call Modify always for FrameFormats
+    const sal_uInt16 nFormatWhich = Which();
     if ( IsModifyLocked() ||
          ( !HasWriterListeners() &&
-           ( RES_GRFFMTCOLL == nFmtWhich ||
-             RES_TXTFMTCOLL == nFmtWhich ) ) )
+           ( RES_GRFFMTCOLL == nFormatWhich ||
+             RES_TXTFMTCOLL == nFormatWhich ) ) )
     {
         if( ( bRet = m_aSet.Put( aTempSet )) )
             m_aSet.SetModifyAtAttr( this );
         // #i71574#
-        if ( nFmtWhich == RES_TXTFMTCOLL )
+        if ( nFormatWhich == RES_TXTFMTCOLL )
         {
-            TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+            TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
         }
     }
     else
@@ -667,7 +667,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 }
 
 // remove Hint using nWhich from array with delta
-bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwFormat::ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !m_aSet.Count() )
         return false;
@@ -700,7 +700,7 @@ bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 }
 
 // #i73790#
-sal_uInt16 SwFmt::ResetAllFmtAttr()
+sal_uInt16 SwFormat::ResetAllFormatAttr()
 {
     if( !m_aSet.Count() )
         return 0;
@@ -728,12 +728,12 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
     return aNew.Count();
 }
 
-bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
     return SwModify::GetInfo( rInfo );
 }
 
-void SwFmt::DelDiffs( const SfxItemSet& rSet )
+void SwFormat::DelDiffs( const SfxItemSet& rSet )
 {
     if( !m_aSet.Count() )
         return;
@@ -763,7 +763,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
     }
 }
 
-/** SwFmt::IsBackgroundTransparent
+/** SwFormat::IsBackgroundTransparent
 
     Virtual method to determine, if background of format is transparent.
     Default implementation returns false. Thus, subclasses have to override
@@ -771,7 +771,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
 
     @return false, default implementation
 */
-bool SwFmt::IsBackgroundTransparent() const
+bool SwFormat::IsBackgroundTransparent() const
 {
     return false;
 }
@@ -779,16 +779,16 @@ bool SwFmt::IsBackgroundTransparent() const
 /*
  * Document Interface Access
  */
-const IDocumentSettingAccess* SwFmt::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
-const IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
-IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
-const IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentTimerAccess* SwFmt::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
-IDocumentFieldsAccess* SwFmt::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
-IDocumentChartDataProviderAccess* SwFmt::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
-
-void SwFmt::GetGrabBagItem(uno::Any& rVal) const
+const IDocumentSettingAccess* SwFormat::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
+const IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
+IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
+const IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentTimerAccess* SwFormat::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
+IDocumentFieldsAccess* SwFormat::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
+IDocumentChartDataProviderAccess* SwFormat::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
+
+void SwFormat::GetGrabBagItem(uno::Any& rVal) const
 {
     if (m_pGrabBagItem.get())
         m_pGrabBagItem->QueryValue(rVal);
@@ -799,7 +799,7 @@ void SwFmt::GetGrabBagItem(uno::Any& rVal) const
     }
 }
 
-void SwFmt::SetGrabBagItem(const uno::Any& rVal)
+void SwFormat::SetGrabBagItem(const uno::Any& rVal)
 {
     if (!m_pGrabBagItem.get())
         m_pGrabBagItem.reset(new SfxGrabBagItem);
@@ -808,7 +808,7 @@ void SwFmt::SetGrabBagItem(const uno::Any& rVal)
 }
 
 //UUUU
-SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
+SvxBrushItem SwFormat::makeBackgroundBrushItem(bool bInP) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
@@ -825,7 +825,7 @@ SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFmt::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFormat::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
 }
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index c1e79806fdd2..266e2f155170 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -24,12 +24,12 @@
 #include <ndtxt.hxx>
 #include <swtypes.hxx>
 
-SwFmtChg::SwFmtChg( SwFmt* pFmt )
-    : SwMsgPoolItem( RES_FMT_CHG ), pChangedFmt( pFmt )
+SwFormatChg::SwFormatChg( SwFormat* pFormat )
+    : SwMsgPoolItem( RES_FMT_CHG ), pChangedFormat( pFormat )
 {
 }
 
-SwInsTxt::SwInsTxt( sal_Int32 nP, sal_Int32 nL )
+SwInsText::SwInsText( sal_Int32 nP, sal_Int32 nL )
     : SwMsgPoolItem( RES_INS_TXT ), nPos( nP ), nLen( nL )
 {
 }
@@ -39,17 +39,17 @@ SwDelChr::SwDelChr( sal_Int32 nP )
 {
 }
 
-SwDelTxt::SwDelTxt( sal_Int32 nS, sal_Int32 nL )
+SwDelText::SwDelText( sal_Int32 nS, sal_Int32 nL )
     : SwMsgPoolItem( RES_DEL_TXT ), nStart( nS ), nLen( nL )
 {
 }
 
 SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW )
-    : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFmtAttr()
+    : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFormatAttr()
 {
 }
 
-SwRefMarkFldUpdate::SwRefMarkFldUpdate( OutputDevice* pOutput )
+SwRefMarkFieldUpdate::SwRefMarkFieldUpdate( OutputDevice* pOutput )
     : SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
     pOut( pOutput )
 {
@@ -61,18 +61,18 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
 {
 }
 
-SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
+SwTableFormulaUpdate::SwTableFormulaUpdate( const SwTable* pNewTable )
     : SwMsgPoolItem( RES_TABLEFML_UPDATE ),
-    pTbl( pNewTbl ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
+    pTable( pNewTable ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
     eFlags( TBL_CALC )
 {
-    DATA.pDelTbl = 0;
+    DATA.pDelTable = 0;
     bModified = bBehindSplitLine = false;
-    OSL_ENSURE( pTbl, "No Table pointer" );
+    OSL_ENSURE( pTable, "No Table pointer" );
 }
 
-SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds )
-    : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pCntntNode( 0 ), pNodes( pNds )
+SwAutoFormatGetDocNode::SwAutoFormatGetDocNode( const SwNodes* pNds )
+    : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pContentNode( 0 ), pNodes( pNds )
 {
 }
 
@@ -129,7 +129,7 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
     OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
 
     SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
-    OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+    OSL_ENSURE( pHt, "GetDfltFormatAttr(): Dflt == 0" );
     return pHt;
 }
 #else
@@ -139,8 +139,8 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
 }
 #endif
 
-SwCondCollCondChg::SwCondCollCondChg( SwFmt *pFmt )
-    : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFmt( pFmt )
+SwCondCollCondChg::SwCondCollCondChg( SwFormat *pFormat )
+    : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFormat( pFormat )
 {
 }
 
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 8631b06e784c..13806f1a5b25 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -254,8 +254,8 @@ void  SwAttrSet::Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew )
 /** special treatment for some attributes
 
     Set the Modify pointer (old pDefinedIn) for the following attributes:
-     - SwFmtDropCaps
-     - SwFmtPageDesc
+     - SwFormatDropCaps
+     - SwFormatPageDesc
 
     (Is called at inserts into formats/nodes)
 */
@@ -265,32 +265,32 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
 
     const SfxPoolItem* pItem;
     if( SfxItemState::SET == GetItemState( RES_PAGEDESC, false, &pItem ) &&
-        static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn() != pModify  )
+        static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn() != pModify  )
     {
-        const_cast<SwFmtPageDesc*>(static_cast<const SwFmtPageDesc*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwFormatPageDesc*>(static_cast<const SwFormatPageDesc*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
     if( SfxItemState::SET == GetItemState( RES_PARATR_DROP, false, &pItem ) &&
-        static_cast<const SwFmtDrop*>(pItem)->GetDefinedIn() != pModify )
+        static_cast<const SwFormatDrop*>(pItem)->GetDefinedIn() != pModify )
     {
         // If CharFormat is set and it is set in different attribute pools then
         // the CharFormat has to be copied.
-        SwCharFmt* pCharFmt;
-        if( 0 != ( pCharFmt = const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->GetCharFmt() )
-            && GetPool() != pCharFmt->GetAttrSet().GetPool() )
+        SwCharFormat* pCharFormat;
+        if( 0 != ( pCharFormat = const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->GetCharFormat() )
+            && GetPool() != pCharFormat->GetAttrSet().GetPool() )
         {
-           pCharFmt = GetDoc()->CopyCharFmt( *pCharFmt );
-           const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->SetCharFmt( pCharFmt );
+           pCharFormat = GetDoc()->CopyCharFormat( *pCharFormat );
+           const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->SetCharFormat( pCharFormat );
         }
-        const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
     if( SfxItemState::SET == GetItemState( RES_BOXATR_FORMULA, false, &pItem ) &&
-        static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() != pModify )
+        static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() != pModify )
     {
-        const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
@@ -300,10 +300,10 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
 void SwAttrSet::CopyToModify( SwModify& rMod ) const
 {
     // copy attributes across multiple documents if needed
-    SwCntntNode* pCNd = PTR_CAST( SwCntntNode, &rMod );
-    SwFmt* pFmt = PTR_CAST( SwFmt, &rMod );
+    SwContentNode* pCNd = PTR_CAST( SwContentNode, &rMod );
+    SwFormat* pFormat = PTR_CAST( SwFormat, &rMod );
 
-    if( pCNd || pFmt )
+    if( pCNd || pFormat )
     {
         if( Count() )
         {
@@ -312,7 +312,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
 
             const SfxPoolItem* pItem;
             const SwDoc *pSrcDoc = GetDoc();
-            SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFmt->GetDoc();
+            SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFormat->GetDoc();
 
             // Does the NumRule has to be copied?
             if( pSrcDoc != pDstDoc &&
@@ -332,7 +332,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             // copy list and if needed also the corresponding list style
             // for text nodes
             if ( pSrcDoc != pDstDoc &&
-                 pCNd && pCNd->IsTxtNode() &&
+                 pCNd && pCNd->IsTextNode() &&
                  GetItemState( RES_PARATR_LIST_ID, false, &pItem ) == SfxItemState::SET )
             {
                 const OUString& sListId =
@@ -383,7 +383,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             const SwPageDesc* pPgDesc;
             if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState(
                                             RES_PAGEDESC, false, &pItem ) &&
-                0 != ( pPgDesc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()) )
+                0 != ( pPgDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()) )
             {
                 if( !tmpSet )
                     tmpSet.reset( new SfxItemSet( *this ));
@@ -394,13 +394,13 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                     pDstPgDesc = pDstDoc->MakePageDesc(pPgDesc->GetName());
                     pDstDoc->CopyPageDesc( *pPgDesc, *pDstPgDesc );
                 }
-                SwFmtPageDesc aDesc( pDstPgDesc );
-                aDesc.SetNumOffset( static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset() );
+                SwFormatPageDesc aDesc( pDstPgDesc );
+                aDesc.SetNumOffset( static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset() );
                 tmpSet->Put( aDesc );
             }
 
             if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState( RES_ANCHOR, false, &pItem )
-                && static_cast< const SwFmtAnchor* >( pItem )->GetCntntAnchor() != NULL )
+                && static_cast< const SwFormatAnchor* >( pItem )->GetContentAnchor() != NULL )
             {
                 if( !tmpSet )
                     tmpSet.reset( new SfxItemSet( *this ));
@@ -422,7 +422,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                 }
                 else
                 {
-                    pFmt->SetFmtAttr( *tmpSet );
+                    pFormat->SetFormatAttr( *tmpSet );
                 }
             }
             else if( pCNd )
@@ -441,7 +441,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             }
             else
             {
-                pFmt->SetFmtAttr( *this );
+                pFormat->SetFormatAttr( *this );
             }
 
             // #i92811#
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index b1c834926519..83285a49e847 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -97,44 +97,44 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang )
     m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() );
 }
 
-sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const
+sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const
 {
     createBreakIterator();
     sal_uInt16 nScript = i18n::ScriptType::WEAK;
-    if( xBreak.is() && !rTxt.isEmpty() )
+    if( xBreak.is() && !rText.isEmpty() )
     {
-        if( nPos && nPos == rTxt.getLength() )
+        if( nPos && nPos == rText.getLength() )
             --nPos;
         else if( nPos < 0)
             nPos = 0;
 
-        nScript = xBreak->getScriptType( rTxt, nPos );
+        nScript = xBreak->getScriptType( rText, nPos );
         sal_Int32 nChgPos = 0;
-        if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rTxt.getLength())
+        if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rText.getLength())
         {
             // A weak character followed by a mark may be meant to combine with
             // the mark, so prefer the following character's script
-            switch (u_charType(rTxt[nPos + 1]))
+            switch (u_charType(rText[nPos + 1]))
             {
                 case U_NON_SPACING_MARK:
                 case U_ENCLOSING_MARK:
                 case U_COMBINING_SPACING_MARK:
-                    nScript = xBreak->getScriptType( rTxt, nPos+1 );
+                    nScript = xBreak->getScriptType( rText, nPos+1 );
                     break;
             }
         }
         if( i18n::ScriptType::WEAK == nScript &&
             nPos &&
-            0 < ( nChgPos = xBreak->beginOfScript( rTxt, nPos, nScript ) ) )
+            0 < ( nChgPos = xBreak->beginOfScript( rText, nPos, nScript ) ) )
         {
-            nScript = xBreak->getScriptType( rTxt, nChgPos-1 );
+            nScript = xBreak->getScriptType( rText, nChgPos-1 );
         }
 
         if( i18n::ScriptType::WEAK == nScript &&
-            rTxt.getLength() > ( nChgPos = xBreak->endOfScript( rTxt, nPos, nScript ) ) &&
+            rText.getLength() > ( nChgPos = xBreak->endOfScript( rText, nPos, nScript ) ) &&
             0 <= nChgPos )
         {
-            nScript = xBreak->getScriptType( rTxt, nChgPos );
+            nScript = xBreak->getScriptType( rText, nChgPos );
         }
     }
     if( i18n::ScriptType::WEAK == nScript )
@@ -142,7 +142,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos
     return nScript;
 }
 
-SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
+SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rText ) const
 {
     const SvtScriptType coAllScripts = ( SvtScriptType::LATIN |
                                       SvtScriptType::ASIAN |
@@ -154,12 +154,12 @@ SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
     {
         nRet = coAllScripts;
     }
-    else if( !rTxt.isEmpty() )
+    else if( !rText.isEmpty() )
     {
-        for( sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd;
-                n = xBreak->endOfScript(rTxt, n, nScript) )
+        for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd;
+                n = xBreak->endOfScript(rText, n, nScript) )
         {
-            switch( nScript = xBreak->getScriptType( rTxt, n ) )
+            switch( nScript = xBreak->getScriptType( rText, n ) )
             {
             case i18n::ScriptType::LATIN:   nRet |= SvtScriptType::LATIN;   break;
             case i18n::ScriptType::ASIAN:   nRet |= SvtScriptType::ASIAN;   break;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index be2939e8eec6..1eb97f33e5e9 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -186,14 +186,14 @@ _CalcOp* FindOperator( const OUString& rSrch )
 }
 
 SwHash* Find( const OUString& rStr, SwHash* const * ppTable,
-              sal_uInt16 nTblSize, sal_uInt16* pPos )
+              sal_uInt16 nTableSize, sal_uInt16* pPos )
 {
     sal_uLong ii = 0;
     for( sal_Int32 n = 0; n < rStr.getLength(); ++n )
     {
         ii = ii << 1 ^ rStr[n];
     }
-    ii %= nTblSize;
+    ii %= nTableSize;
 
     if( pPos )
         *pPos = static_cast<sal_uInt16>(ii);
@@ -312,7 +312,7 @@ SwCalc::SwCalc( SwDoc& rD )
 
     static sal_uInt16 SwDocStat::* const aDocStat1[ 3 ] =
     {
-        &SwDocStat::nTbl, &SwDocStat::nGrf, &SwDocStat::nOLE
+        &SwDocStat::nTable, &SwDocStat::nGrf, &SwDocStat::nOLE
     };
     static sal_uLong SwDocStat::* const aDocStat2[ 4 ] =
     {
@@ -458,14 +458,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
     if( !pFnd )
     {
         // then check doc
-        SwHash* const * ppDocTbl = rDoc.getIDocumentFieldsAccess().GetUpdtFlds().GetFldTypeTable();
-        for( SwHash* pEntry = *(ppDocTbl+ii); pEntry; pEntry = pEntry->pNext )
+        SwHash* const * ppDocTable = rDoc.getIDocumentFieldsAccess().GetUpdateFields().GetFieldTypeTable();
+        for( SwHash* pEntry = *(ppDocTable+ii); pEntry; pEntry = pEntry->pNext )
         {
             if( aStr == pEntry->aStr )
             {
                 // then insert here
                 pFnd = new SwCalcExp( aStr, SwSbxValue(),
-                                    static_cast<SwCalcFldType*>(pEntry)->pFldType );
+                                    static_cast<SwCalcFieldType*>(pEntry)->pFieldType );
                 pFnd->pNext = *(VarTable+ii);
                 *(VarTable+ii) = pFnd;
                 break;
@@ -477,14 +477,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
     {
         SwCalcExp* pFndExp = static_cast<SwCalcExp*>(pFnd);
 
-        if( pFndExp->pFldType && pFndExp->pFldType->Which() == RES_USERFLD )
+        if( pFndExp->pFieldType && pFndExp->pFieldType->Which() == RES_USERFLD )
         {
-            SwUserFieldType* pUFld = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFldType));
-            if( nsSwGetSetExpType::GSE_STRING & pUFld->GetType() )
+            SwUserFieldType* pUField = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFieldType));
+            if( nsSwGetSetExpType::GSE_STRING & pUField->GetType() )
             {
-                pFndExp->nValue.PutString( pUFld->GetContent() );
+                pFndExp->nValue.PutString( pUField->GetContent() );
             }
-            else if( !pUFld->IsValid() )
+            else if( !pUField->IsValid() )
             {
                 // Save the current values...
                 sal_uInt16          nOld_ListPor        = nListPor;
@@ -494,7 +494,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
                 SwCalcOper      eOld_CurrOper       = eCurrOper;
                 SwCalcOper      eOld_CurrListOper   = eCurrListOper;
 
-                pFndExp->nValue.PutDouble( pUFld->GetValue( *this ) );
+                pFndExp->nValue.PutDouble( pUField->GetValue( *this ) );
 
                 // ...and write them back.
                 nListPor        = nOld_ListPor;
@@ -506,7 +506,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
             }
             else
             {
-                pFndExp->nValue.PutDouble( pUFld->GetValue() );
+                pFndExp->nValue.PutDouble( pUField->GetValue() );
             }
         }
         return pFndExp;
@@ -1589,7 +1589,7 @@ SwCalcExp::SwCalcExp(const OUString& rStr, const SwSbxValue& rVal,
                       const SwFieldType* pType)
     : SwHash(rStr)
     , nValue(rVal)
-    , pFldType(pType)
+    , pFieldType(pType)
 {
 }
 
@@ -1660,8 +1660,8 @@ void main()
         sNType24, sNType25, sNType26
     };
 
-    const unsigned short nTblSize = 47;
-    int aArr[ nTblSize ] = { 0 };
+    const unsigned short nTableSize = 47;
+    int aArr[ nTableSize ] = { 0 };
     sal_Char ch;
 
     for( int n = 0; n < 27; ++n )
@@ -1673,7 +1673,7 @@ void main()
         {
             ii = ii << 1 ^ *pp++;
         }
-        ii %= nTblSize;
+        ii %= nTableSize;
 
         ch = aArr[ ii ] ? 'X' : ' ';
         aArr[ ii ] = 1;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c83070914984..7439d300bd1f 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -141,10 +141,10 @@ sal_uInt16 aBreakSetRange[] = {
     0
 };
 
-// AttrSet range for TxtFmtColl
+// AttrSet range for TextFormatColl
 // list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not
 // included in the paragraph style's itemset.
-sal_uInt16 aTxtFmtCollSetRange[] = {
+sal_uInt16 aTextFormatCollSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -156,8 +156,8 @@ sal_uInt16 aTxtFmtCollSetRange[] = {
     0
 };
 
-// AttrSet range for GrfFmtColl
-sal_uInt16 aGrfFmtCollSetRange[] = {
+// AttrSet range for GrfFormatColl
+sal_uInt16 aGrfFormatCollSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_GRFATR_BEGIN, RES_GRFATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -165,7 +165,7 @@ sal_uInt16 aGrfFmtCollSetRange[] = {
 };
 
 // AttrSet range for TextNode
-sal_uInt16 aTxtNodeSetRange[] = {
+sal_uInt16 aTextNodeSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -178,8 +178,8 @@ sal_uInt16 aTxtNodeSetRange[] = {
     0
 };
 
-// AttrSet range for NoTxtNode
-sal_uInt16 aNoTxtNodeSetRange[] = {
+// AttrSet range for NoTextNode
+sal_uInt16 aNoTextNodeSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_GRFATR_BEGIN, RES_GRFATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -227,8 +227,8 @@ sal_uInt16 aTableBoxSetRange[] = {
     0
 };
 
-// AttrSet range for SwFrmFmt
-sal_uInt16 aFrmFmtSetRange[] = {
+// AttrSet range for SwFrameFormat
+sal_uInt16 aFrameFormatSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
@@ -238,23 +238,23 @@ sal_uInt16 aFrmFmtSetRange[] = {
     0
 };
 
-// AttrSet range for SwCharFmt
-sal_uInt16 aCharFmtSetRange[] = {
+// AttrSet range for SwCharFormat
+sal_uInt16 aCharFormatSetRange[] = {
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
 };
 
 // AttrSet range for character autostyles
-sal_uInt16 aCharAutoFmtSetRange[] = {
+sal_uInt16 aCharAutoFormatSetRange[] = {
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
 };
 
-// AttrSet range for SwPageDescFmt
-sal_uInt16 aPgFrmFmtSetRange[] = {
+// AttrSet range for SwPageDescFormat
+sal_uInt16 aPgFrameFormatSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
@@ -518,21 +518,21 @@ void _InitCore()
     aAttrTab[ RES_CHRATR_BIDIRTL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_BIDIRTL, sal_Int16(-1) );
     aAttrTab[ RES_CHRATR_IDCTHINT - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_IDCTHINT, sal_Int16(-1) );
 
-    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFmtRefMark( OUString() );
+    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFormatRefMark( OUString() );
     aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] =       new SwTOXMark;
-    aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] =          SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
-    aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] =     SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
-    aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] =        new SwFmtAutoFmt;
-    aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] =       new SwFmtINetFmt( OUString(), OUString() );
-    aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] =        new SwFmtCharFmt( 0 );
-    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFmtRuby( OUString() );
+    aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] =          SwFormatMeta::CreatePoolDefault(RES_TXTATR_META);
+    aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] =     SwFormatMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
+    aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] =        new SwFormatAutoFormat;
+    aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] =       new SwFormatINetFormat( OUString(), OUString() );
+    aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] =        new SwFormatCharFormat( 0 );
+    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFormatRuby( OUString() );
     aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
-    aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_INPUTFIELD );
+    aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_INPUTFIELD );
 
-    aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] =          new SwFmtFld( RES_TXTATR_FIELD );
-    aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] =        new SwFmtFlyCnt( 0 );
-    aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] =           new SwFmtFtn;
-    aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_ANNOTATION );
+    aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] =          new SwFormatField( RES_TXTATR_FIELD );
+    aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] =        new SwFormatFlyCnt( 0 );
+    aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] =           new SwFormatFootnote;
+    aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_ANNOTATION );
 
 // TextAttr - Dummies
     aAttrTab[ RES_TXTATR_DUMMY1 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_TXTATR_DUMMY1 );
@@ -541,7 +541,7 @@ void _InitCore()
 
     aAttrTab[ RES_PARATR_LINESPACING- POOLATTR_BEGIN ] =    new SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
     aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] =         new SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
-    aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] =          new SvxFmtSplitItem( true, RES_PARATR_SPLIT );
+    aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] =          new SvxFormatSplitItem( true, RES_PARATR_SPLIT );
     aAttrTab[ RES_PARATR_WIDOWS- POOLATTR_BEGIN ] =         new SvxWidowsItem( 0, RES_PARATR_WIDOWS );
     aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] =        new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
     aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] =        new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -550,7 +550,7 @@ void _InitCore()
     static_cast<SvxHyphenZoneItem*>(pItem)->GetMaxHyphens() = 0; // Default: 0
     aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] =     pItem;
 
-    aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFmtDrop;
+    aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFormatDrop;
     aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] =      new SwRegisterItem( false );
     aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] =       new SwNumRuleItem( OUString() );
 
@@ -571,51 +571,51 @@ void _InitCore()
     aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 );
     aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true );
 
-    aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] =            new SwFmtFillOrder;
-    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFmtFrmSize;
+    aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] =            new SwFormatFillOrder;
+    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFormatFrmSize;
     aAttrTab[ RES_PAPER_BIN- POOLATTR_BEGIN ] =             new SvxPaperBinItem( RES_PAPER_BIN );
     aAttrTab[ RES_LR_SPACE- POOLATTR_BEGIN ] =              new SvxLRSpaceItem( RES_LR_SPACE );
     aAttrTab[ RES_UL_SPACE- POOLATTR_BEGIN ] =              new SvxULSpaceItem( RES_UL_SPACE );
-    aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] =              new SwFmtPageDesc;
-    aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] =                 new SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK);
-    aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] =                 new SwFmtCntnt;
-    aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] =                new SwFmtHeader;
-    aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] =                new SwFmtFooter;
+    aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] =              new SwFormatPageDesc;
+    aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] =                 new SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK);
+    aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] =                 new SwFormatContent;
+    aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] =                new SwFormatHeader;
+    aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] =                new SwFormatFooter;
     aAttrTab[ RES_PRINT- POOLATTR_BEGIN ] =                 new SvxPrintItem( RES_PRINT );
     aAttrTab[ RES_OPAQUE- POOLATTR_BEGIN ] =                new SvxOpaqueItem( RES_OPAQUE );
     aAttrTab[ RES_PROTECT- POOLATTR_BEGIN ] =               new SvxProtectItem( RES_PROTECT );
-    aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] =              new SwFmtSurround;
-    aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] =           new SwFmtVertOrient;
-    aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] =           new SwFmtHoriOrient;
-    aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] =                new SwFmtAnchor;
+    aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] =              new SwFormatSurround;
+    aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] =           new SwFormatVertOrient;
+    aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] =           new SwFormatHoriOrient;
+    aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] =                new SwFormatAnchor;
     aAttrTab[ RES_BACKGROUND- POOLATTR_BEGIN ] =            new SvxBrushItem( RES_BACKGROUND );
     aAttrTab[ RES_BOX- POOLATTR_BEGIN ] =                   new SvxBoxItem( RES_BOX );
     aAttrTab[ RES_SHADOW- POOLATTR_BEGIN ] =                new SvxShadowItem( RES_SHADOW );
     aAttrTab[ RES_FRMMACRO- POOLATTR_BEGIN ] =              new SvxMacroItem( RES_FRMMACRO );
-    aAttrTab[ RES_COL- POOLATTR_BEGIN ] =                   new SwFmtCol;
-    aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] =                 new SvxFmtKeepItem( false, RES_KEEP );
-    aAttrTab[ RES_URL - POOLATTR_BEGIN ] =                  new SwFmtURL();
-    aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] =     new SwFmtEditInReadonly;
-    aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] =         new SwFmtLayoutSplit;
-    aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] =                new SwFmtChain;
+    aAttrTab[ RES_COL- POOLATTR_BEGIN ] =                   new SwFormatCol;
+    aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] =                 new SvxFormatKeepItem( false, RES_KEEP );
+    aAttrTab[ RES_URL - POOLATTR_BEGIN ] =                  new SwFormatURL();
+    aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] =     new SwFormatEditInReadonly;
+    aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] =         new SwFormatLayoutSplit;
+    aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] =                new SwFormatChain;
     aAttrTab[ RES_TEXTGRID - POOLATTR_BEGIN ] =             new SwTextGridItem;
     aAttrTab[ RES_HEADER_FOOTER_EAT_SPACING - POOLATTR_BEGIN ] = new SwHeaderAndFooterEatSpacingItem;
-    aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] =           new SwFmtLineNumber;
-    aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFmtFtnAtTxtEnd;
-    aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFmtEndAtTxtEnd;
-    aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] =        new SwFmtNoBalancedColumns;
+    aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] =           new SwFormatLineNumber;
+    aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFormatFootnoteAtTextEnd;
+    aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFormatEndAtTextEnd;
+    aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] =        new SwFormatNoBalancedColumns;
     aAttrTab[ RES_FRAMEDIR - POOLATTR_BEGIN ] =             new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
-    aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] =            new SwFmtRowSplit;
+    aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] =            new SwFormatRowSplit;
 
     // #i18732#
-    aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] =     new SwFmtFollowTextFlow(false);
+    aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] =     new SwFormatFollowTextFlow(false);
     // collapsing borders #i29550#
     aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] =   new SfxBoolItem( RES_COLLAPSING_BORDERS, false );
     // #i28701#
     // #i35017# - constant name has changed
-    aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
+    aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFormatWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
 
-    aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] =           new SwFmtAutoFmt( RES_AUTO_STYLE );
+    aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] =           new SwFormatAutoFormat( RES_AUTO_STYLE );
     aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] =    new SfxStringItem( RES_FRMATR_STYLE_NAME, OUString());
     aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, OUString() );
     aAttrTab[ RES_FRMATR_GRABBAG - POOLATTR_BEGIN ] = new SfxGrabBagItem(RES_FRMATR_GRABBAG);
@@ -641,9 +641,9 @@ void _InitCore()
     aAttrTab[ RES_GRFATR_DUMMY4 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_GRFATR_DUMMY4 );
     aAttrTab[ RES_GRFATR_DUMMY5 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_GRFATR_DUMMY5 );
 
-    aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] =         new SwTblBoxNumFormat;
-    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTblBoxFormula( OUString() );
-    aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] =          new SwTblBoxValue;
+    aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] =         new SwTableBoxNumFormat;
+    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTableBoxFormula( OUString() );
+    aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] =          new SwTableBoxValue;
 
     aAttrTab[ RES_UNKNOWNATR_CONTAINER- POOLATTR_BEGIN ] =
                 new SvXMLAttrContainerItem( RES_UNKNOWNATR_CONTAINER );
@@ -740,7 +740,7 @@ void _InitCore()
 
     pGlobalOLEExcludeList = new std::vector<SvGlobalName*>;
 
-    const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+    const SvxSwAutoFormatFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
     SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
                                             rAFlags.nAutoCmpltWordLen );
 }
@@ -758,12 +758,12 @@ void _FinitCore()
     delete pCaseCollator;
 
     // destroy default TableAutoFormat
-    delete SwTableAutoFmt::pDfltBoxAutoFmt;
+    delete SwTableAutoFormat::pDfltBoxAutoFormat;
 
     delete SwSelPaintRects::s_pMapMode;
     delete SwFntObj::pPixMap;
 
-    delete SwEditShell::s_pAutoFmtFlags;
+    delete SwEditShell::s_pAutoFormatFlags;
 
 #if OSL_DEBUG_LEVEL > 0
     // free defaults to prevent assertions
@@ -778,9 +778,9 @@ void _FinitCore()
     delete SwStyleNameMapper::pRegisterUINameArray;
     delete SwStyleNameMapper::pDocUINameArray;
     delete SwStyleNameMapper::pHTMLUINameArray;
-    delete SwStyleNameMapper::pFrmFmtUINameArray;
-    delete SwStyleNameMapper::pChrFmtUINameArray;
-    delete SwStyleNameMapper::pHTMLChrFmtUINameArray;
+    delete SwStyleNameMapper::pFrameFormatUINameArray;
+    delete SwStyleNameMapper::pChrFormatUINameArray;
+    delete SwStyleNameMapper::pHTMLChrFormatUINameArray;
     delete SwStyleNameMapper::pPageDescUINameArray;
     delete SwStyleNameMapper::pNumRuleUINameArray;
 
@@ -791,9 +791,9 @@ void _FinitCore()
     delete SwStyleNameMapper::pRegisterProgNameArray;
     delete SwStyleNameMapper::pDocProgNameArray;
     delete SwStyleNameMapper::pHTMLProgNameArray;
-    delete SwStyleNameMapper::pFrmFmtProgNameArray;
-    delete SwStyleNameMapper::pChrFmtProgNameArray;
-    delete SwStyleNameMapper::pHTMLChrFmtProgNameArray;
+    delete SwStyleNameMapper::pFrameFormatProgNameArray;
+    delete SwStyleNameMapper::pChrFormatProgNameArray;
+    delete SwStyleNameMapper::pHTMLChrFormatProgNameArray;
     delete SwStyleNameMapper::pPageDescProgNameArray;
     delete SwStyleNameMapper::pNumRuleProgNameArray;
 
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index d22cc8d79c4f..0910dd967beb 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -58,7 +58,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
@@ -72,10 +72,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat )
 IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos )
 
 Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index d66427fee1c6..0a308ecf69d2 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -51,15 +51,15 @@ namespace sw { namespace mark
 
     void AnnotationMark::InitDoc(SwDoc* const io_pDoc)
     {
-        SwTxtNode *pTxtNode = GetMarkEnd().nNode.GetNode().GetTxtNode();
+        SwTextNode *pTextNode = GetMarkEnd().nNode.GetNode().GetTextNode();
 
-        SwTxtFld* pTxtFld = pTxtNode ?
-            pTxtNode->GetFldTxtAttrAt(
+        SwTextField* pTextField = pTextNode ?
+            pTextNode->GetFieldTextAttrAt(
             GetMarkEnd().nContent.GetIndex()-1, true ) : NULL;
-        OSL_ENSURE( pTxtFld != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
-        if ( pTxtFld != NULL )
+        OSL_ENSURE( pTextField != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
+        if ( pTextField != NULL )
         {
-            const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTxtFld->GetFmtFld().GetField());
+            const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTextField->GetFormatField().GetField());
             OSL_ENSURE( pPostItField != NULL, "<AnnotationMark::InitDoc(..)> - annotation field missing!" );
             if ( pPostItField != NULL )
             {
@@ -81,33 +81,33 @@ namespace sw { namespace mark
         io_pDoc->getIDocumentState().SetModified();
     }
 
-    const SwFmtFld* AnnotationMark::GetAnnotationFmtFld() const
+    const SwFormatField* AnnotationMark::GetAnnotationFormatField() const
     {
         SwDoc* pDoc = GetMarkPos().GetDoc();
         if ( pDoc == NULL )
         {
-            OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFmtFld()> - missing document at annotation mark" );
+            OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFormatField()> - missing document at annotation mark" );
             return NULL;
         }
 
-        SwFmtFld* pAnnotationFmtFld = NULL;
+        SwFormatField* pAnnotationFormatField = NULL;
 
-        SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFldType( RES_POSTITFLD, OUString(), false );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld != NULL; pFmtFld = aIter.Next() )
+        SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFieldType( RES_POSTITFLD, OUString(), false );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField != NULL; pFormatField = aIter.Next() )
         {
-            if ( pFmtFld->IsFldInDoc() )
+            if ( pFormatField->IsFieldInDoc() )
             {
-                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFmtFld->GetField());
+                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFormatField->GetField());
                 if (pPostItField != NULL && pPostItField->GetName() == GetName())
                 {
-                    pAnnotationFmtFld = pFmtFld;
+                    pAnnotationFormatField = pFormatField;
                     break;
                 }
             }
         }
 
-        return pAnnotationFmtFld;
+        return pAnnotationFormatField;
     }
 }}
 
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 862fdb64adca..6b81556660ed 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -44,22 +44,22 @@ namespace
     static void lcl_FixPosition(SwPosition& rPos)
     {
         // make sure the position has 1) the proper node, and 2) a proper index
-        SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-        if(pTxtNode == NULL && rPos.nContent.GetIndex() > 0)
+        SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+        if(pTextNode == NULL && rPos.nContent.GetIndex() > 0)
         {
             SAL_INFO(
                 "sw.core",
                 "illegal position: " << rPos.nContent.GetIndex()
-                    << " without proper TxtNode");
+                    << " without proper TextNode");
             rPos.nContent.Assign(NULL, 0);
         }
-        else if(pTxtNode != NULL && rPos.nContent.GetIndex() > pTxtNode->Len())
+        else if(pTextNode != NULL && rPos.nContent.GetIndex() > pTextNode->Len())
         {
             SAL_INFO(
                 "sw.core",
                 "illegal position: " << rPos.nContent.GetIndex()
-                    << " is beyond " << pTxtNode->Len());
-            rPos.nContent.Assign(pTxtNode, pTxtNode->Len());
+                    << " is beyond " << pTextNode->Len());
+            rPos.nContent.Assign(pTextNode, pTextNode->Len());
         }
     }
 
@@ -71,9 +71,9 @@ namespace
         io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
 
         SwPosition rStart = pField->GetMarkStart();
-        SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
-        const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTxtNode->GetTxt().getLength() ) ? 0 :
-            pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+        SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
+        const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTextNode->GetText().getLength() ) ? 0 :
+            pStartTextNode->GetText()[rStart.nContent.GetIndex()];
         if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
         {
             SwPaM aStartPaM(rStart);
@@ -83,10 +83,10 @@ namespace
         }
 
         SwPosition& rEnd = pField->GetMarkEnd();
-        SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
         const sal_Int32 nEndPos = ( rEnd == rStart ||  rEnd.nContent.GetIndex() == 0 ) ?
             rEnd.nContent.GetIndex() : rEnd.nContent.GetIndex() - 1;
-        const sal_Unicode ch_end = nEndPos >= pEndTxtNode->GetTxt().getLength() ? 0 : pEndTxtNode->GetTxt()[nEndPos];
+        const sal_Unicode ch_end = nEndPos >= pEndTextNode->GetText().getLength() ? 0 : pEndTextNode->GetText()[nEndPos];
         if ( aEndMark && ( ch_end != aEndMark ) )
         {
             SwPaM aEndPaM(rEnd);
@@ -105,9 +105,9 @@ namespace
         io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
 
         const SwPosition& rStart = pField->GetMarkStart();
-        SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
         const sal_Unicode ch_start =
-            pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+            pStartTextNode->GetText()[rStart.nContent.GetIndex()];
 
         if( ch_start == aStartMark )
         {
@@ -117,11 +117,11 @@ namespace
         }
 
         const SwPosition& rEnd = pField->GetMarkEnd();
-        SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
         const sal_Int32 nEndPos = ( rEnd == rStart ||  rEnd.nContent.GetIndex() == 0 )
                                    ? rEnd.nContent.GetIndex()
                                    : rEnd.nContent.GetIndex() - 1;
-        const sal_Unicode ch_end = pEndTxtNode->GetTxt()[nEndPos];
+        const sal_Unicode ch_end = pEndTextNode->GetText()[nEndPos];
         if ( ch_end == aEndMark )
         {
             SwPaM aEnd(rEnd, rEnd);
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 60ddc4601b03..76e8e3bcfc77 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -36,9 +36,9 @@
 #include <breakit.hxx>
 #include <vcl/window.hxx>
 
-SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                         sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection )
-    : rShell( rSh ), nNode( nAktNode ), nCntnt( nAktCntnt ),
+    : rShell( rSh ), nNode( nAktNode ), nContent( nAktContent ),
       nNdTyp( nAktNdTyp ), nLeftFrmPos( nLRPos ),
       bHasSelection( bAktSelection )
 {
@@ -48,15 +48,15 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
     : rShell( rSh )
 {
     // remember SPoint-values of current cursor
-    SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
+    SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
     SwNode& rNd = pCrsr->GetPoint()->nNode.GetNode();
     nNode = rNd.GetIndex();
-    nCntnt = pCrsr->GetPoint()->nContent.GetIndex();
+    nContent = pCrsr->GetPoint()->nContent.GetIndex();
     nNdTyp = rNd.GetNodeType();
     bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
 
-    if( rNd.IsTxtNode() )
-        nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTxtNode(), nCntnt,
+    if( rNd.IsTextNode() )
+        nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTextNode(), nContent,
                                             !rShell.ActionPend() );
     else
     {
@@ -65,14 +65,14 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
         // A special treatment for SwFeShell:
         // When deleting the header/footer, footnotes SwFeShell sets the
         // Cursor to NULL (Node + Content).
-        // If the Cursor is not on a CntntNode (ContentNode) this fact gets
+        // If the Cursor is not on a ContentNode (ContentNode) this fact gets
         // saved in NdType.
         if( ND_CONTENTNODE & nNdTyp )
             nNdTyp = 0;
     }
 }
 
-static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
+static void lcl_notifyRow(const SwContentNode* pNode, SwCrsrShell& rShell)
 {
     if ( !pNode )
         return;
@@ -95,7 +95,7 @@ static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
         {
             if (pContent->GetType() == FRM_TAB)
             {
-                SwFmtFrmSize pSize = pLine->GetFrmFmt()->GetFrmSize();
+                SwFormatFrmSize pSize = pLine->GetFrameFormat()->GetFrmSize();
                 pRow->ModifyNotification(NULL, &pSize);
                 return;
             }
@@ -110,22 +110,22 @@ SwCallLink::~SwCallLink()
 
     // If travelling over Nodes check formats and register them anew at the
     // new Node.
-    SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
-    SwCntntNode * pCNd = pCurCrsr->GetCntntNode();
+    SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
+    SwContentNode * pCNd = pCurCrsr->GetContentNode();
     if( !pCNd )
         return;
 
     lcl_notifyRow(pCNd, rShell);
 
     const SwDoc *pDoc=rShell.GetDoc();
-    const SwCntntNode *pNode = NULL;
+    const SwContentNode *pNode = NULL;
     if ( ( pDoc != NULL && nNode < pDoc->GetNodes( ).Count( ) ) )
     {
-        pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+        pNode = pDoc->GetNodes()[nNode]->GetContentNode();
     }
     lcl_notifyRow(pNode, rShell);
 
-    sal_Int32 nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
+    sal_Int32 nCmp, nAktContent = pCurCrsr->GetPoint()->nContent.GetIndex();
     sal_uInt16 nNdWhich = pCNd->GetNodeType();
     sal_uLong nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex();
 
@@ -147,32 +147,32 @@ SwCallLink::~SwCallLink()
         rShell.CallChgLnk();
     }
     else if( rShell.m_aChgLnk.IsSet() && ND_TEXTNODE == nNdWhich &&
-             nCntnt != nAktCntnt )
+             nContent != nAktContent )
     {
         // If travelling with left/right only and the frame is
         // unchanged (columns!) then check text hints.
-        if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTxtNode(), nAktCntnt,
+        if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTextNode(), nAktContent,
                                                     !rShell.ActionPend() ) &&
-            (( nCmp = nCntnt ) + 1 == nAktCntnt ||          // Right
-            nCntnt -1 == ( nCmp = nAktCntnt )) )            // Left
+            (( nCmp = nContent ) + 1 == nAktContent ||          // Right
+            nContent -1 == ( nCmp = nAktContent )) )            // Left
         {
-            if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & select
+            if( nCmp == nAktContent && pCurCrsr->HasMark() ) // left & select
                 ++nCmp;
 
-            if ( pCNd->GetTxtNode()->HasHints() )
+            if ( pCNd->GetTextNode()->HasHints() )
             {
-                const SwpHints &rHts = pCNd->GetTxtNode()->GetSwpHints();
+                const SwpHints &rHts = pCNd->GetTextNode()->GetSwpHints();
 
                 for( size_t n = 0; n < rHts.Count(); ++n )
                 {
-                    const SwTxtAttr* pHt = rHts[ n ];
+                    const SwTextAttr* pHt = rHts[ n ];
                     const sal_Int32 *pEnd = pHt->End();
                     const sal_Int32 nStart = pHt->GetStart();
 
                     // If "only start" or "start and end equal" then call on
                     // every overflow of start.
                     if( ( !pEnd || ( nStart == *pEnd ) ) &&
-                        ( nStart == nCntnt || nStart == nAktCntnt) )
+                        ( nStart == nContent || nStart == nAktContent) )
                     {
                         rShell.CallChgLnk();
                         return;
@@ -193,10 +193,10 @@ SwCallLink::~SwCallLink()
 
             if( g_pBreakIt->GetBreakIter().is() )
             {
-                const OUString rTxt = pCNd->GetTxtNode()->GetTxt();
+                const OUString rText = pCNd->GetTextNode()->GetText();
                 if( !nCmp ||
-                    g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp )
-                     != g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp - 1 ))
+                    g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp )
+                     != g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp - 1 ))
                 {
                     rShell.CallChgLnk();
                     return;
@@ -215,8 +215,8 @@ SwCallLink::~SwCallLink()
     if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(), 0, 0, false) ) &&
         0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
     {
-        const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
-        OSL_ENSURE( pIndex, "Fly without Cntnt" );
+        const SwNodeIndex* pIndex = pFlyFrm->GetFormat()->GetContent().GetContentIdx();
+        OSL_ENSURE( pIndex, "Fly without Content" );
 
         if (!pIndex)
             return;
@@ -225,14 +225,14 @@ SwCallLink::~SwCallLink()
 
         if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
             nNode > rStNd.EndOfSectionIndex() )
-            rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFmt() );
+            rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFormat() );
     }
 }
 
-long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
+long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
 {
-    SwTxtFrm* pFrm = static_cast<SwTxtFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
-    SwTxtFrm* pNext;
+    SwTextFrm* pFrm = static_cast<SwTextFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
+    SwTextFrm* pNext;
     if ( pFrm && !pFrm->IsHiddenNow() )
     {
         if( pFrm->HasFollow() )
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 85e9799472c9..b0aebe7aa21b 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -23,7 +23,7 @@
 #include <tools/solar.h>
 
 class SwCrsrShell;
-class SwTxtNode;
+class SwTextNode;
 class SwRootFrm;
 
 class SwCallLink
@@ -31,18 +31,18 @@ class SwCallLink
 public:
     SwCrsrShell & rShell;
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
     sal_uInt8 nNdTyp;
     long nLeftFrmPos;
     bool bHasSelection;
 
     explicit SwCallLink( SwCrsrShell & rSh );
-    SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+    SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                                     sal_uInt8 nAktNdTyp, long nLRPos,
                                     bool bAktSelection );
     ~SwCallLink();
 
-    static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
+    static long getLayoutFrm( const SwRootFrm*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 67a25d07520c..9ec38bdc5e29 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -51,7 +51,7 @@ namespace sw { namespace mark
 
     void CrossRefBookmark::SetMarkPos(const SwPosition& rNewPos)
     {
-        assert(rNewPos.nNode.GetNode().GetTxtNode() &&
+        assert(rNewPos.nNode.GetNode().GetTextNode() &&
             "<sw::mark::CrossRefBookmark::SetMarkPos(..)>"
             " - new bookmark position for cross-reference bookmark doesn't mark text node");
         assert(rNewPos.nContent.GetIndex() == 0 &&
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 4aa3dcd7bc2f..98dc7fddc554 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -181,28 +181,28 @@ SwPaM & SwCrsrShell::GetCurrentShellCursor()
  * Return pointer to the current shell cursor
  * @return - returns pointer to current `SwPaM` shell cursor
  */
-SwPaM* SwCrsrShell::GetCrsr( bool bMakeTblCrsr ) const
+SwPaM* SwCrsrShell::GetCrsr( bool bMakeTableCrsr ) const
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
-        if( bMakeTblCrsr && m_pTblCrsr->IsCrsrMovedUpdt() )
+        if( bMakeTableCrsr && m_pTableCrsr->IsCrsrMovedUpdate() )
         {
             //don't re-create 'parked' cursors
-            const SwCntntNode* pCNd;
-            if( m_pTblCrsr->GetPoint()->nNode.GetIndex() &&
-                m_pTblCrsr->GetMark()->nNode.GetIndex() &&
-                0 != ( pCNd = m_pTblCrsr->GetCntntNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
-                0 != ( pCNd = m_pTblCrsr->GetCntntNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
+            const SwContentNode* pCNd;
+            if( m_pTableCrsr->GetPoint()->nNode.GetIndex() &&
+                m_pTableCrsr->GetMark()->nNode.GetIndex() &&
+                0 != ( pCNd = m_pTableCrsr->GetContentNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
+                0 != ( pCNd = m_pTableCrsr->GetContentNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
             {
-                SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTblCrsr;
-                GetLayout()->MakeTblCrsrs( *pTC );
+                SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTableCrsr;
+                GetLayout()->MakeTableCrsrs( *pTC );
             }
         }
 
-        if( m_pTblCrsr->IsChgd() )
+        if( m_pTableCrsr->IsChgd() )
         {
             const_cast<SwCrsrShell*>(this)->m_pCurCrsr =
-                dynamic_cast<SwShellCrsr*>(m_pTblCrsr->MakeBoxSels( m_pCurCrsr ));
+                dynamic_cast<SwShellCrsr*>(m_pTableCrsr->MakeBoxSels( m_pCurCrsr ));
         }
     }
     return m_pCurCrsr;
@@ -215,11 +215,11 @@ void SwCrsrShell::StartAction()
         // save for update of the ribbon bar
         const SwNode& rNd = m_pCurCrsr->GetPoint()->nNode.GetNode();
         m_nAktNode = rNd.GetIndex();
-        m_nAktCntnt = m_pCurCrsr->GetPoint()->nContent.GetIndex();
+        m_nAktContent = m_pCurCrsr->GetPoint()->nContent.GetIndex();
         m_nAktNdTyp = rNd.GetNodeType();
         m_bAktSelection = *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark();
-        if( rNd.IsTxtNode() )
-            m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTxtNode&>(*rNd.GetTxtNode()), m_nAktCntnt, true );
+        if( rNd.IsTextNode() )
+            m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true );
         else
             m_nLeftFrmPos = 0;
     }
@@ -273,7 +273,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
 
             {
                 // watch Crsr-Moves, call Link if needed, the DTOR is key here!
-                SwCallLink aLk( *this, m_nAktNode, m_nAktCntnt, (sal_uInt8)m_nAktNdTyp,
+                SwCallLink aLk( *this, m_nAktNode, m_nAktContent, (sal_uInt8)m_nAktNdTyp,
                                 m_nLeftFrmPos, m_bAktSelection );
 
             }
@@ -295,7 +295,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
         SwCallLink aLk( *this );        // watch Crsr-Moves
         aLk.nNode = m_nAktNode;           // call Link if needed
         aLk.nNdTyp = (sal_uInt8)m_nAktNdTyp;
-        aLk.nCntnt = m_nAktCntnt;
+        aLk.nContent = m_nAktContent;
         aLk.nLeftFrmPos = m_nLeftFrmPos;
 
         if( !m_nCrsrMove ||
@@ -343,7 +343,7 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     bool bRet = false;
 
     // #i27615# Handle cursor in front of label.
-    const SwTxtNode* pTxtNd = 0;
+    const SwTextNode* pTextNd = 0;
 
     if( m_pBlockCrsr )
         m_pBlockCrsr->clearPoints();
@@ -360,8 +360,8 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     // to the left will simply set the bInFrontOfLabel flag:
     else if ( bLeft && 0 == pShellCrsr->GetPoint()->nContent.GetIndex() &&
              !pShellCrsr->IsInFrontOfLabel() && !pShellCrsr->HasMark() &&
-             0 != ( pTxtNd = pShellCrsr->GetNode().GetTxtNode() ) &&
-             pTxtNd->HasVisibleNumberingOrBullet() )
+             0 != ( pTextNd = pShellCrsr->GetNode().GetTextNode() ) &&
+             pTextNd->HasVisibleNumberingOrBullet() )
     {
         SetInFrontOfLabel( true );
         bRet = true;
@@ -412,23 +412,23 @@ void SwCrsrShell::MarkListLevel( const OUString& sListId,
 
 void SwCrsrShell::UpdateMarkedListLevel()
 {
-    SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
+    SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
 
-    if ( pTxtNd )
+    if ( pTextNd )
     {
-        if ( !pTxtNd->IsNumbered() )
+        if ( !pTextNd->IsNumbered() )
         {
             m_pCurCrsr->_SetInFrontOfLabel( false );
             MarkListLevel( OUString(), 0 );
         }
         else if ( m_pCurCrsr->IsInFrontOfLabel() )
         {
-            if ( pTxtNd->IsInList() )
+            if ( pTextNd->IsInList() )
             {
-                OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 &&
-                        pTxtNd->GetActualListLevel() < MAXLEVEL, "Which level?");
-                MarkListLevel( pTxtNd->GetListId(),
-                               pTxtNd->GetActualListLevel() );
+                OSL_ENSURE( pTextNd->GetActualListLevel() >= 0 &&
+                        pTextNd->GetActualListLevel() < MAXLEVEL, "Which level?");
+                MarkListLevel( pTextNd->GetListId(),
+                               pTextNd->GetActualListLevel() );
             }
         }
         else
@@ -525,11 +525,11 @@ bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
         m_eMvState = MV_UPDOWN; // status for Crsr travelling - GetCrsrOfst
         if( !ActionPend() )
         {
-            CrsrFlag eUpdtMode = SwCrsrShell::SCROLLWIN;
+            CrsrFlag eUpdateMode = SwCrsrShell::SCROLLWIN;
             if( !bTableMode )
-                eUpdtMode = (CrsrFlag) (eUpdtMode
+                eUpdateMode = (CrsrFlag) (eUpdateMode
                             | SwCrsrShell::UPDOWN | SwCrsrShell::CHKRANGE);
-            UpdateCrsr( static_cast<sal_uInt16>(eUpdtMode) );
+            UpdateCrsr( static_cast<sal_uInt16>(eUpdateMode) );
         }
     }
     return bRet;
@@ -554,8 +554,8 @@ bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
 
     if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCrsr()->HasMark() )
     {
-        const SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
-        if ( pTxtNd && pTxtNd->HasVisibleNumberingOrBullet() )
+        const SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
+        if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() )
             SetInFrontOfLabel( true );
     }
     else if ( !bLeft )
@@ -605,7 +605,7 @@ void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
     pPos->nContent.Assign( rNodes.GoNext( &pPos->nNode ), 0 );
     pPos = m_pCurCrsr->GetMark();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
+    SwContentNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
     pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 }
 
@@ -613,10 +613,10 @@ bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext();
-    SwCntntNode* pStart = rNodes.GoNext(&nNode);
+    SwContentNode* pStart = rNodes.GoNext(&nNode);
 
     nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pEnd = SwNodes::GoPrevious(&nNode);
+    SwContentNode* pEnd = SwNodes::GoPrevious(&nNode);
 
     if (!pStart || !pEnd)
         return false;
@@ -631,8 +631,8 @@ bool SwCrsrShell::StartsWithTable()
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode(rNodes.GetEndOfExtras());
-    SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
-    return pCntntNode->FindTableNode();
+    SwContentNode* pContentNode = rNodes.GoNext(&nNode);
+    return pContentNode->FindTableNode();
 }
 
 bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
@@ -640,14 +640,14 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
     bool bRet = false;
 
     // never jump of section borders at selection
-    if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoCntnt() )
+    if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoContent() )
     {
         SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
         SET_CURR_SHELL( this );
 
         SwCrsrSaveState aSaveState( *m_pCurCrsr );
         Point& rPt = m_pCurCrsr->GetPtPos();
-        SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->
+        SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->
                             getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
         if( pFrm && ( bRet = GetFrmInPage( pFrm, fnWhichPage,
                                            fnPosPage, m_pCurCrsr )  ) &&
@@ -660,12 +660,12 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
     return bRet;
 }
 
-bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
+bool SwCrsrShell::isInHiddenTextFrm(SwShellCrsr* pShellCrsr)
 {
-    SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
-    SwCntntFrm  *pFrm = pCNode ?
+    SwContentNode *pCNode = pShellCrsr->GetContentNode();
+    SwContentFrm  *pFrm = pCNode ?
         pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false ) : 0;
-    return !pFrm || (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow());
+    return !pFrm || (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow());
 }
 
 bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
@@ -680,7 +680,7 @@ bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
         //which is what SwCrsrShell::UpdateCrsrPos will reset
         //the position to if we pass it a position in an
         //invisible hidden paragraph field
-        while (isInHiddenTxtFrm(pTmpCrsr))
+        while (isInHiddenTextFrm(pTmpCrsr))
         {
             if (!pTmpCrsr->MovePara(fnWhichPara, fnPosPara))
                 break;
@@ -708,10 +708,10 @@ bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
 static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
 {
     SwFrm* pFrm = 0;
-    SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = rIdx.GetNode().GetContentNode();
     if( pCNd )
     {
-        SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
+        SwContentFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
         pFrm = pCntFrm ? pCntFrm->GetUpper() : NULL;
         while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
             pFrm = pFrm->IsFlyFrm() ? static_cast<SwFlyFrm*>(pFrm)->AnchorFrm()
@@ -741,12 +741,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
                                     bOnlyText ?  MV_SETONLYTEXT : MV_NONE );
     aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
 
-    SwTxtNode * pTxtNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode * pTextNd = pCrsr->GetNode().GetTextNode();
 
-    if ( pTxtNd && !IsTableMode() &&
+    if ( pTextNd && !IsTableMode() &&
         // #i37515# No bInFrontOfLabel during selection
         !pCrsr->HasMark() &&
-        pTxtNd->HasVisibleNumberingOrBullet() )
+        pTextNd->HasVisibleNumberingOrBullet() )
     {
         aTmpState.bInFrontOfLabel = true; // #i27615#
     }
@@ -792,12 +792,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
                 if( pFrm->Frm().IsInside( rAktCrsrPt ))
                     return bRet;
             }
-            else if( aPos.nNode.GetNode().IsCntntNode() )
+            else if( aPos.nNode.GetNode().IsContentNode() )
             {
                 // in the same frame?
-                SwFrm* pOld = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrm* pOld = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
                                 GetLayout(), &m_aCharRect.Pos(), 0, false );
-                SwFrm* pNew = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrm* pNew = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
                                 GetLayout(), &aPt, 0, false );
                 if( pNew == pOld )
                     return bRet;
@@ -836,7 +836,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     }
     else if( bOnlyText && !m_pCurCrsr->HasMark() )
     {
-        if( FindValidCntntNode( bOnlyText ) )
+        if( FindValidContentNode( bOnlyText ) )
         {
             // position cursor in a valid content
             if( aPos == *pCrsr->GetPoint() )
@@ -863,10 +863,10 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     return bRet;
 }
 
-void SwCrsrShell::TblCrsrToCursor()
+void SwCrsrShell::TableCrsrToCursor()
 {
-    OSL_ENSURE( m_pTblCrsr, "TblCrsrToCursor: Why?" );
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    OSL_ENSURE( m_pTableCrsr, "TableCrsrToCursor: Why?" );
+    delete m_pTableCrsr, m_pTableCrsr = 0;
 }
 
 void SwCrsrShell::BlockCrsrToCrsr()
@@ -907,7 +907,7 @@ void SwCrsrShell::CrsrToBlockCrsr()
 void SwCrsrShell::ClearMark()
 {
     // is there any GetMark?
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         std::vector<SwViewShell*> vShells;
         for(SwViewShell& rShell : GetRingContainer())
@@ -915,13 +915,13 @@ void SwCrsrShell::ClearMark()
                 vShells.push_back(&rShell);
         for(SwViewShell* pShell : vShells)
             delete pShell;
-        m_pTblCrsr->DeleteMark();
+        m_pTableCrsr->DeleteMark();
 
         m_pCurCrsr->DeleteMark();
 
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr, m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr, m_pTableCrsr = 0;
         m_pCurCrsr->SwSelPaintRects::Show();
     }
     else
@@ -965,8 +965,8 @@ bool SwCrsrShell::ChgCurrPam(
     SET_CURR_SHELL( this );
 
     // check if the SPoint is in a table selection
-    if( bTstOnly && m_pTblCrsr )
-        return m_pTblCrsr->IsInside( rPt );
+    if( bTstOnly && m_pTableCrsr )
+        return m_pTableCrsr->IsInside( rPt );
 
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     // search position <rPt> in document
@@ -999,21 +999,21 @@ bool SwCrsrShell::ChgCurrPam(
 void SwCrsrShell::KillPams()
 {
     // Does any exist for deletion?
-    if( !m_pTblCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
+    if( !m_pTableCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
         return;
 
     while( m_pCurCrsr->GetNext() != m_pCurCrsr )
         delete m_pCurCrsr->GetNext();
     m_pCurCrsr->SetColumnSelection( false );
 
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         // delete the ring of cursors
         m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr;
-        m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr;
+        m_pTableCrsr = 0;
     }
     else if( m_pBlockCrsr )
     {
@@ -1079,7 +1079,7 @@ bool SwCrsrShell::IsSttPara() const
 {   return m_pCurCrsr->GetPoint()->nContent == 0; }
 
 bool SwCrsrShell::IsEndPara() const
-{   return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetCntntNode()->Len(); }
+{   return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetContentNode()->Len(); }
 
 bool SwCrsrShell::IsEndOfTable() const
 {
@@ -1087,14 +1087,14 @@ bool SwCrsrShell::IsEndOfTable() const
     {
         return false;
     }
-    SwTableNode const*const pTableNode( IsCrsrInTbl() );
+    SwTableNode const*const pTableNode( IsCrsrInTable() );
     if (!pTableNode)
     {
         return false;
     }
     SwEndNode const*const pEndTableNode(pTableNode->EndOfSectionNode());
     SwNodeIndex const lastNode(*pEndTableNode, -2);
-    SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), "sw.core",
+    SAL_WARN_IF(!lastNode.GetNode().GetTextNode(), "sw.core",
             "text node expected");
     return (lastNode == m_pCurCrsr->GetPoint()->nNode);
 }
@@ -1130,7 +1130,7 @@ bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
 
 bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
 {
-    SwCntntFrm* pFrm = GetCurrFrm();
+    SwContentFrm* pFrm = GetCurrFrm();
     return pFrm->GetCharRect( rRect, *pPos );
 }
 
@@ -1139,7 +1139,7 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
-    const SwCntntFrm* pCFrm;
+    const SwContentFrm* pCFrm;
     const SwPageFrm *pPg = 0;
 
     if( !bAtCrsrPos || 0 == (pCFrm = GetCurrFrm( bCalcFrm )) ||
@@ -1258,7 +1258,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
 
     if( m_bHasFocus && !m_bBasicHideCrsr )
     {
-        SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
 
         if( !ActionPend() )
         {
@@ -1314,7 +1314,7 @@ void SwCrsrShell::UpdateCrsrPos()
     SwShellCrsr* pShellCrsr = getShellCrsr( true );
     Size aOldSz( GetDocSize() );
 
-    if( isInHiddenTxtFrm(pShellCrsr) )
+    if( isInHiddenTextFrm(pShellCrsr) )
     {
         SwCrsrMoveState aTmpState( MV_NONE );
         aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
@@ -1351,18 +1351,18 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx )
 static void lcl_CheckHiddenPara( SwPosition& rPos )
 {
     SwNodeIndex aTmp( rPos.nNode );
-    SwTxtNode* pTxtNd = aTmp.GetNode().GetTxtNode();
-    while( pTxtNd && pTxtNd->HasHiddenCharAttribute( true ) )
+    SwTextNode* pTextNd = aTmp.GetNode().GetTextNode();
+    while( pTextNd && pTextNd->HasHiddenCharAttribute( true ) )
     {
-        SwCntntNode* pCntnt = aTmp.GetNodes().GoNext( &aTmp );
-        if ( pCntnt && pCntnt->IsTxtNode() )
-            pTxtNd = pCntnt->GetTxtNode();
+        SwContentNode* pContent = aTmp.GetNodes().GoNext( &aTmp );
+        if ( pContent && pContent->IsTextNode() )
+            pTextNd = pContent->GetTextNode();
         else
-            pTxtNd = 0;
+            pTextNd = 0;
     }
 
-    if ( pTxtNd )
-        rPos = SwPosition( aTmp, SwIndex( pTxtNd, 0 ) );
+    if ( pTextNd )
+        rPos = SwPosition( aTmp, SwIndex( pTextNd, 0 ) );
 }
 
 // #i27301# - helper class that notifies the accessibility about invalid text
@@ -1409,14 +1409,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         CheckRange( m_pCurCrsr );             // overlapping ranges
 
     if( !bIdleEnd )
-        CheckTblBoxCntnt();
+        CheckTableBoxContent();
 
     // If the current cursor is in a table and point/mark in different boxes,
-    // then the table mode is active (also if it is already active: m_pTblCrsr)
+    // then the table mode is active (also if it is already active: m_pTableCrsr)
     SwPaM* pTstCrsr = getShellCrsr( true );
     if( pTstCrsr->HasMark() && !m_pBlockCrsr &&
-        mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
-          ( m_pTblCrsr ||
+        mpDoc->IsIdxInTable( pTstCrsr->GetPoint()->nNode ) &&
+          ( m_pTableCrsr ||
             pTstCrsr->GetNode( true ).StartOfSectionNode() !=
             pTstCrsr->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll)
     {
@@ -1436,36 +1436,36 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             lcl_CheckHiddenPara( *pITmpCrsr->GetMark() );
         }
 
-        SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
+        SwContentFrm *pTableFrm = pPos->nNode.GetNode().GetContentNode()->
                               getLayoutFrm( GetLayout(), &aTmpPt, pPos, false );
 
-        OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
+        OSL_ENSURE( pTableFrm, "Tabelle Crsr nicht im Content ??" );
 
         // --> Make code robust. The table cursor may point
         // to a table in a currently inactive header.
-        SwTabFrm *pTab = pTblFrm ? pTblFrm->FindTabFrm() : 0;
+        SwTabFrm *pTab = pTableFrm ? pTableFrm->FindTabFrm() : 0;
 
         if ( pTab && pTab->GetTable()->GetRowsToRepeat() > 0 )
         {
             // First check if point is in repeated headline:
-            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTblFrm );
+            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTableFrm );
 
             // Second check if mark is in repeated headline:
             if ( !bInRepeatedHeadline )
             {
-                SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( false )->
+                SwContentFrm* pMarkTableFrm = pITmpCrsr->GetContentNode( false )->
                     getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), false );
-                OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
+                OSL_ENSURE( pMarkTableFrm, "Tabelle Crsr nicht im Content ??" );
 
-                if ( pMarkTblFrm )
+                if ( pMarkTableFrm )
                 {
-                    SwTabFrm* pMarkTab = pMarkTblFrm->FindTabFrm();
+                    SwTabFrm* pMarkTab = pMarkTableFrm->FindTabFrm();
                     OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
 
                     // Make code robust:
                     if ( pMarkTab )
                     {
-                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTblFrm );
+                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTableFrm );
                     }
                 }
             }
@@ -1473,20 +1473,20 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             // No table cursor in repeated headlines:
             if ( bInRepeatedHeadline )
             {
-                pTblFrm = 0;
+                pTableFrm = 0;
 
                 SwPosSection fnPosSect = *pPos <  *pITmpCrsr->GetMark()
                                             ? fnSectionStart
                                             : fnSectionEnd;
 
                 // then only select inside the Box
-                if( m_pTblCrsr )
+                if( m_pTableCrsr )
                 {
                     m_pCurCrsr->SetMark();
-                    *m_pCurCrsr->GetMark() = *m_pTblCrsr->GetMark();
-                    m_pCurCrsr->GetMkPos() = m_pTblCrsr->GetMkPos();
-                    m_pTblCrsr->DeleteMark();
-                    m_pTblCrsr->SwSelPaintRects::Hide();
+                    *m_pCurCrsr->GetMark() = *m_pTableCrsr->GetMark();
+                    m_pCurCrsr->GetMkPos() = m_pTableCrsr->GetMkPos();
+                    m_pTableCrsr->DeleteMark();
+                    m_pTableCrsr->SwSelPaintRects::Hide();
                 }
 
                 *m_pCurCrsr->GetPoint() = *m_pCurCrsr->GetMark();
@@ -1495,18 +1495,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         }
 
         // we really want a table selection
-        if( pTab && pTblFrm )
+        if( pTab && pTableFrm )
         {
-            if( !m_pTblCrsr )
+            if( !m_pTableCrsr )
             {
-                m_pTblCrsr = new SwShellTableCrsr( *this,
+                m_pTableCrsr = new SwShellTableCrsr( *this,
                                 *m_pCurCrsr->GetMark(), m_pCurCrsr->GetMkPos(),
                                 *pPos, aTmpPt );
                 m_pCurCrsr->DeleteMark();
                 m_pCurCrsr->SwSelPaintRects::Hide();
 
-                CheckTblBoxCntnt();
-                if(!m_pTblCrsr)
+                CheckTableBoxContent();
+                if(!m_pTableCrsr)
                 {
                     SAL_WARN("sw", "fdo#74854: "
                         "this should not happen, but better lose the selection "
@@ -1517,13 +1517,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
             SwCrsrMoveState aTmpState( MV_NONE );
             aTmpState.bRealHeight = true;
-            if( !pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint(), &aTmpState ) )
+            if( !pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint(), &aTmpState ) )
             {
                 Point aCentrPt( m_aCharRect.Center() );
                 aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-                pTblFrm->GetCrsrOfst( m_pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
+                pTableFrm->GetCrsrOfst( m_pTableCrsr->GetPoint(), aCentrPt, &aTmpState );
                 bool const bResult =
-                    pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint() );
+                    pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint() );
                 OSL_ENSURE( bResult, "GetCharRect failed." );
                 (void) bResult; // non-debug: unused
             }
@@ -1534,7 +1534,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 (HasSelection() || eFlags & SwCrsrShell::READONLY ||
                  !IsCrsrReadonly()) )
             {
-                SwFrm* pBoxFrm = pTblFrm;
+                SwFrm* pBoxFrm = pTableFrm;
                 while( pBoxFrm && !pBoxFrm->IsCellFrm() )
                     pBoxFrm = pBoxFrm->GetUpper();
                 if( pBoxFrm && pBoxFrm->Frm().HasArea() )
@@ -1544,14 +1544,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             }
 
             // let Layout create the Cursors in the Boxes
-            if( m_pTblCrsr->IsCrsrMovedUpdt() )
-                GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+            if( m_pTableCrsr->IsCrsrMovedUpdate() )
+                GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
             if( m_bHasFocus && !m_bBasicHideCrsr )
-                m_pTblCrsr->Show();
+                m_pTableCrsr->Show();
 
             // set Cursor-Points to the new Positions
-            m_pTblCrsr->GetPtPos().setX(m_aCharRect.Left());
-            m_pTblCrsr->GetPtPos().setY(m_aCharRect.Top());
+            m_pTableCrsr->GetPtPos().setX(m_aCharRect.Left());
+            m_pTableCrsr->GetPtPos().setY(m_aCharRect.Top());
 
             if( m_bSVCrsrVis )
             {
@@ -1561,21 +1561,21 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 m_pVisCrsr->Show(); // show again
             }
             m_eMvState = MV_NONE;  // state for cursor travelling - GetCrsrOfst
-            if( pTblFrm && Imp()->IsAccessible() )
-                Imp()->InvalidateAccessibleCursorPosition( pTblFrm );
+            if( pTableFrm && Imp()->IsAccessible() )
+                Imp()->InvalidateAccessibleCursorPosition( pTableFrm );
             return;
         }
     }
 
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         // delete Ring
         while( m_pCurCrsr->GetNext() != m_pCurCrsr )
             delete m_pCurCrsr->GetNext();
         m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr, m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr, m_pTableCrsr = 0;
     }
 
     m_pVisCrsr->Hide(); // always hide visible Cursor
@@ -1591,7 +1591,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
              ( !mpDoc->GetDocShell() ||
                !mpDoc->GetDocShell()->IsReadOnly() || m_bAllProtect )) ) )
         {
-            if( !FindValidCntntNode( !HasDrawView() ||
+            if( !FindValidContentNode( !HasDrawView() ||
                     0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
             {
                 // everything protected/hidden -> special mode
@@ -1637,18 +1637,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         bool bPointIsStart = ( rCmp.Start() == rCmp.GetPoint() );
 
         // move point; forward if it's the start, backwards if it's the end
-        if( ! rCmp.GetPoint()->nNode.GetNode().IsCntntNode() )
+        if( ! rCmp.GetPoint()->nNode.GetNode().IsContentNode() )
             rCmp.Move( bPointIsStart ? fnMoveForward : fnMoveBackward,
-                        fnGoCntnt );
+                        fnGoContent );
 
         // move mark (if exists); forward if it's the start, else backwards
         if( rCmp.HasMark() )
         {
-            if( ! rCmp.GetMark()->nNode.GetNode().IsCntntNode() )
+            if( ! rCmp.GetMark()->nNode.GetNode().IsContentNode() )
             {
                 rCmp.Exchange();
                 rCmp.Move( !bPointIsStart ? fnMoveForward : fnMoveBackward,
-                            fnGoCntnt );
+                            fnGoContent );
                 rCmp.Exchange();
             }
         }
@@ -1656,7 +1656,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
     SwRect aOld( m_aCharRect );
     bool bFirst = true;
-    SwCntntFrm *pFrm;
+    SwContentFrm *pFrm;
     int nLoopCnt = 100;
     SwShellCrsr* pShellCrsr = getShellCrsr( true );
 
@@ -1664,7 +1664,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         bool bAgainst;
         do {
             bAgainst = false;
-            pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+            pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
                         &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
             // if the Frm doesn't exist anymore, the complete Layout has to be
             // created, because there used to be a Frm here!
@@ -1673,7 +1673,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 do
                 {
                     CalcLayout();
-                    pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+                    pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
                                 &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
                 }  while( !pFrm );
             }
@@ -1690,7 +1690,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             {
                 // look for a valid position
                 bool bChgState = true;
-                if( !FindValidCntntNode(!HasDrawView() ||
+                if( !FindValidContentNode(!HasDrawView() ||
                     0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
                 {
                     // everything is protected / hidden -> special Mode
@@ -1809,8 +1809,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
     if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCrsr )
     {
-        if( m_pTblCrsr )
-            m_pTblCrsr->SwSelPaintRects::Show();
+        if( m_pTableCrsr )
+            m_pTableCrsr->SwSelPaintRects::Show();
         else
         {
             m_pCurCrsr->SwSelPaintRects::Show();
@@ -1858,7 +1858,7 @@ void SwCrsrShell::RefreshBlockCursor()
     OSL_ENSURE( m_pBlockCrsr, "Don't call me without a block cursor" );
     SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
     Point aPt = rBlock.GetPtPos();
-    SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
+    SwContentFrm* pFrm = rBlock.GetContentNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
     Point aMk;
     if( m_pBlockCrsr->getEndPoint() && m_pBlockCrsr->getStartPoint() )
     {
@@ -1970,7 +1970,7 @@ void SwCrsrShell::Push()
     // fdo#60513: if we have a table cursor, copy that; else copy current.
     // This seems to work because UpdateCrsr() will fix this up on Pop(),
     // then MakeBoxSels() will re-create the current m_pCurCrsr cell ring.
-    SwShellCrsr *const pCurrent((m_pTblCrsr) ? m_pTblCrsr : m_pCurCrsr);
+    SwShellCrsr *const pCurrent((m_pTableCrsr) ? m_pTableCrsr : m_pCurCrsr);
     m_pCrsrStk = new SwShellCrsr( *this, *pCurrent->GetPoint(),
                                     pCurrent->GetPtPos(), m_pCrsrStk );
 
@@ -2092,7 +2092,7 @@ void SwCrsrShell::HideCrsrs()
         m_pVisCrsr->Hide();
     }
     // revoke inversion of SSelection
-    SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     pAktCrsr->Hide();
 }
 
@@ -2102,7 +2102,7 @@ void SwCrsrShell::ShowCrsrs( bool bCrsrVis )
         return;
 
     SET_CURR_SHELL( this );
-    SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     pAktCrsr->Show();
 
     if( m_bSVCrsrVis && bCrsrVis ) // also show SV cursor again
@@ -2114,7 +2114,7 @@ void SwCrsrShell::ShowCrsr()
     if( !m_bBasicHideCrsr )
     {
         m_bSVCrsrVis = true;
-        m_pCurCrsr->SetShowTxtInputFldOverlay( true );
+        m_pCurCrsr->SetShowTextInputFieldOverlay( true );
 
         if (isTiledRendering())
             libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
@@ -2130,7 +2130,7 @@ void SwCrsrShell::HideCrsr()
         m_bSVCrsrVis = false;
         // possibly reverse selected areas!!
         SET_CURR_SHELL( this );
-        m_pCurCrsr->SetShowTxtInputFldOverlay( false );
+        m_pCurCrsr->SetShowTextInputFieldOverlay( false );
         m_pVisCrsr->Hide();
 
         if (isTiledRendering())
@@ -2158,11 +2158,11 @@ void SwCrsrShell::ShGetFcs( bool bUpdate )
 }
 
 /** Get current frame in which the cursor is positioned. */
-SwCntntFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
+SwContentFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
 {
     SET_CURR_SHELL( (SwViewShell*)this );
-    SwCntntFrm *pRet = 0;
-    SwCntntNode *pNd = m_pCurCrsr->GetCntntNode();
+    SwContentFrm *pRet = 0;
+    SwContentNode *pNd = m_pCurCrsr->GetContentNode();
     if ( pNd )
     {
         if ( bCalcFrm )
@@ -2201,7 +2201,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
             nWhich == RES_ATTRSET_CHG ))
         // messages are not forwarded
         // #i6681#: RES_UPDATE_ATTR is implicitly unset in
-        // SwTxtNode::Insert(SwTxtHint*, sal_uInt16); we react here and thus do
+        // SwTextNode::Insert(SwTextHint*, sal_uInt16); we react here and thus do
         // not need to send the expensive RES_FMT_CHG in Insert.
         CallChgLnk();
 
@@ -2235,36 +2235,36 @@ void SwCrsrShell::CallChgLnk()
 }
 
 /// get selected text of a node at current cursor
-OUString SwCrsrShell::GetSelTxt() const
+OUString SwCrsrShell::GetSelText() const
 {
-    OUString aTxt;
+    OUString aText;
     if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
         m_pCurCrsr->GetMark()->nNode.GetIndex() )
     {
-        SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
-        if( pTxtNd )
+        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        if( pTextNd )
         {
             const sal_Int32 nStt = m_pCurCrsr->Start()->nContent.GetIndex();
-            aTxt = pTxtNd->GetExpandTxt( nStt,
+            aText = pTextNd->GetExpandText( nStt,
                     m_pCurCrsr->End()->nContent.GetIndex() - nStt );
         }
     }
-    return aTxt;
+    return aText;
 }
 
 /// get text only from current cursor position (until end of node)
 OUString SwCrsrShell::GetText() const
 {
-    OUString aTxt;
+    OUString aText;
     if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
         m_pCurCrsr->GetMark()->nNode.GetIndex() )
     {
-        SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
-        if( pTxtNd )
-            aTxt = pTxtNd->GetTxt().copy(
+        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        if( pTextNd )
+            aText = pTextNd->GetText().copy(
                     m_pCurCrsr->GetPoint()->nContent.GetIndex() );
     }
-    return aTxt;
+    return aText;
 }
 
 /** get the nth character of the current SSelection
@@ -2279,12 +2279,12 @@ sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
 
     const SwPosition* pPos = !m_pCurCrsr->HasMark() ? m_pCurCrsr->GetPoint()
                                 : bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    if( !pTextNd )
         return 0;
 
     const sal_Int32 nPos = pPos->nContent.GetIndex();
-    const OUString& rStr = pTxtNd->GetTxt();
+    const OUString& rStr = pTextNd->GetText();
     sal_Unicode cCh = 0;
 
     if (((nPos+nOffset) >= 0 ) && (nPos+nOffset) < rStr.getLength())
@@ -2304,13 +2304,13 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
         return false; // no selection
 
     SwPosition* pPos = bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "no text node; how should this then be extended?" );
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "no text node; how should this then be extended?" );
 
     sal_Int32 nPos = pPos->nContent.GetIndex();
     if( bEnd )
     {
-        if ((nPos + nCount) <= pTxtNd->GetTxt().getLength())
+        if ((nPos + nCount) <= pTextNd->GetText().getLength())
             nPos = nPos + nCount;
         else
             return false; // not possible
@@ -2347,17 +2347,17 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     SetInFrontOfLabel( false ); // #i27615#
 
     // show only in TextNodes
-    SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode();
+    if( !pTextNd )
         return false;
 
-    const SwSectionNode* pSectNd = pTxtNd->FindSectionNode();
+    const SwSectionNode* pSectNd = pTextNd->FindSectionNode();
     if( pSectNd && (pSectNd->GetSection().IsHiddenFlag() ||
                     ( !IsReadOnlyAvailable() &&
                       pSectNd->GetSection().IsProtectFlag())) )
         return false;
 
-    SwCntntFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
+    SwContentFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
     if ( Imp()->IsIdleAction() )
         pFrm->PrepareCrsr();
     SwRect aTmp( m_aCharRect );
@@ -2423,9 +2423,9 @@ bool SwCrsrShell::IsStartOfDoc() const
     if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
         return false;
 
-    // after EndOfIcons comes the content selection (EndNd+StNd+CntntNd)
+    // after EndOfIcons comes the content selection (EndNd+StNd+ContentNd)
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfExtras(), 2 );
-    if( !aIdx.GetNode().IsCntntNode() )
+    if( !aIdx.GetNode().IsContentNode() )
         GetDoc()->GetNodes().GoNext( &aIdx );
     return aIdx == m_pCurCrsr->GetPoint()->nNode;
 }
@@ -2433,7 +2433,7 @@ bool SwCrsrShell::IsStartOfDoc() const
 bool SwCrsrShell::IsEndOfDoc() const
 {
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
-    SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = SwNodes::GoPrevious( &aIdx );
 
@@ -2448,19 +2448,19 @@ bool SwCrsrShell::IsEndOfDoc() const
 
     This is needed for Drag&Drop/ Clipboard-paste in tables.
 */
-bool SwCrsrShell::ParkTblCrsr()
+bool SwCrsrShell::ParkTableCrsr()
 {
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
         return false;
 
-    m_pTblCrsr->ParkCrsr();
+    m_pTableCrsr->ParkCrsr();
 
     while( m_pCurCrsr->GetNext() != m_pCurCrsr )
         delete m_pCurCrsr->GetNext();
 
     // *always* move cursor's Point and Mark
     m_pCurCrsr->DeleteMark();
-    *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
+    *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
 
     return true;
 }
@@ -2572,16 +2572,16 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
                 pSh->_ParkPams( pNew, &pSh->m_pCrsrStk );
 
             pSh->_ParkPams( pNew, &pSh->m_pCurCrsr );
-            if( pSh->m_pTblCrsr )
+            if( pSh->m_pTableCrsr )
             {
                 // set table cursor always to 0 and the current one always to
                 // the beginning of the table
-                SwPaM* pTCrsr = pSh->GetTblCrs();
-                SwNode* pTblNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
-                if ( pTblNd )
+                SwPaM* pTCrsr = pSh->GetTableCrs();
+                SwNode* pTableNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
+                if ( pTableNd )
                 {
                     pTCrsr->DeleteMark();
-                    pSh->m_pCurCrsr->GetPoint()->nNode = *pTblNd;
+                    pSh->m_pCurCrsr->GetPoint()->nNode = *pTableNd;
                 }
             }
         }
@@ -2599,13 +2599,13 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
     , SwModify( 0 )
     , m_pCrsrStk( 0 )
     , m_pBlockCrsr( 0 )
-    , m_pTblCrsr( 0 )
+    , m_pTableCrsr( 0 )
     , m_pBoxIdx( 0 )
     , m_pBoxPtr( 0 )
     , m_nUpDownX(0)
     , m_nLeftFrmPos(0)
     , m_nAktNode(0)
-    , m_nAktCntnt(0)
+    , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
     , m_nCrsrMove( 0 )
@@ -2618,10 +2618,10 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
     SET_CURR_SHELL( this );
     // only keep the position of the current cursor of the copy shell
     m_pCurCrsr = new SwShellCrsr( *this, *(rShell.m_pCurCrsr->GetPoint()) );
-    m_pCurCrsr->GetCntntNode()->Add( this );
+    m_pCurCrsr->GetContentNode()->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
     m_bOverwriteCrsr = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
     m_bSVCrsrVis = true;
@@ -2641,13 +2641,13 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     , SwModify( 0 )
     , m_pCrsrStk( 0 )
     , m_pBlockCrsr( 0 )
-    , m_pTblCrsr( 0 )
+    , m_pTableCrsr( 0 )
     , m_pBoxIdx( 0 )
     , m_pBoxPtr( 0 )
     , m_nUpDownX(0)
     , m_nLeftFrmPos(0)
     , m_nAktNode(0)
-    , m_nAktCntnt(0)
+    , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
     , m_nCrsrMove( 0 )
@@ -2662,7 +2662,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     SwNodes& rNds = rDoc.GetNodes();
 
     SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-    SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
+    SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
 
     m_pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
 
@@ -2671,7 +2671,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     pCNd->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
     m_bOverwriteCrsr = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
     m_bSVCrsrVis = true;
@@ -2689,13 +2689,13 @@ SwCrsrShell::~SwCrsrShell()
 {
     // if it is not the last view then at least the field should be updated
     if( !unique() )
-        CheckTblBoxCntnt( m_pCurCrsr->GetPoint() );
+        CheckTableBoxContent( m_pCurCrsr->GetPoint() );
     else
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     delete m_pVisCrsr;
     delete m_pBlockCrsr;
-    delete m_pTblCrsr;
+    delete m_pTableCrsr;
 
     // release cursors
     while(m_pCurCrsr->GetNext() != m_pCurCrsr)
@@ -2718,8 +2718,8 @@ SwCrsrShell::~SwCrsrShell()
 
 SwShellCrsr* SwCrsrShell::getShellCrsr( bool bBlock )
 {
-    if( m_pTblCrsr )
-        return m_pTblCrsr;
+    if( m_pTableCrsr )
+        return m_pTableCrsr;
     if( m_pBlockCrsr && bBlock )
         return &m_pBlockCrsr->getShellCrsr();
     return m_pCurCrsr;
@@ -2742,13 +2742,13 @@ bool SwCrsrShell::ShouldWait() const
             pPam->End()->nNode.GetIndex();
 }
 
-size_t SwCrsrShell::UpdateTblSelBoxes()
+size_t SwCrsrShell::UpdateTableSelBoxes()
 {
-    if (m_pTblCrsr && (m_pTblCrsr->IsChgd() || !m_pTblCrsr->GetSelectedBoxesCount()))
+    if (m_pTableCrsr && (m_pTableCrsr->IsChgd() || !m_pTableCrsr->GetSelectedBoxesCount()))
     {
-         GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+         GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
     }
-    return (m_pTblCrsr) ? m_pTblCrsr->GetSelectedBoxesCount() : 0;
+    return (m_pTableCrsr) ? m_pTableCrsr->GetSelectedBoxesCount() : 0;
 }
 
 /// show the current selected "object"
@@ -2787,9 +2787,9 @@ void SwCrsrShell::MakeSelVisible()
 }
 
 /// search a valid content position (not protected/hidden)
-bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
+bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         OSL_ENSURE( false, "Did not remove table selection!" );
         return false;
@@ -2807,8 +2807,8 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
     SwNodeIndex& rNdIdx = m_pCurCrsr->GetPoint()->nNode;
     sal_uLong nNdIdx = rNdIdx.GetIndex(); // keep backup
     SwNodes& rNds = mpDoc->GetNodes();
-    SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
-    const SwCntntFrm * pFrm;
+    SwContentNode* pCNd = rNdIdx.GetNode().GetContentNode();
+    const SwContentFrm * pFrm;
 
     if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, m_pCurCrsr->GetPoint(), false)) &&
         !IsReadOnlyAvailable() && pFrm->IsProtected() &&
@@ -2834,7 +2834,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
         }
         *m_pCurCrsr->GetPoint() = *aPam.GetPoint();
     }
-    else if( bOnlyText && pCNd && pCNd->IsNoTxtNode() )
+    else if( bOnlyText && pCNd && pCNd->IsNoTextNode() )
     {
         // set to beginning of document
         rNdIdx = mpDoc->GetNodes().GetEndOfExtras();
@@ -2857,7 +2857,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
         // move forward into non-protected area.
         SwPaM aPam( rNdIdx.GetNode(), 0 );
         while( aPam.GetNode().IsProtect() &&
-               aPam.Move( fnMoveForward, fnGoCntnt ) )
+               aPam.Move( fnMoveForward, fnGoContent ) )
             ; // nothing to do in the loop; the aPam.Move does the moving!
 
         // didn't work? then go backwards!
@@ -2866,7 +2866,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
             SwPaM aTmpPaM( rNdIdx.GetNode(), 0 );
             aPam = aTmpPaM;
             while( aPam.GetNode().IsProtect() &&
-                   aPam.Move( fnMoveBackward, fnGoCntnt ) )
+                   aPam.Move( fnMoveBackward, fnGoContent ) )
                 ; // nothing to do in the loop; the aPam.Move does the moving!
         }
 
@@ -2930,7 +2930,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
                     // also check for Fly - might be protected as well
                     if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, 0, false)) ||
                         ( !IsReadOnlyAvailable() && pFrm->IsProtected() ) ||
-                        ( bOnlyText && pCNd->IsNoTxtNode() ) )
+                        ( bOnlyText && pCNd->IsNoTextNode() ) )
                     {
                         // continue search
                         bOk = false;
@@ -2949,13 +2949,13 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
     }
     if( bOk )
     {
-        pCNd = rNdIdx.GetNode().GetCntntNode();
-        const sal_Int32 nCntnt = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nCntnt );
+        pCNd = rNdIdx.GetNode().GetContentNode();
+        const sal_Int32 nContent = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
+        m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nContent );
     }
     else
     {
-        pCNd = rNdIdx.GetNode().GetCntntNode();
+        pCNd = rNdIdx.GetNode().GetContentNode();
         // if cursor in hidden frame, always move it
         if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), 0, 0, false) )
         {
@@ -2978,9 +2978,9 @@ bool SwCrsrShell::IsCrsrReadonly() const
         const SwSection* pSection;
 
         if( pFrm && pFrm->IsInFly() &&
-            (pFly = pFrm->FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+            (pFly = pFrm->FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
             pFly->Lower() &&
-            !pFly->Lower()->IsNoTxtFrm() &&
+            !pFly->Lower()->IsNoTextFrm() &&
             !GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         {
             return false;
@@ -2992,7 +2992,7 @@ bool SwCrsrShell::IsCrsrReadonly() const
         {
             return false;
         }
-        else if ( !IsMultiSelection() && CrsrInsideInputFld() )
+        else if ( !IsMultiSelection() && CrsrInsideInputField() )
         {
             return false;
         }
@@ -3027,10 +3027,10 @@ bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
     // If protected area is to be ignored, then selections are never read-only.
     if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView()) && !GetViewOptions()->IsIgnoreProtectedArea())
     {
-        if ( m_pTblCrsr != NULL )
+        if ( m_pTableCrsr != NULL )
         {
-            bRet = m_pTblCrsr->HasReadOnlyBoxSel()
-                   || m_pTblCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
+            bRet = m_pTableCrsr->HasReadOnlyBoxSel()
+                   || m_pTableCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
         }
         else
         {
@@ -3062,7 +3062,7 @@ bool SwCrsrShell::IsSelFullPara() const
             nStt = nEnd;
             nEnd = nTmp;
         }
-        const SwCntntNode* pCNd = m_pCurCrsr->GetCntntNode();
+        const SwContentNode* pCNd = m_pCurCrsr->GetContentNode();
         bRet = pCNd && !nStt && nEnd == pCNd->Len();
     }
     return bRet;
@@ -3105,7 +3105,7 @@ bool SwCrsrShell::SelectHiddenRange()
     if ( !GetViewOptions()->IsShowHiddenChar() && !m_pCurCrsr->HasMark() )
     {
         SwPosition& rPt = *m_pCurCrsr->GetPoint();
-        const SwTxtNode* pNode = rPt.nNode.GetNode().GetTxtNode();
+        const SwTextNode* pNode = rPt.nNode.GetNode().GetTextNode();
         if ( pNode )
         {
             const sal_Int32 nPos = rPt.nContent.GetIndex();
@@ -3134,9 +3134,9 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
                              FindRanges eRng,
                              bool bReplace )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     sal_uLong nRet = m_pCurCrsr->Find( rSearchOpt, bSearchInNotes, eStart, eEnd,
                                      bCancel, eRng, bReplace );
@@ -3145,18 +3145,18 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
     return nRet;
 }
 
-sal_uLong SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
+sal_uLong SwCrsrShell::Find( const SwTextFormatColl& rFormatColl,
                              SwDocPositions eStart, SwDocPositions eEnd,
                              bool& bCancel,
                              FindRanges eRng,
-                             const SwTxtFmtColl* pReplFmt )
+                             const SwTextFormatColl* pReplFormat )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_uLong nRet = m_pCurCrsr->Find( rFmtColl, eStart, eEnd, bCancel, eRng,
-                                     pReplFmt );
+    sal_uLong nRet = m_pCurCrsr->Find( rFormatColl, eStart, eEnd, bCancel, eRng,
+                                     pReplFormat );
     if( nRet )
         UpdateCrsr();
     return nRet;
@@ -3170,9 +3170,9 @@ sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
                              const SearchOptions* pSearchOpt,
                              const SfxItemSet* rReplSet )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     sal_uLong nRet = m_pCurCrsr->Find( rSet, bNoCollections, eStart, eEnd,
                                      bCancel, eRng, pSearchOpt, rReplSet );
@@ -3227,7 +3227,7 @@ static const SwStartNode* lcl_NodeContext( const SwNode& rNode )
 */
 bool sw_PosOk(const SwPosition & aPos)
 {
-    return NULL != aPos.nNode.GetNode().GetCntntNode() &&
+    return NULL != aPos.nNode.GetNode().GetContentNode() &&
            aPos.nContent.GetIdxReg();
 }
 
@@ -3301,8 +3301,8 @@ void SwCrsrShell::ClearUpCrsrs()
 
     // If at least one of the cursors in the ring have been deleted or replaced,
     // remove the table cursor.
-    if (m_pTblCrsr != NULL && bChanged)
-        TblCrsrToCursor();
+    if (m_pTableCrsr != NULL && bChanged)
+        TableCrsrToCursor();
 }
 
 OUString SwCrsrShell::GetCrsrDescr() const
@@ -3359,7 +3359,7 @@ static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes,
 }
 
 static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
-                   SwTxtNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
+                   SwTextNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
 {
     // create SwPosition for nStartIndex
     SwIndex aIndex( &rNode, nBegin );
@@ -3384,7 +3384,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
 
     SwPaM* pCrsr = GetCrsr();
     SwPosition aPos( *pCrsr->GetPoint() );
-    SwTxtNode *pNode = aPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = aPos.nNode.GetNode().GetTextNode();
     if ( pNode && !pNode->IsInProtectSect() )
     {
         const SwWrongList *pSmartTagList = pNode->GetSmartTags();
@@ -3426,11 +3426,11 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
     SwSpecialPos aSpecialPos;
     eTmpState.pSpecialPos = &aSpecialPos;
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     const SwWrongList *pSmartTagList;
 
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pSmartTagList = pNode->GetSmartTags()) &&
         !pNode->IsInProtectSect() )
     {
@@ -3452,7 +3452,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             lcl_FillTextRange( rRange, *pNode, nBegin, nLen );
 
             // get smarttag word
-            OUString aText( pNode->GetTxt().copy(nBegin, nLen) );
+            OUString aText( pNode->GetText().copy(nBegin, nLen) );
 
             //save the start and end positions of the line and the starting point
             Push();
@@ -3492,13 +3492,13 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             SwRect aStartRect;
             SwCrsrMoveState aState;
             aState.bRealWidth = true;
-            SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-            SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
+            SwContentNode* pContentNode = pCrsr->GetContentNode();
+            SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
 
-            pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+            pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
             rContent = nWordEnd - 1;
             SwRect aEndRect;
-            pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+            pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
             rSelectRect = aStartRect.Union( aEndRect );
             Pop(false);
         }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3b0d097ef515..99c8a56ab622 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -80,7 +80,7 @@ void SwCrsrShell::MoveCrsrToNum()
     // try to set cursor onto this position, at half of the char-
     // SRectangle's height
     Point aPt( m_pCurCrsr->GetPtPos() );
-    SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
+    SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->getLayoutFrm( GetLayout(), &aPt,
                                                 m_pCurCrsr->GetPoint() );
     pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
     pFrm->Calc();
@@ -122,13 +122,13 @@ bool SwCrsrShell::GotoPrevNum()
 }
 
 /// jump from content to header
-bool SwCrsrShell::GotoHeaderTxt()
+bool SwCrsrShell::GotoHeaderText()
 {
     const SwFrm* pFrm = GetCurrFrm()->FindPageFrm();
     while( pFrm && !pFrm->IsHeaderFrm() )
         pFrm = pFrm->GetLower();
     // found header, search 1. content frame
-    while( pFrm && !pFrm->IsCntntFrm() )
+    while( pFrm && !pFrm->IsContentFrm() )
         pFrm = pFrm->GetLower();
 
     if( pFrm )
@@ -150,7 +150,7 @@ bool SwCrsrShell::GotoHeaderTxt()
 }
 
 /// jump from content to footer
-bool SwCrsrShell::GotoFooterTxt()
+bool SwCrsrShell::GotoFooterText()
 {
     const SwPageFrm* pFrm = GetCurrFrm()->FindPageFrm();
     if( pFrm )
@@ -160,7 +160,7 @@ bool SwCrsrShell::GotoFooterTxt()
         while( pLower && !pLower->IsFooterFrm() )
             pLower = pLower->GetLower();
         // found footer, search 1. content frame
-        while( pLower && !pLower->IsCntntFrm() )
+        while( pLower && !pLower->IsContentFrm() )
             pLower = pLower->GetLower();
 
         if( pLower )
@@ -209,25 +209,25 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
     if( pDesc )
     {
         // check if the attribute exists
-        const SwFmtCntnt* pCnt = 0;
+        const SwFormatContent* pCnt = 0;
         if( bInHeader )
         {
             // mirrored pages? ignore for now
-            const SwFmtHeader& rHd = pDesc->GetMaster().GetHeader();
-            if( rHd.GetHeaderFmt() )
-                pCnt = &rHd.GetHeaderFmt()->GetCntnt();
+            const SwFormatHeader& rHd = pDesc->GetMaster().GetHeader();
+            if( rHd.GetHeaderFormat() )
+                pCnt = &rHd.GetHeaderFormat()->GetContent();
         }
         else
         {
-            const SwFmtFooter& rFt = pDesc->GetMaster().GetFooter();
-            if( rFt.GetFooterFmt() )
-                pCnt = &rFt.GetFooterFmt()->GetCntnt();
+            const SwFormatFooter& rFt = pDesc->GetMaster().GetFooter();
+            if( rFt.GetFooterFormat() )
+                pCnt = &rFt.GetFooterFormat()->GetContent();
         }
 
-        if( pCnt && pCnt->GetCntntIdx() )
+        if( pCnt && pCnt->GetContentIdx() )
         {
-            SwNodeIndex aIdx( *pCnt->GetCntntIdx(), 1 );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwNodeIndex aIdx( *pCnt->GetContentIdx(), 1 );
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = pMyDoc->GetNodes().GoNext( &aIdx );
 
@@ -260,15 +260,15 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    SwCntntNode* pFnd = 0;
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    SwContentNode* pFnd = 0;
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if (TOX_CONTENT_SECTION == pSect->GetType())
         {
             SwSectionNode const*const pSectNd(
-                    pSect->GetFmt()->GetSectionNode());
+                    pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
                 && m_pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex()
                 && (!pFnd  || pFnd->GetIndex() > pSectNd->GetIndex())
@@ -276,13 +276,13 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
             {
                 SwNodeIndex aIdx(*pSectNd, 1);
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if (!pCNd)
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwCntntFrm const*const pCFrm(
+                    SwContentFrm const*const pCFrm(
                             pCNd->getLayoutFrm(GetLayout()));
                     if (pCFrm &&
                         (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -311,15 +311,15 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    SwCntntNode* pFnd = 0;
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    SwContentNode* pFnd = 0;
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if (TOX_CONTENT_SECTION == pSect->GetType())
         {
             SwSectionNode const*const pSectNd(
-                    pSect->GetFmt()->GetSectionNode());
+                    pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
                 && m_pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex()
                 && (!pFnd  || pFnd->GetIndex() < pSectNd->GetIndex())
@@ -327,13 +327,13 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
             {
                 SwNodeIndex aIdx(*pSectNd, 1);
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if (!pCNd)
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwCntntFrm const*const pCFrm(
+                    SwContentFrm const*const pCFrm(
                             pCNd->getLayoutFrm(GetLayout()));
                     if (pCFrm &&
                         (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -372,19 +372,19 @@ bool SwCrsrShell::GotoTOXMarkBase()
         const SwTOXType* pType = aMarks[0]->GetTOXType();
         SwIterator<SwTOXBase,SwTOXType> aIter( *pType );
         const SwSectionNode* pSectNd;
-        const SwSectionFmt* pSectFmt;
+        const SwSectionFormat* pSectFormat;
 
         for( SwTOXBase* pTOX = aIter.First(); pTOX; pTOX = aIter.Next() )
         {
             if( pTOX->ISA( SwTOXBaseSection ) &&
-                0 != ( pSectFmt = static_cast<SwTOXBaseSection*>(pTOX)->GetFmt() ) &&
-                0 != ( pSectNd = pSectFmt->GetSectionNode() ))
+                0 != ( pSectFormat = static_cast<SwTOXBaseSection*>(pTOX)->GetFormat() ) &&
+                0 != ( pSectNd = pSectFormat->GetSectionNode() ))
             {
                 SwNodeIndex aIdx( *pSectNd, 1 );
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( !pCNd )
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
-                const SwCntntFrm* pCFrm;
+                const SwContentFrm* pCFrm;
                 if( pCNd &&
                     pCNd->EndOfSectionIndex() < pSectNd->EndOfSectionIndex() &&
                     0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout() ) ) &&
@@ -408,7 +408,7 @@ bool SwCrsrShell::GotoTOXMarkBase()
 
 /// Jump to next/previous table formula
 /// Optionally it is possible to also jump to broken formulas
-bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
+bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
 {
     if( IsTableMode() )
         return false;
@@ -420,22 +420,22 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
     if( !bNext )
         aFndPos.nNode = 0;
-    _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+    _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
 
     {
         const SwNode* pSttNd = rPos.nNode.GetNode().FindTableBoxStartNode();
         if( pSttNd )
         {
             const SwTableBox* pTBox = pSttNd->FindTableNode()->GetTable().
-                                        GetTblBox( pSttNd->GetIndex() );
+                                        GetTableBox( pSttNd->GetIndex() );
             if( pTBox )
-                aCurGEF = _SetGetExpFld( *pTBox );
+                aCurGEF = _SetGetExpField( *pTBox );
         }
     }
 
     if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
         // also at collection use only the first frame
-        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),
+        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetContentNode()->getLayoutFrm( GetLayout(),
                                 &aPt, &rPos, false ) );
     {
         const SfxPoolItem* pItem;
@@ -445,19 +445,19 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
         for( n = 0; n < nMaxItems; ++n )
             if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
                                         RES_BOXATR_FORMULA, n ) ) &&
-                0 != (pTBox = static_cast<const SwTblBoxFormula*>(pItem)->GetTableBox() ) &&
+                0 != (pTBox = static_cast<const SwTableBoxFormula*>(pItem)->GetTableBox() ) &&
                 pTBox->GetSttNd() &&
                 pTBox->GetSttNd()->GetNodes().IsDocNodes() &&
                 ( !bOnlyErrors ||
-                  !static_cast<const SwTblBoxFormula*>(pItem)->HasValidBoxes() ) )
+                  !static_cast<const SwTableBoxFormula*>(pItem)->HasValidBoxes() ) )
             {
-                const SwCntntFrm* pCFrm;
+                const SwContentFrm* pCFrm;
                 SwNodeIndex aIdx( *pTBox->GetSttNd() );
-                const SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
+                const SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, false ) ) &&
                     (IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
                 {
-                    _SetGetExpFld aCmp( *pTBox );
+                    _SetGetExpField aCmp( *pTBox );
                     aCmp.SetBodyPos( *pCFrm );
 
                     if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -500,32 +500,32 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
     if( !bNext )
         aFndPos.nNode = 0;
-    _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+    _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
 
     if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() )
         // also at collection use only the first frame
         aCurGEF.SetBodyPos( *rPos.nNode.GetNode().
-                        GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
+                        GetContentNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
 
     {
-        const SwTxtNode* pTxtNd;
-        const SwTxtTOXMark* pTxtTOX;
+        const SwTextNode* pTextNd;
+        const SwTextTOXMark* pTextTOX;
         sal_uInt32 n, nMaxItems = GetDoc()->GetAttrPool().GetItemCount2( RES_TXTATR_TOXMARK );
 
         for( n = 0; n < nMaxItems; ++n )
         {
             const SfxPoolItem* pItem;
-            const SwCntntFrm* pCFrm;
+            const SwContentFrm* pCFrm;
 
             if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
                                         RES_TXTATR_TOXMARK, n ) ) &&
-                0 != (pTxtTOX = static_cast<const SwTOXMark*>(pItem)->GetTxtTOXMark() ) &&
-                ( pTxtNd = &pTxtTOX->GetTxtNode())->GetNodes().IsDocNodes() &&
-                0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
+                0 != (pTextTOX = static_cast<const SwTOXMark*>(pItem)->GetTextTOXMark() ) &&
+                ( pTextNd = &pTextTOX->GetTextNode())->GetNodes().IsDocNodes() &&
+                0 != ( pCFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
                 ( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
             {
-                SwNodeIndex aNdIndex( *pTxtNd ); // UNIX needs this object
-                _SetGetExpFld aCmp( aNdIndex, *pTxtTOX, 0 );
+                SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object
+                _SetGetExpField aCmp( aNdIndex, *pTextTOX, 0 );
                 aCmp.SetBodyPos( *pCFrm );
 
                 if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -566,9 +566,9 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
                                                     IsReadOnlyAvailable() );
     // set position
     SwPosition& rPos = *GetCrsr()->GetPoint();
-    rPos.nNode = rNewMark.GetTxtTOXMark()->GetTxtNode();
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
-                         rNewMark.GetTxtTOXMark()->GetStart() );
+    rPos.nNode = rNewMark.GetTextTOXMark()->GetTextNode();
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+                         rNewMark.GetTextTOXMark()->GetStart() );
 
     if( !m_pCurCrsr->IsSelOvr() )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
@@ -578,30 +578,30 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
 }
 
 /// jump to next/previous field type
-void lcl_MakeFldLst(
-    _SetGetExpFlds& rLst,
-    const SwFieldType& rFldType,
+void lcl_MakeFieldLst(
+    _SetGetExpFields& rLst,
+    const SwFieldType& rFieldType,
     const bool bInReadOnly,
     const bool bChkInpFlag = false )
 {
     // always search the 1. frame
     Point aPt;
-    SwTxtFld* pTxtFld = NULL;
-    SwIterator<SwFmtFld,SwFieldType> aIter(rFldType);
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwTextField* pTextField = NULL;
+    SwIterator<SwFormatField,SwFieldType> aIter(rFieldType);
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        pTxtFld = pFmtFld->GetTxtFld();
-        if ( pTxtFld != NULL
+        pTextField = pFormatField->GetTextField();
+        if ( pTextField != NULL
              && ( !bChkInpFlag
-                  || static_cast<const SwSetExpField*>(pTxtFld->GetFmtFld().GetField())->GetInputFlag() ) )
+                  || static_cast<const SwSetExpField*>(pTextField->GetFormatField().GetField())->GetInputFlag() ) )
         {
-            const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-            const SwCntntFrm* pCFrm =
-                rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+            const SwTextNode& rTextNode = pTextField->GetTextNode();
+            const SwContentFrm* pCFrm =
+                rTextNode.getLayoutFrm( rTextNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
             if ( pCFrm != NULL
                  && ( bInReadOnly || !pCFrm->IsProtected() ) )
             {
-                _SetGetExpFld* pNew = new _SetGetExpFld( SwNodeIndex( rTxtNode ), pTxtFld );
+                _SetGetExpField* pNew = new _SetGetExpField( SwNodeIndex( rTextNode ), pTextField );
                 pNew->SetBodyPos( *pCFrm );
                 rLst.insert( pNew );
             }
@@ -609,81 +609,81 @@ void lcl_MakeFldLst(
     }
 }
 
-static _SetGetExpFlds::const_iterator
-lcl_FindField(bool & o_rFound, _SetGetExpFlds const& rSrtLst,
-        SwRootFrm *const pLayout, SwTxtNode *const pTxtNode,
-        SwTxtFld *const pTxtFld, SwPosition const& rPos,
+static _SetGetExpFields::const_iterator
+lcl_FindField(bool & o_rFound, _SetGetExpFields const& rSrtLst,
+        SwRootFrm *const pLayout, SwTextNode *const pTextNode,
+        SwTextField *const pTextField, SwPosition const& rPos,
         sal_Int32 const nContentOffset)
 {
-    boost::scoped_ptr<_SetGetExpFld> pSrch;
+    boost::scoped_ptr<_SetGetExpField> pSrch;
     boost::scoped_ptr<SwIndex> pIndex;
     if (-1 == nContentOffset)
     {
-        pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, &rPos.nContent));
+        pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, &rPos.nContent));
     }
     else
     {
-        pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetCntntNode(), nContentOffset));
-        pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, pIndex.get()));
+        pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetContentNode(), nContentOffset));
+        pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, pIndex.get()));
     }
 
-    if (rPos.nNode.GetIndex() < pTxtNode->GetNodes().GetEndOfExtras().GetIndex())
+    if (rPos.nNode.GetIndex() < pTextNode->GetNodes().GetEndOfExtras().GetIndex())
     {
         // also at collection use only the first frame
         Point aPt;
-        pSrch->SetBodyPos(*pTxtNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
+        pSrch->SetBodyPos(*pTextNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
     }
 
-    _SetGetExpFlds::const_iterator it = rSrtLst.lower_bound(pSrch.get());
+    _SetGetExpFields::const_iterator it = rSrtLst.lower_bound(pSrch.get());
 
     o_rFound = (it != rSrtLst.end()) && (**it == *pSrch);
     return it;
 }
 
-bool SwCrsrShell::MoveFldType(
-    const SwFieldType* pFldType,
+bool SwCrsrShell::MoveFieldType(
+    const SwFieldType* pFieldType,
     const bool bNext,
     const sal_uInt16 nResType,
-    const bool bAddSetExpressionFldsToInputFlds )
+    const bool bAddSetExpressionFieldsToInputFields )
 {
     // sorted list of all fields
-    _SetGetExpFlds aSrtLst;
+    _SetGetExpFields aSrtLst;
 
-    if ( pFldType )
+    if ( pFieldType )
     {
-        if( RES_INPUTFLD != pFldType->Which() && !pFldType->HasWriterListeners() )
+        if( RES_INPUTFLD != pFieldType->Which() && !pFieldType->HasWriterListeners() )
         {
             return false;
         }
 
         // found Modify object, add all fields to array
-        ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+        ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
 
-        if( RES_INPUTFLD == pFldType->Which() && bAddSetExpressionFldsToInputFlds )
+        if( RES_INPUTFLD == pFieldType->Which() && bAddSetExpressionFieldsToInputFields )
         {
             // there are hidden input fields in the set exp. fields
-            const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
-            const size_t nSize = rFldTypes.size();
+            const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+            const size_t nSize = rFieldTypes.size();
             for( size_t i=0; i < nSize; ++i )
             {
-                pFldType = rFldTypes[ i ];
-                if ( RES_SETEXPFLD == pFldType->Which() )
+                pFieldType = rFieldTypes[ i ];
+                if ( RES_SETEXPFLD == pFieldType->Which() )
                 {
-                    ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable(), true );
+                    ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable(), true );
                 }
             }
         }
     }
     else
     {
-        const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
-        const size_t nSize = rFldTypes.size();
+        const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+        const size_t nSize = rFieldTypes.size();
         for( size_t i=0; i < nSize; ++i )
         {
-            pFldType = rFldTypes[ i ];
-            if( nResType == pFldType->Which() )
+            pFieldType = rFieldTypes[ i ];
+            if( nResType == pFieldType->Which() )
             {
-                ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+                ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
             }
         }
     }
@@ -692,7 +692,7 @@ bool SwCrsrShell::MoveFldType(
     if( aSrtLst.empty() )
         return false;
 
-    _SetGetExpFlds::const_iterator it;
+    _SetGetExpFields::const_iterator it;
     SwCursor* pCrsr = getShellCrsr( true );
     {
         // (1998): Always use field for search so that the right one is found as
@@ -700,39 +700,39 @@ bool SwCrsrShell::MoveFldType(
         // field
         const SwPosition& rPos = *pCrsr->GetPoint();
 
-        SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTNd, "No CntntNode" );
+        SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTNd, "No ContentNode" );
 
-        SwTxtFld * pTxtFld = pTNd->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true );
-        const bool bDelFld = ( pTxtFld == NULL );
+        SwTextField * pTextField = pTNd->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true );
+        const bool bDelField = ( pTextField == NULL );
         sal_Int32 nContentOffset = -1;
 
-        if( bDelFld )
+        if( bDelField )
         {
             // create dummy for the search
-            SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
-                static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_DATETIMEFLD ) ) ) );
+            SwFormatField* pFormatField = new SwFormatField( SwDateTimeField(
+                static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_DATETIMEFLD ) ) ) );
 
-            pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
+            pTextField = new SwTextField( *pFormatField, rPos.nContent.GetIndex(),
                         mpDoc->IsClipBoard() );
-            pTxtFld->ChgTxtNode( pTNd );
+            pTextField->ChgTextNode( pTNd );
         }
         else
         {
             // the cursor might be anywhere inside the input field,
             // but we will be searching for the field start
-            if (pTxtFld->Which() == RES_TXTATR_INPUTFIELD
-                    && rPos.nContent.GetIndex() != pTxtFld->GetStart())
-                nContentOffset = pTxtFld->GetStart();
+            if (pTextField->Which() == RES_TXTATR_INPUTFIELD
+                    && rPos.nContent.GetIndex() != pTextField->GetStart())
+                nContentOffset = pTextField->GetStart();
         }
         bool isSrch;
         it = lcl_FindField(isSrch, aSrtLst,
-                GetLayout(), pTNd, pTxtFld, rPos, nContentOffset);
+                GetLayout(), pTNd, pTextField, rPos, nContentOffset);
 
-        if( bDelFld )
+        if( bDelField )
         {
-            delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());
-            delete pTxtFld;
+            delete static_cast<SwFormatField*>(&pTextField->GetAttr());
+            delete pTextField;
         }
 
         if( it != aSrtLst.end() && isSrch ) // found
@@ -764,7 +764,7 @@ bool SwCrsrShell::MoveFldType(
             }
         }
     }
-    const _SetGetExpFld& rFnd = **it;
+    const _SetGetExpField& rFnd = **it;
 
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -778,10 +778,10 @@ bool SwCrsrShell::MoveFldType(
     return bRet;
 }
 
-bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
+bool SwCrsrShell::GotoFormatField( const SwFormatField& rField )
 {
     bool bRet = false;
-    if( rFld.GetTxtFld() )
+    if( rField.GetTextField() )
     {
         SET_CURR_SHELL( this );
         SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -789,9 +789,9 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
         SwCursor* pCrsr = getShellCrsr( true );
         SwCrsrSaveState aSaveState( *pCrsr );
 
-        SwTxtNode* pTNd = rFld.GetTxtFld()->GetpTxtNode();
+        SwTextNode* pTNd = rField.GetTextField()->GetpTextNode();
         pCrsr->GetPoint()->nNode = *pTNd;
-        pCrsr->GetPoint()->nContent.Assign( pTNd, rFld.GetTxtFld()->GetStart() );
+        pCrsr->GetPoint()->nContent.Assign( pTNd, rField.GetTextField()->GetStart() );
 
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -800,45 +800,45 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
     return bRet;
 }
 
-SwTxtFld * SwCrsrShell::GetTxtFldAtPos(
+SwTextField * SwCrsrShell::GetTextFieldAtPos(
     const SwPosition* pPos,
-    const bool bIncludeInputFldAtStart )
+    const bool bIncludeInputFieldAtStart )
 {
-    SwTxtFld* pTxtFld = NULL;
+    SwTextField* pTextField = NULL;
 
-    SwTxtNode * const pNode = pPos->nNode.GetNode().GetTxtNode();
+    SwTextNode * const pNode = pPos->nNode.GetNode().GetTextNode();
     if ( pNode != NULL )
     {
-        pTxtFld = pNode->GetFldTxtAttrAt( pPos->nContent.GetIndex(), bIncludeInputFldAtStart );
+        pTextField = pNode->GetFieldTextAttrAt( pPos->nContent.GetIndex(), bIncludeInputFieldAtStart );
     }
 
-    return pTxtFld;
+    return pTextField;
 }
 
 SwField* SwCrsrShell::GetFieldAtCrsr(
     const SwPaM* pCrsr,
-    const bool bIncludeInputFldAtStart )
+    const bool bIncludeInputFieldAtStart )
 {
     SwField* pFieldAtCrsr = NULL;
 
-    SwTxtFld* pTxtFld = GetTxtFldAtPos( pCrsr->Start(), bIncludeInputFldAtStart );
-    if ( pTxtFld != NULL
+    SwTextField* pTextField = GetTextFieldAtPos( pCrsr->Start(), bIncludeInputFieldAtStart );
+    if ( pTextField != NULL
         && pCrsr->Start()->nNode == pCrsr->End()->nNode )
     {
-        const sal_Int32 nTxtFldLength =
-            pTxtFld->End() != NULL
-            ? *(pTxtFld->End()) - pTxtFld->GetStart()
+        const sal_Int32 nTextFieldLength =
+            pTextField->End() != NULL
+            ? *(pTextField->End()) - pTextField->GetStart()
             : 1;
-        if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTxtFldLength )
+        if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTextFieldLength )
         {
-            pFieldAtCrsr = const_cast<SwField*>(pTxtFld->GetFmtFld().GetField());
+            pFieldAtCrsr = const_cast<SwField*>(pTextField->GetFormatField().GetField());
         }
     }
 
     return pFieldAtCrsr;
 }
 
-SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
+SwField* SwCrsrShell::GetCurField( const bool bIncludeInputFieldAtStart ) const
 {
     SwPaM* pCrsr = GetCrsr();
     if ( pCrsr->IsMultiSelection() )
@@ -847,19 +847,19 @@ SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
         return NULL;
     }
 
-    SwField* pCurFld = GetFieldAtCrsr( pCrsr, bIncludeInputFldAtStart );;
-    if ( pCurFld != NULL
-         && RES_TABLEFLD == pCurFld->GetTyp()->Which() )
+    SwField* pCurField = GetFieldAtCrsr( pCrsr, bIncludeInputFieldAtStart );;
+    if ( pCurField != NULL
+         && RES_TABLEFLD == pCurField->GetTyp()->Which() )
     {
         // TabellenFormel ? wandel internen in externen Namen um
-        const SwTableNode* pTblNd = IsCrsrInTbl();
-        static_cast<SwTblField*>(pCurFld)->PtrToBoxNm( pTblNd ? &pTblNd->GetTable() : 0 );
+        const SwTableNode* pTableNd = IsCrsrInTable();
+        static_cast<SwTableField*>(pCurField)->PtrToBoxNm( pTableNd ? &pTableNd->GetTable() : 0 );
     }
 
-    return pCurFld;
+    return pCurField;
 }
 
-bool SwCrsrShell::CrsrInsideInputFld() const
+bool SwCrsrShell::CrsrInsideInputField() const
 {
     for(SwPaM& rCrsr : GetCrsr()->GetRingContainer())
     {
@@ -869,42 +869,42 @@ bool SwCrsrShell::CrsrInsideInputFld() const
     return false;
 }
 
-bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos )
+bool SwCrsrShell::PosInsideInputField( const SwPosition& rPos )
 {
-    return dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, false )) != NULL;
+    return dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, false )) != NULL;
 }
 
-bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const
+bool SwCrsrShell::DocPtInsideInputField( const Point& rDocPt ) const
 {
     SwPosition aPos( *(GetCrsr()->Start()) );
     Point aDocPt( rDocPt );
     if ( GetLayout()->GetCrsrOfst( &aPos, aDocPt ) )
     {
-        return PosInsideInputFld( aPos );
+        return PosInsideInputField( aPos );
     }
     return false;
 }
 
-sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::StartOfInputFieldAtPos( const SwPosition& rPos )
 {
-    const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
-    if ( pTxtInputFld == NULL )
+    const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+    if ( pTextInputField == NULL )
     {
-        OSL_ENSURE( false, "<SwEditShell::StartOfInputFldAtPos(..)> - no Input Field at given position" );
+        OSL_ENSURE( false, "<SwEditShell::StartOfInputFieldAtPos(..)> - no Input Field at given position" );
         return 0;
     }
-    return pTxtInputFld->GetStart();
+    return pTextInputField->GetStart();
 }
 
-sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::EndOfInputFieldAtPos( const SwPosition& rPos )
 {
-    const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
-    if ( pTxtInputFld == NULL )
+    const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+    if ( pTextInputField == NULL )
     {
-        OSL_ENSURE( false, "<SwEditShell::EndOfInputFldAtPos(..)> - no Input Field at given position" );
+        OSL_ENSURE( false, "<SwEditShell::EndOfInputFieldAtPos(..)> - no Input Field at given position" );
         return 0;
     }
-    return *(pTxtInputFld->End());
+    return *(pTextInputField->End());
 }
 
 void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
@@ -916,9 +916,9 @@ void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
     SwCrsrSaveState aSaveState( *pCrsr );
 
     const SwNodes& rNds = GetDoc()->GetNodes();
-    SwTxtNode* pTxtNd = rNds.GetOutLineNds()[ nIdx ]->GetTxtNode();
-    pCrsr->GetPoint()->nNode = *pTxtNd;
-    pCrsr->GetPoint()->nContent.Assign( pTxtNd, 0 );
+    SwTextNode* pTextNd = rNds.GetOutLineNds()[ nIdx ]->GetTextNode();
+    pCrsr->GetPoint()->nNode = *pTextNd;
+    pCrsr->GetPoint()->nContent.Assign( pTextNd, 0 );
 
     if( !pCrsr->IsSelOvr() )
         UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
@@ -961,7 +961,7 @@ bool SwCrsrShell::GotoNextOutline()
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCrsrSaveState aSaveState( *pCrsr );
     pCrsr->GetPoint()->nNode = *pNd;
-    pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+    pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
 
     bool bRet = !pCrsr->IsSelOvr();
     if( bRet )
@@ -990,7 +990,7 @@ bool SwCrsrShell::GotoPrevOutline()
         SwCallLink aLk( *this ); // watch Crsr-Moves
         SwCrsrSaveState aSaveState( *pCrsr );
         pCrsr->GetPoint()->nNode = *pNd;
-        pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+        pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
 
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -1014,7 +1014,7 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
     {
         pNd = rNds.GetOutLineNds()[ nPos ];
 
-        if( pNd->GetTxtNode()->GetAttrOutlineLevel()-1 <= nLevel )
+        if( pNd->GetTextNode()->GetAttrOutlineLevel()-1 <= nLevel )
             return nPos;
 
     }
@@ -1045,11 +1045,11 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
 
     if( bWithChildren )
     {
-        const int nLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+        const int nLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
         for( ++nEndPos; nEndPos < rOutlNds.size(); ++nEndPos )
         {
             pEndNd = rOutlNds[ nEndPos ];
-            const int nNxtLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+            const int nNxtLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
             if( nNxtLevel <= nLevel )
                 break; // EndPos is now on the next one
         }
@@ -1067,7 +1067,7 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
 
     // set end to the end of the previous content node
     m_pCurCrsr->GetPoint()->nNode = *pSttNd;
-    m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetCntntNode(), 0 );
+    m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetContentNode(), 0 );
     m_pCurCrsr->SetMark();
     m_pCurCrsr->GetPoint()->nNode = *pEndNd;
     m_pCurCrsr->Move( fnMoveBackward, fnGoNode ); // end of predecessor
@@ -1088,12 +1088,12 @@ bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
 
     sal_Int32 nPos = -1;
-    SwTxtNode* pTxtNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
+    SwTextNode* pTextNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
                                                     nSubType, nSeqNo, &nPos );
-    if( pTxtNd && pTxtNd->GetNodes().IsDocNodes() )
+    if( pTextNd && pTextNd->GetNodes().IsDocNodes() )
     {
-        m_pCurCrsr->GetPoint()->nNode = *pTxtNd;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pTxtNd, nPos );
+        m_pCurCrsr->GetPoint()->nNode = *pTextNd;
+        m_pCurCrsr->GetPoint()->nContent.Assign( pTextNd, nPos );
 
         if( !m_pCurCrsr->IsSelOvr() )
         {
@@ -1112,9 +1112,9 @@ bool SwCrsrShell::IsPageAtPos( const Point &rPt ) const
 }
 
 bool SwCrsrShell::GetContentAtPos( const Point& rPt,
-                                   SwContentAtPos& rCntntAtPos,
+                                   SwContentAtPos& rContentAtPos,
                                    bool bSetCrsr,
-                                   SwRect* pFldRect )
+                                   SwRect* pFieldRect )
 {
     SET_CURR_SHELL( this );
     bool bRet = false;
@@ -1124,64 +1124,64 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
         Point aPt( rPt );
         SwPosition aPos( *m_pCurCrsr->GetPoint() );
 
-        SwTxtNode* pTxtNd;
-        SwCntntFrm *pFrm(0);
-        SwTxtAttr* pTxtAttr;
+        SwTextNode* pTextNd;
+        SwContentFrm *pFrm(0);
+        SwTextAttr* pTextAttr;
         SwCrsrMoveState aTmpState;
         aTmpState.bFieldInfo = true;
-        aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos );
-        aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) != 0;
+        aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos );
+        aTmpState.bContentCheck = (SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos) != 0;
         aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
 
         SwSpecialPos aSpecialPos;
-        aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos ) ?
+        aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos ) ?
                                 &aSpecialPos : 0;
 
         const bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
-        pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+        pTextNd = aPos.nNode.GetNode().GetTextNode();
 
         const SwNodes& rNds = GetDoc()->GetNodes();
-        if( pTxtNd
-            && SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos
+        if( pTextNd
+            && SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos
             && !rNds.GetOutLineNds().empty() )
         {
-            const SwTxtNode* pONd = pTxtNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
+            const SwTextNode* pONd = pTextNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
             if( pONd )
             {
-                rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_OUTLINE;
-                rCntntAtPos.sStr = pONd->GetExpandTxt( 0, -1, true, true );
+                rContentAtPos.eContentAtPos = SwContentAtPos::SW_OUTLINE;
+                rContentAtPos.sStr = pONd->GetExpandText( 0, -1, true, true );
                 bRet = true;
             }
         }
-        else if ( SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos
+        else if ( SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos
                   && bCrsrFoundExact )
         {
             bRet = true;
         }
-        else if( pTxtNd
-                 && SwContentAtPos::SW_NUMLABEL & rCntntAtPos.eCntntAtPos)
+        else if( pTextNd
+                 && SwContentAtPos::SW_NUMLABEL & rContentAtPos.eContentAtPos)
         {
             bRet = aTmpState.bInNumPortion;
-            rCntntAtPos.aFnd.pNode = pTxtNd;
+            rContentAtPos.aFnd.pNode = pTextNd;
 
             Size aSizeLogic(aTmpState.nInNumPostionOffset, 0);
             Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
-            rCntntAtPos.nDist = aSizePixel.Width();
+            rContentAtPos.nDist = aSizePixel.Width();
         }
-        else if( bCrsrFoundExact && pTxtNd )
+        else if( bCrsrFoundExact && pTextNd )
         {
             if( !aTmpState.bPosCorr )
             {
                 if ( !bRet
-                     && SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    const SwWrongList* pSmartTagList = pTxtNd->GetSmartTags();
+                    const SwWrongList* pSmartTagList = pTextNd->GetSmartTags();
                     sal_Int32 nCurrent = aPos.nContent.GetIndex();
                     const sal_Int32 nBegin = nCurrent;
                     sal_Int32 nLen = 1;
 
-                    if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTxtNd->IsSymbol(nBegin) )
+                    if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTextNd->IsSymbol(nBegin) )
                     {
                         const sal_uInt16 nIndex = pSmartTagList->GetWrongPos( nBegin );
                         const SwWrongList* pSubList = pSmartTagList->SubList( nIndex );
@@ -1208,32 +1208,32 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         }
                         if( bRet )
                         {
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_SMARTTAG;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_SMARTTAG;
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if ( !bRet
-                     && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = pTxtNd->GetFldTxtAttrAt( aPos.nContent.GetIndex() );
-                    const SwField* pFld = pTxtAttr != NULL
-                                          ? pTxtAttr->GetFmtFld().GetField()
+                    pTextAttr = pTextNd->GetFieldTextAttrAt( aPos.nContent.GetIndex() );
+                    const SwField* pField = pTextAttr != NULL
+                                          ? pTextAttr->GetFormatField().GetField()
                                           : 0;
-                    if ( SwContentAtPos::SW_CLICKFIELD & rCntntAtPos.eCntntAtPos
-                         && pFld && !pFld->HasClickHdl() )
+                    if ( SwContentAtPos::SW_CLICKFIELD & rContentAtPos.eContentAtPos
+                         && pField && !pField->HasClickHdl() )
                     {
-                        pFld = 0;
+                        pField = 0;
                     }
 
-                    if ( pFld )
+                    if ( pField )
                     {
-                        if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                            pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                        if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                            pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
 
                         if( bSetCrsr )
                         {
@@ -1245,60 +1245,60 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             {
                                 // allow click fields in protected sections
                                 // only placeholder is not possible
-                                if( SwContentAtPos::SW_FIELD & rCntntAtPos.eCntntAtPos
-                                    || RES_JUMPEDITFLD == pFld->Which() )
-                                    pFld = 0;
+                                if( SwContentAtPos::SW_FIELD & rContentAtPos.eContentAtPos
+                                    || RES_JUMPEDITFLD == pField->Which() )
+                                    pField = 0;
                             }
                             else
                                 UpdateCrsr();
                         }
-                        else if( RES_TABLEFLD == pFld->Which() &&
-                            static_cast<const SwTblField*>(pFld)->IsIntrnlName() )
+                        else if( RES_TABLEFLD == pField->Which() &&
+                            static_cast<const SwTableField*>(pField)->IsIntrnlName() )
                         {
                             // create from internal (for CORE) the external
                             // (for UI) formula
-                            const SwTableNode* pTblNd = pTxtNd->FindTableNode();
-                            if( pTblNd )        // steht in einer Tabelle
-                                const_cast<SwTblField*>(static_cast<const SwTblField*>(pFld))->PtrToBoxNm( &pTblNd->GetTable() );
+                            const SwTableNode* pTableNd = pTextNd->FindTableNode();
+                            if( pTableNd )        // steht in einer Tabelle
+                                const_cast<SwTableField*>(static_cast<const SwTableField*>(pField))->PtrToBoxNm( &pTableNd->GetTable() );
                         }
                     }
 
-                    if( pFld )
+                    if( pField )
                     {
-                        rCntntAtPos.aFnd.pFld = pFld;
-                        rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FIELD;
+                        rContentAtPos.aFnd.pField = pField;
+                        rContentAtPos.pFndTextAttr = pTextAttr;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_FIELD;
                         bRet = true;
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_FORMCTRL & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_FORMCTRL & rContentAtPos.eContentAtPos )
                 {
                     IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
-                    sw::mark::IFieldmark* pFldBookmark = pMarksAccess->getFieldmarkFor( aPos );
-                    if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
-                        rCntntAtPos.aFnd.pFldmark = pFldBookmark;
+                    sw::mark::IFieldmark* pFieldBookmark = pMarksAccess->getFieldmarkFor( aPos );
+                    if( bCrsrFoundExact && pTextNd && pFieldBookmark) {
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_FORMCTRL;
+                        rContentAtPos.aFnd.pFieldmark = pFieldBookmark;
                         bRet=true;
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_FTN & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_FTN & rContentAtPos.eContentAtPos )
                 {
-                    if( aTmpState.bFtnNoInfo )
+                    if( aTmpState.bFootnoteNoInfo )
                     {
                         // over the footnote's char
                         bRet = true;
                         if( bSetCrsr )
                         {
                             *m_pCurCrsr->GetPoint() = aPos;
-                            if( !GotoFtnAnchor() )
+                            if( !GotoFootnoteAnchor() )
                                 bRet = false;
                         }
                         if( bRet )
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
                     }
-                    else if ( 0 != ( pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
+                    else if ( 0 != ( pTextAttr = pTextNd->GetTextAttrForCharAt(
                         aPos.nContent.GetIndex(), RES_TXTATR_FTN )) )
                     {
                         bRet = true;
@@ -1306,8 +1306,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         {
                             SwCallLink aLk( *this ); // watch Crsr-Moves
                             SwCrsrSaveState aSaveState( *m_pCurCrsr );
-                            m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTxtFtn*>(pTxtAttr)->GetStartNode();
-                            SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+                            m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTextFootnote*>(pTextAttr)->GetStartNode();
+                            SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
                                 &m_pCurCrsr->GetPoint()->nNode,
                                 true, !IsReadOnlyAvailable() );
 
@@ -1326,45 +1326,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
+                            rContentAtPos.pFndTextAttr = pTextAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if( !bRet
-                    && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rCntntAtPos.eCntntAtPos
-                    && !aTmpState.bFtnNoInfo )
+                    && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rContentAtPos.eContentAtPos
+                    && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = 0;
-                    if( SwContentAtPos::SW_TOXMARK & rCntntAtPos.eCntntAtPos )
+                    pTextAttr = 0;
+                    if( SwContentAtPos::SW_TOXMARK & rContentAtPos.eContentAtPos )
                     {
-                        ::std::vector<SwTxtAttr *> const marks(
-                            pTxtNd->GetTxtAttrsAt(
+                        ::std::vector<SwTextAttr *> const marks(
+                            pTextNd->GetTextAttrsAt(
                                aPos.nContent.GetIndex(), RES_TXTATR_TOXMARK));
                         if (marks.size())
                         {   // hmm... can only return 1 here
-                            pTxtAttr = *marks.begin();
+                            pTextAttr = *marks.begin();
                         }
                     }
 
-                    if( !pTxtAttr &&
-                        SwContentAtPos::SW_REFMARK & rCntntAtPos.eCntntAtPos )
+                    if( !pTextAttr &&
+                        SwContentAtPos::SW_REFMARK & rContentAtPos.eContentAtPos )
                     {
-                        ::std::vector<SwTxtAttr *> const marks(
-                            pTxtNd->GetTxtAttrsAt(
+                        ::std::vector<SwTextAttr *> const marks(
+                            pTextNd->GetTextAttrsAt(
                                aPos.nContent.GetIndex(), RES_TXTATR_REFMARK));
                         if (marks.size())
                         {   // hmm... can only return 1 here
-                            pTxtAttr = *marks.begin();
+                            pTextAttr = *marks.begin();
                         }
                     }
 
-                    if( pTxtAttr )
+                    if( pTextAttr )
                     {
                         bRet = true;
                         if( bSetCrsr )
@@ -1381,35 +1381,35 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            const sal_Int32* pEnd = pTxtAttr->GetEnd();
+                            const sal_Int32* pEnd = pTextAttr->GetEnd();
                             if( pEnd )
-                                rCntntAtPos.sStr =
-                                    pTxtNd->GetExpandTxt( pTxtAttr->GetStart(), *pEnd - pTxtAttr->GetStart() );
-                            else if( RES_TXTATR_TOXMARK == pTxtAttr->Which())
-                                rCntntAtPos.sStr =
-                                    pTxtAttr->GetTOXMark().GetAlternativeText();
-
-                            rCntntAtPos.eCntntAtPos =
-                                RES_TXTATR_TOXMARK == pTxtAttr->Which()
+                                rContentAtPos.sStr =
+                                    pTextNd->GetExpandText( pTextAttr->GetStart(), *pEnd - pTextAttr->GetStart() );
+                            else if( RES_TXTATR_TOXMARK == pTextAttr->Which())
+                                rContentAtPos.sStr =
+                                    pTextAttr->GetTOXMark().GetAlternativeText();
+
+                            rContentAtPos.eContentAtPos =
+                                RES_TXTATR_TOXMARK == pTextAttr->Which()
                                 ? SwContentAtPos::SW_TOXMARK
                                 : SwContentAtPos::SW_REFMARK;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+                            rContentAtPos.pFndTextAttr = pTextAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if ( !bRet
-                     && SwContentAtPos::SW_INETATTR & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && SwContentAtPos::SW_INETATTR & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = pTxtNd->GetTxtAttrAt(
+                    pTextAttr = pTextNd->GetTextAttrAt(
                             aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
                     // "detect" only INetAttrs with URLs
-                    if( pTxtAttr && !pTxtAttr->GetINetFmt().GetValue().isEmpty() )
+                    if( pTextAttr && !pTextAttr->GetINetFormat().GetValue().isEmpty() )
                     {
                         bRet = true;
                         if( bSetCrsr )
@@ -1426,66 +1426,66 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         }
                         if( bRet )
                         {
-                            rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
-                                pTxtAttr->GetStart(),
-                                *pTxtAttr->GetEnd() - pTxtAttr->GetStart() );
+                            rContentAtPos.sStr = pTextNd->GetExpandText(
+                                pTextAttr->GetStart(),
+                                *pTextAttr->GetEnd() - pTextAttr->GetStart() );
 
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_INETATTR;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_INETATTR;
+                            rContentAtPos.pFndTextAttr = pTextAttr;
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_REDLINE & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_REDLINE & rContentAtPos.eContentAtPos )
                 {
                     const SwRangeRedline* pRedl = GetDoc()->getIDocumentRedlineAccess().GetRedline(aPos, NULL);
                     if( pRedl )
                     {
-                        rCntntAtPos.aFnd.pRedl = pRedl;
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
-                        rCntntAtPos.pFndTxtAttr = 0;
+                        rContentAtPos.aFnd.pRedl = pRedl;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_REDLINE;
+                        rContentAtPos.pFndTextAttr = 0;
                         bRet = true;
 
-                        if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                            pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                        if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                            pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                     }
                 }
             }
 
             if( !bRet
-                 && ( SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
+                 && ( SwContentAtPos::SW_TABLEBOXFML & rContentAtPos.eContentAtPos
 #ifdef DBG_UTIL
-                      || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
+                      || SwContentAtPos::SW_TABLEBOXVALUE & rContentAtPos.eContentAtPos
 #endif
                 ) )
             {
-                const SwTableNode* pTblNd;
+                const SwTableNode* pTableNd;
                 const SwTableBox* pBox;
-                const SwStartNode* pSttNd = pTxtNd->FindTableBoxStartNode();
+                const SwStartNode* pSttNd = pTextNd->FindTableBoxStartNode();
                 const SfxPoolItem* pItem;
-                if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
-                    0 != ( pBox = pTblNd->GetTable().GetTblBox(
+                if( pSttNd && 0 != ( pTableNd = pTextNd->FindTableNode()) &&
+                    0 != ( pBox = pTableNd->GetTable().GetTableBox(
                     pSttNd->GetIndex() )) &&
 #ifdef DBG_UTIL
-                    ( SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    ( SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_FORMULA, false, &pItem ) ||
-                    SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_VALUE, false, &pItem ))
 #else
-                    SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_FORMULA, false, &pItem )
 #endif
                     )
                 {
-                    SwFrm* pF = pTxtNd->getLayoutFrm( GetLayout(), &aPt );
+                    SwFrm* pF = pTextNd->getLayoutFrm( GetLayout(), &aPt );
                     if( pF )
                     {
                         // then the CellFrame
-                        pFrm = static_cast<SwCntntFrm*>(pF);
+                        pFrm = static_cast<SwContentFrm*>(pF);
                         while( pF && !pF->IsCellFrm() )
                             pF = pF->GetUpper();
                     }
@@ -1502,13 +1502,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     {
                         // create from internal (for CORE) the external
                         // (for UI) formula
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXFML;
 #ifdef DBG_UTIL
                         if( RES_BOXATR_VALUE == pItem->Which() )
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
                         else
 #endif
-                            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->PtrToBoxNm( &pTblNd->GetTable() );
+                            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->PtrToBoxNm( &pTableNd->GetTable() );
 
                         bRet = true;
                         if( bSetCrsr )
@@ -1525,29 +1525,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            if( pFldRect )
+                            if( pFieldRect )
                             {
-                                *pFldRect = pF->Prt();
-                                *pFldRect += pF->Frm().Pos();
+                                *pFieldRect = pF->Prt();
+                                *pFieldRect += pF->Frm().Pos();
                             }
-                            rCntntAtPos.pFndTxtAttr = 0;
-                            rCntntAtPos.aFnd.pAttr = pItem;
+                            rContentAtPos.pFndTextAttr = 0;
+                            rContentAtPos.aFnd.pAttr = pItem;
                         }
                     }
                 }
             }
 
 #ifdef DBG_UTIL
-            if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
+            if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rContentAtPos.eContentAtPos )
             {
                 const sal_Int32 n = aPos.nContent.GetIndex();
                 SfxItemSet aSet( GetDoc()->GetAttrPool(), POOLATTR_BEGIN,
                     POOLATTR_END - 1 );
-                if( pTxtNd->GetpSwpHints() )
+                if( pTextNd->GetpSwpHints() )
                 {
-                    for( size_t i = 0; i < pTxtNd->GetSwpHints().Count(); ++i )
+                    for( size_t i = 0; i < pTextNd->GetSwpHints().Count(); ++i )
                     {
-                        const SwTxtAttr* pHt = pTxtNd->GetSwpHints()[i];
+                        const SwTextAttr* pHt = pTextNd->GetSwpHints()[i];
                         const sal_Int32 nAttrStart = pHt->GetStart();
                         if( nAttrStart > n ) // over the section
                             break;
@@ -1562,29 +1562,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             aSet.Put( pHt->GetAttr() );
                         }
                     }
-                    if( pTxtNd->HasSwAttrSet() &&
-                        pTxtNd->GetpSwAttrSet()->Count() )
+                    if( pTextNd->HasSwAttrSet() &&
+                        pTextNd->GetpSwAttrSet()->Count() )
                     {
-                        SfxItemSet aFmtSet( pTxtNd->GetSwAttrSet() );
+                        SfxItemSet aFormatSet( pTextNd->GetSwAttrSet() );
                         // remove all from format set that are also in TextSet
-                        aFmtSet.Differentiate( aSet );
+                        aFormatSet.Differentiate( aSet );
                         // now merge all together
-                        aSet.Put( aFmtSet );
+                        aSet.Put( aFormatSet );
                     }
                 }
                 else
-                    pTxtNd->SwCntntNode::GetAttr( aSet );
-
-                rCntntAtPos.sStr = "Pos: (";
-                rCntntAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
-                rCntntAtPos.sStr += ":";
-                rCntntAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
-                rCntntAtPos.sStr += ")";
-                rCntntAtPos.sStr += "\nParagraph Style: ";
-                rCntntAtPos.sStr += pTxtNd->GetFmtColl()->GetName();
-                if( pTxtNd->GetCondFmtColl() )
+                    pTextNd->SwContentNode::GetAttr( aSet );
+
+                rContentAtPos.sStr = "Pos: (";
+                rContentAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
+                rContentAtPos.sStr += ":";
+                rContentAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
+                rContentAtPos.sStr += ")";
+                rContentAtPos.sStr += "\nParagraph Style: ";
+                rContentAtPos.sStr += pTextNd->GetFormatColl()->GetName();
+                if( pTextNd->GetCondFormatColl() )
                 {
-                    rCntntAtPos.sStr += "\nConditional Style: " + pTxtNd->GetCondFmtColl()->GetName();
+                    rContentAtPos.sStr += "\nConditional Style: " + pTextNd->GetCondFormatColl()->GetName();
                 }
 
                 if( aSet.Count() )
@@ -1609,13 +1609,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     }
                     if (!sAttrs.isEmpty())
                     {
-                        if( !rCntntAtPos.sStr.isEmpty() )
-                            rCntntAtPos.sStr += "\n";
-                        rCntntAtPos.sStr += "Attr: " + sAttrs;
+                        if( !rContentAtPos.sStr.isEmpty() )
+                            rContentAtPos.sStr += "\n";
+                        rContentAtPos.sStr += "Attr: " + sAttrs;
                     }
                 }
                 bRet = true;
-                rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_CURR_ATTRS;
+                rContentAtPos.eContentAtPos = SwContentAtPos::SW_CURR_ATTRS;
             }
 #endif
         }
@@ -1623,8 +1623,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
     if( !bRet )
     {
-        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_NOTHING;
-        rCntntAtPos.aFnd.pFld = 0;
+        rContentAtPos.eContentAtPos = SwContentAtPos::SW_NOTHING;
+        rContentAtPos.aFnd.pField = 0;
     }
     return bRet;
 }
@@ -1632,45 +1632,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 // #i90516#
 const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
 {
-    const SwPostItField* pPostItFld = 0;
+    const SwPostItField* pPostItField = 0;
 
     if ( !IsTableMode() )
     {
         const SwPosition* pCursorPos = _GetCrsr()->GetPoint();
-        const SwTxtNode* pTxtNd = pCursorPos->nNode.GetNode().GetTxtNode();
-        if ( pTxtNd )
+        const SwTextNode* pTextNd = pCursorPos->nNode.GetNode().GetTextNode();
+        if ( pTextNd )
         {
-            SwTxtAttr* pTxtAttr = pTxtNd->GetFldTxtAttrAt( pCursorPos->nContent.GetIndex() );
-            const SwField* pFld = pTxtAttr != NULL ? pTxtAttr->GetFmtFld().GetField() : 0;
-            if ( pFld && pFld->Which()== RES_POSTITFLD )
+            SwTextAttr* pTextAttr = pTextNd->GetFieldTextAttrAt( pCursorPos->nContent.GetIndex() );
+            const SwField* pField = pTextAttr != NULL ? pTextAttr->GetFormatField().GetField() : 0;
+            if ( pField && pField->Which()== RES_POSTITFLD )
             {
-                pPostItFld = static_cast<const SwPostItField*>(pFld);
+                pPostItField = static_cast<const SwPostItField*>(pField);
             }
         }
     }
 
-    return pPostItFld;
+    return pPostItField;
 }
 
 /// is the node in a protected section?
 bool SwContentAtPos::IsInProtectSect() const
 {
-    const SwTxtNode* pNd = 0;
-    if( pFndTxtAttr )
+    const SwTextNode* pNd = 0;
+    if( pFndTextAttr )
     {
-        switch( eCntntAtPos )
+        switch( eContentAtPos )
         {
         case SW_FIELD:
         case SW_CLICKFIELD:
-            pNd = static_txtattr_cast<SwTxtFld const*>(pFndTxtAttr)->GetpTxtNode();
+            pNd = static_txtattr_cast<SwTextField const*>(pFndTextAttr)->GetpTextNode();
             break;
 
         case SW_FTN:
-            pNd = &static_cast<const SwTxtFtn*>(pFndTxtAttr)->GetTxtNode();
+            pNd = &static_cast<const SwTextFootnote*>(pFndTextAttr)->GetTextNode();
             break;
 
         case SW_INETATTR:
-            pNd = static_txtattr_cast<SwTxtINetFmt const*>(pFndTxtAttr)->GetpTxtNode();
+            pNd = static_txtattr_cast<SwTextINetFormat const*>(pFndTextAttr)->GetpTextNode();
             break;
 
         default:
@@ -1678,7 +1678,7 @@ bool SwContentAtPos::IsInProtectSect() const
         }
     }
 
-    const SwCntntFrm* pFrm;
+    const SwContentFrm* pFrm;
     return pNd && ( pNd->IsInProtectSect() ||
                     ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)) &&
                         pFrm->IsProtected() ));
@@ -1687,24 +1687,24 @@ bool SwContentAtPos::IsInProtectSect() const
 bool SwContentAtPos::IsInRTLText()const
 {
     bool bRet = false;
-    const SwTxtNode* pNd = 0;
-    if (pFndTxtAttr && (eCntntAtPos == SW_FTN))
+    const SwTextNode* pNd = 0;
+    if (pFndTextAttr && (eContentAtPos == SW_FTN))
     {
-        const SwTxtFtn* pTxtFtn = static_cast<const SwTxtFtn*>(pFndTxtAttr);
-        if(pTxtFtn->GetStartNode())
+        const SwTextFootnote* pTextFootnote = static_cast<const SwTextFootnote*>(pFndTextAttr);
+        if(pTextFootnote->GetStartNode())
         {
-            SwStartNode* pSttNd = pTxtFtn->GetStartNode()->GetNode().GetStartNode();
+            SwStartNode* pSttNd = pTextFootnote->GetStartNode()->GetNode().GetStartNode();
             SwPaM aTemp( *pSttNd );
             aTemp.Move(fnMoveForward, fnGoNode);
-            SwCntntNode* pCntntNode = aTemp.GetCntntNode();
-            if(pCntntNode && pCntntNode->IsTxtNode())
-                pNd = pCntntNode->GetTxtNode();
+            SwContentNode* pContentNode = aTemp.GetContentNode();
+            if(pContentNode && pContentNode->IsTextNode())
+                pNd = pContentNode->GetTextNode();
         }
     }
     if(pNd)
     {
-        SwIterator<SwTxtFrm,SwTxtNode> aIter(*pNd);
-        SwTxtFrm* pTmpFrm = aIter.First();
+        SwIterator<SwTextFrm,SwTextNode> aIter(*pNd);
+        SwTextFrm* pTmpFrm = aIter.First();
         while( pTmpFrm )
         {
                 if ( !pTmpFrm->IsFollow())
@@ -1718,7 +1718,7 @@ bool SwContentAtPos::IsInRTLText()const
     return bRet;
 }
 
-bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
+bool SwCrsrShell::SelectText( const sal_Int32 nStart,
                                  const sal_Int32 nEnd )
 {
     SET_CURR_SHELL( this );
@@ -1742,39 +1742,39 @@ bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
     return bRet;
 }
 
-bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich,
+bool SwCrsrShell::SelectTextAttr( sal_uInt16 nWhich,
                                      bool bExpand,
-                                     const SwTxtAttr* pTxtAttr )
+                                     const SwTextAttr* pTextAttr )
 {
     SET_CURR_SHELL( this );
     bool bRet = false;
 
     if( !IsTableMode() )
     {
-        if( !pTxtAttr )
+        if( !pTextAttr )
         {
             SwPosition& rPos = *m_pCurCrsr->GetPoint();
-            SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-            pTxtAttr = (pTxtNd)
-                ? pTxtNd->GetTxtAttrAt(rPos.nContent.GetIndex(),
+            SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+            pTextAttr = (pTextNd)
+                ? pTextNd->GetTextAttrAt(rPos.nContent.GetIndex(),
                         static_cast<RES_TXTATR>(nWhich),
-                        (bExpand) ? SwTxtNode::EXPAND : SwTxtNode::DEFAULT)
+                        (bExpand) ? SwTextNode::EXPAND : SwTextNode::DEFAULT)
                 : 0;
         }
 
-        if( pTxtAttr )
+        if( pTextAttr )
         {
-            const sal_Int32* pEnd = pTxtAttr->End();
-            bRet = SelectTxt( pTxtAttr->GetStart(), ( pEnd ? *pEnd : pTxtAttr->GetStart() + 1 ) );
+            const sal_Int32* pEnd = pTextAttr->End();
+            bRet = SelectText( pTextAttr->GetStart(), ( pEnd ? *pEnd : pTextAttr->GetStart() + 1 ) );
         }
     }
     return bRet;
 }
 
-bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwCrsrShell::GotoINetAttr( const SwTextINetFormat& rAttr )
 {
     bool bRet = false;
-    if( rAttr.GetpTxtNode() )
+    if( rAttr.GetpTextNode() )
     {
         SwCursor* pCrsr = getShellCrsr( true );
 
@@ -1782,8 +1782,8 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
         SwCallLink aLk( *this ); // watch Crsr-Moves
         SwCrsrSaveState aSaveState( *pCrsr );
 
-        pCrsr->GetPoint()->nNode = *rAttr.GetpTxtNode();
-        pCrsr->GetPoint()->nContent.Assign( const_cast<SwTxtNode*>(rAttr.GetpTxtNode()),
+        pCrsr->GetPoint()->nNode = *rAttr.GetpTextNode();
+        pCrsr->GetPoint()->nContent.Assign( const_cast<SwTextNode*>(rAttr.GetpTextNode()),
                                             rAttr.GetStart() );
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -1792,7 +1792,7 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
     return bRet;
 }
 
-const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwCrsrShell::FindINetAttr( const OUString& rName ) const
 {
     return mpDoc->FindINetAttr( rName );
 }
@@ -1844,7 +1844,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
             SwCallLink aLk( *this ); // watch Crsr-Moves
             StartAction();
 
-            SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
             SwUndoId nUndoId = UNDO_INS_FROM_SHADOWCRSR;
             // If only the paragraph attributes "Adjust" or "LRSpace" are set,
             // then the following should not delete those again.
@@ -1857,10 +1857,10 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
 
             GetDoc()->GetIDocumentUndoRedo().StartUndo( nUndoId, NULL );
 
-            SwTxtFmtColl* pNextFmt = 0;
-            SwTxtNode* pTNd = pCNd ? pCNd->GetTxtNode() : NULL;
+            SwTextFormatColl* pNextFormat = 0;
+            SwTextNode* pTNd = pCNd ? pCNd->GetTextNode() : NULL;
             if( pTNd )
-                pNextFmt = &pTNd->GetTxtColl()->GetNextTxtFmtColl();
+                pNextFormat = &pTNd->GetTextColl()->GetNextTextFormatColl();
 
             const SwSectionNode* pSectNd = pCNd ? pCNd->FindSectionNode() : NULL;
             if( pSectNd && aFPos.nParaCnt )
@@ -1878,17 +1878,17 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
 
             for( sal_uInt16 n = 0; n < aFPos.nParaCnt + aFPos.nColumnCnt; ++n )
             {
-                GetDoc()->getIDocumentContentOperations().AppendTxtNode( aPos );
-                if( !n && pNextFmt )
+                GetDoc()->getIDocumentContentOperations().AppendTextNode( aPos );
+                if( !n && pNextFormat )
                 {
                     *m_pCurCrsr->GetPoint() = aPos;
-                    GetDoc()->SetTxtFmtColl( *m_pCurCrsr, pNextFmt, false );
+                    GetDoc()->SetTextFormatColl( *m_pCurCrsr, pNextFormat, false );
                 }
                 if( n < aFPos.nColumnCnt )
                 {
                     *m_pCurCrsr->GetPoint() = aPos;
                     GetDoc()->getIDocumentContentOperations().InsertPoolItem( *m_pCurCrsr,
-                            SvxFmtBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
+                            SvxFormatBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
                 }
             }
 
@@ -1896,7 +1896,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
             switch( aFPos.eMode )
             {
             case FILL_INDENT:
-                if( 0 != (pCNd = aPos.nNode.GetNode().GetCntntNode() ))
+                if( 0 != (pCNd = aPos.nNode.GetNode().GetContentNode() ))
                 {
                     SfxItemSet aSet( GetDoc()->GetAttrPool(),
                                     RES_LR_SPACE, RES_LR_SPACE,
@@ -1904,8 +1904,8 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                                     0 );
                     SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(
                                         pCNd->GetAttr( RES_LR_SPACE ) ) );
-                    aLR.SetTxtLeft( aFPos.nTabCnt );
-                    aLR.SetTxtFirstLineOfst( 0 );
+                    aLR.SetTextLeft( aFPos.nTabCnt );
+                    aLR.SetTextFirstLineOfst( 0 );
                     aSet.Put( aLR );
 
                     const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>(pCNd->
@@ -1916,7 +1916,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                     GetDoc()->getIDocumentContentOperations().InsertItemSet( *m_pCurCrsr, aSet );
                 }
                 else {
-                    OSL_ENSURE( false, "No CntntNode" );
+                    OSL_ENSURE( false, "No ContentNode" );
                 }
                 break;
 
@@ -2003,14 +2003,14 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
 
-    pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl()[ nArrPos ];
+    pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable()[ nArrPos ];
     if( pFnd )
     {
         *m_pCurCrsr->GetPoint() = *pFnd->Start();
 
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         SwNodeIndex* pIdx = &m_pCurCrsr->GetPoint()->nNode;
-        if( !pIdx->GetNode().IsCntntNode() &&
+        if( !pIdx->GetNode().IsContentNode() &&
             0 != ( pCNd = GetDoc()->GetNodes().GoNextSection( pIdx,
                                     true, IsReadOnlyAvailable() )) )
         {
@@ -2025,7 +2025,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
             m_pCurCrsr->SetMark();
             if( nsRedlineType_t::REDLINE_FMTCOLL == pFnd->GetType() )
             {
-                pCNd = pIdx->GetNode().GetCntntNode();
+                pCNd = pIdx->GetNode().GetContentNode();
                 m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
                 m_pCurCrsr->GetMark()->nContent.Assign( pCNd, 0 );
             }
@@ -2033,7 +2033,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
                 *m_pCurCrsr->GetPoint() = *pFnd->End();
 
             pIdx = &m_pCurCrsr->GetPoint()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = SwNodes::GoPrevSection( pIdx,
                                             true, IsReadOnlyAvailable() )) )
             {
@@ -2072,8 +2072,8 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
     {
         SET_CURR_SHELL( this );
 
-        const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-        const SwRangeRedline* pTmp = rTbl[ nArrPos ];
+        const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+        const SwRangeRedline* pTmp = rTable[ nArrPos ];
         sal_uInt16 nSeqNo = pTmp->GetSeqNo();
         if( nSeqNo && bSelect )
         {
@@ -2089,7 +2089,7 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
 
                 if( pTmp && bCheck )
                 {
-                    // Check for overlaps. These can happen when FmtColl-
+                    // Check for overlaps. These can happen when FormatColl-
                     // Redlines were stretched over a whole paragraph
                     SwPaM* pCur = m_pCurCrsr;
                     SwPaM* pNextPam = pCur->GetNext();
@@ -2149,11 +2149,11 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
                 }
 
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? rTbl.FindNextOfSeqNo( nArrPos )
-                                    : rTbl.FindPrevOfSeqNo( nArrPos );
+                                    ? rTable.FindNextOfSeqNo( nArrPos )
+                                    : rTable.FindPrevOfSeqNo( nArrPos );
                 if( USHRT_MAX != nFndPos ||
                     ( 0 != ( --nLoopCnt ) && USHRT_MAX != (
-                            nFndPos = rTbl.FindPrevOfSeqNo( nArrSavPos ))) )
+                            nFndPos = rTable.FindPrevOfSeqNo( nArrSavPos ))) )
                 {
                     if( pTmp )
                     {
@@ -2182,47 +2182,47 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
     sal_uLong nBodySttNdIdx = pBodySttNd->GetIndex();
     Point aPt;
 
-    _SetGetExpFld aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
-    _SetGetExpFld aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
+    _SetGetExpField aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
+    _SetGetExpField aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
     if( aCurPos.GetNode() < nBodySttNdIdx )
     {
-        const SwCntntNode* pCNd = aCurPos.GetNodeFromCntnt()->GetCntntNode();
-        SwCntntFrm* pFrm;
+        const SwContentNode* pCNd = aCurPos.GetNodeFromContent()->GetContentNode();
+        SwContentFrm* pFrm;
         if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt )) )
             aCurPos.SetBodyPos( *pFrm );
     }
 
     // check first all the hyperlink fields
     {
-        const SwTxtNode* pTxtNd;
-        const SwCharFmts* pFmts = GetDoc()->GetCharFmts();
-        for( SwCharFmts::size_type n = pFmts->size(); 1 < n; )
+        const SwTextNode* pTextNd;
+        const SwCharFormats* pFormats = GetDoc()->GetCharFormats();
+        for( SwCharFormats::size_type n = pFormats->size(); 1 < n; )
         {
-            SwIterator<SwTxtINetFmt,SwCharFmt> aIter(*(*pFmts)[--n]);
+            SwIterator<SwTextINetFormat,SwCharFormat> aIter(*(*pFormats)[--n]);
 
-            for( SwTxtINetFmt* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
-                if( 0 != ( pTxtNd = pFnd->GetpTxtNode()) &&
-                    pTxtNd->GetNodes().IsDocNodes() )
+            for( SwTextINetFormat* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+                if( 0 != ( pTextNd = pFnd->GetpTextNode()) &&
+                    pTextNd->GetNodes().IsDocNodes() )
                 {
-                    SwTxtINetFmt& rAttr = *pFnd;
-                    SwPosition aTmpPos( *pTxtNd );
-                    _SetGetExpFld aPos( aTmpPos.nNode, rAttr );
-                    SwCntntFrm* pFrm;
-                    if( pTxtNd->GetIndex() < nBodySttNdIdx &&
-                        0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt )) )
+                    SwTextINetFormat& rAttr = *pFnd;
+                    SwPosition aTmpPos( *pTextNd );
+                    _SetGetExpField aPos( aTmpPos.nNode, rAttr );
+                    SwContentFrm* pFrm;
+                    if( pTextNd->GetIndex() < nBodySttNdIdx &&
+                        0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt )) )
                         aPos.SetBodyPos( *pFrm );
 
                     if( bNext
                         ? ( aPos < aCmpPos && aCurPos < aPos )
                         : ( aCmpPos < aPos && aPos < aCurPos ))
                     {
-                        OUString sTxt( pTxtNd->GetExpandTxt( rAttr.GetStart(),
+                        OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
                                         *rAttr.GetEnd() - rAttr.GetStart() ) );
 
-                        sTxt = comphelper::string::remove(sTxt, 0x0a);
-                        sTxt = comphelper::string::strip(sTxt, ' ');
+                        sText = comphelper::string::remove(sText, 0x0a);
+                        sText = comphelper::string::strip(sText, ' ');
 
-                        if( !sTxt.isEmpty() )
+                        if( !sText.isEmpty() )
                             aCmpPos = aPos;
                     }
                 }
@@ -2231,19 +2231,19 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
 
     // then check all the Flys with a URL or imapge map
     {
-        const SwFrmFmts* pFmts = GetDoc()->GetSpzFrmFmts();
-        for( SwFrmFmts::size_type n = 0, nEnd = pFmts->size(); n < nEnd; ++n )
+        const SwFrameFormats* pFormats = GetDoc()->GetSpzFrameFormats();
+        for( SwFrameFormats::size_type n = 0, nEnd = pFormats->size(); n < nEnd; ++n )
         {
-            SwFlyFrmFmt* pFmt = static_cast<SwFlyFrmFmt*>((*pFmts)[ n ]);
-            const SwFmtURL& rURLItem = pFmt->GetURL();
+            SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>((*pFormats)[ n ]);
+            const SwFormatURL& rURLItem = pFormat->GetURL();
             if( rURLItem.GetMap() || !rURLItem.GetURL().isEmpty() )
             {
-                SwFlyFrm* pFly = pFmt->GetFrm( &aPt, false );
+                SwFlyFrm* pFly = pFormat->GetFrm( &aPt, false );
                 SwPosition aTmpPos( *pBodySttNd );
                 if( pFly &&
-                    GetBodyTxtNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
+                    GetBodyTextNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
                 {
-                    _SetGetExpFld aPos( *pFmt, &aTmpPos );
+                    _SetGetExpField aPos( *pFormat, &aTmpPos );
 
                     if( bNext
                             ? ( aPos < aCmpPos && aCurPos < aPos )
@@ -2256,9 +2256,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
 
     // found any URL ?
     bool bRet = false;
-    const SwTxtINetFmt* pFndAttr = aCmpPos.GetINetFmt();
-    const SwFlyFrmFmt* pFndFmt = aCmpPos.GetFlyFmt();
-    if( pFndAttr || pFndFmt )
+    const SwTextINetFormat* pFndAttr = aCmpPos.GetINetFormat();
+    const SwFlyFrameFormat* pFndFormat = aCmpPos.GetFlyFormat();
+    if( pFndAttr || pFndFormat )
     {
         SET_CURR_SHELL( this );
         SwCallLink aLk( *this );
@@ -2281,9 +2281,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
             }
         }
         // found a draw object ?
-        else if( RES_DRAWFRMFMT == pFndFmt->Which() )
+        else if( RES_DRAWFRMFMT == pFndFormat->Which() )
         {
-            const SdrObject* pSObj = pFndFmt->FindSdrObject();
+            const SdrObject* pSObj = pFndFormat->FindSdrObject();
             if (pSObj)
             {
                 static_cast<SwFEShell*>(this)->SelectObj( pSObj->GetCurrentBoundRect().Center() );
@@ -2293,7 +2293,7 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
         }
         else // then is it a fly
         {
-            SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, false );
+            SwFlyFrm* pFly = pFndFormat->GetFrm(&aPt, false );
             if( pFly )
             {
                 static_cast<SwFEShell*>(this)->SelectFlyFrm( *pFly, true );
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index d0cdeaa50b6c..9ff5944d7e5c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-typedef std::set<SwFmt*> SwpFmts;
+typedef std::set<SwFormat*> SwpFormats;
 
 // Special case for SvxFontItem: only compare the name
 bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
@@ -66,9 +66,9 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
     case RES_PAGEDESC:
         bool bNumOffsetEqual = false;
         ::boost::optional<sal_uInt16> const oNumOffset1 =
-            static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
+            static_cast<const SwFormatPageDesc&>(rItem1).GetNumOffset();
         ::boost::optional<sal_uInt16> const oNumOffset2 =
-            static_cast<const SwFmtPageDesc&>(rItem2).GetNumOffset();
+            static_cast<const SwFormatPageDesc&>(rItem2).GetNumOffset();
         if (!oNumOffset1 && !oNumOffset2)
         {
             bNumOffsetEqual = true;
@@ -85,33 +85,33 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
         if (!bNumOffsetEqual)
             return false;
 
-        return static_cast<const SwFmtPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFmtPageDesc&>(rItem2).GetPageDesc();
+        return static_cast<const SwFormatPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFormatPageDesc&>(rItem2).GetPageDesc();
     }
     return rItem1 == rItem2;
 }
 
-const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
-                                    sal_Int32 nCntntPos )
+const SwTextAttr* GetFrwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+                                    sal_Int32 nContentPos )
 {
     while( rPos < rHtsArr.Count() )
     {
-        const SwTxtAttr *pTxtHt = rHtsArr.GetStart( rPos++ );
+        const SwTextAttr *pTextHt = rHtsArr.GetStart( rPos++ );
         // the start of an attribute has to be in the section
-        if( pTxtHt->GetStart() >= nCntntPos )
-            return pTxtHt; // valid text attribute
+        if( pTextHt->GetStart() >= nContentPos )
+            return pTextHt; // valid text attribute
     }
     return 0; // invalid text attribute
 }
 
-const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
-                                  sal_Int32 nCntntPos )
+const SwTextAttr* GetBkwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+                                  sal_Int32 nContentPos )
 {
     while( rPos > 0 )
     {
-        const SwTxtAttr *pTxtHt = rHtsArr.GetStart( --rPos );
+        const SwTextAttr *pTextHt = rHtsArr.GetStart( --rPos );
         // the start of an attribute has to be in the section
-        if( pTxtHt->GetStart() < nCntntPos )
-            return pTxtHt; // valid text attribute
+        if( pTextHt->GetStart() < nContentPos )
+            return pTextHt; // valid text attribute
     }
     return 0; // invalid text attribute
 }
@@ -119,22 +119,22 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
 static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd,
                      const bool bSaveMark )
 {
-    sal_Int32 nCntntPos;
+    sal_Int32 nContentPos;
     if( bSaveMark )
-        nCntntPos = rPam.GetMark()->nContent.GetIndex();
+        nContentPos = rPam.GetMark()->nContent.GetIndex();
     else
-        nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+        nContentPos = rPam.GetPoint()->nContent.GetIndex();
     bool bTstEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode;
 
-    SwCntntNode* pCNd = rPam.GetCntntNode();
+    SwContentNode* pCNd = rPam.GetContentNode();
     rPam.GetPoint()->nContent.Assign( pCNd, nStart );
     rPam.SetMark(); // Point == GetMark
 
     // Point points to end of search area or end of attribute
     if( pEnd )
     {
-        if( bTstEnd && *pEnd > nCntntPos )
-            rPam.GetPoint()->nContent = nCntntPos;
+        if( bTstEnd && *pEnd > nContentPos )
+            rPam.GetPoint()->nContent = nContentPos;
         else
             rPam.GetPoint()->nContent = *pEnd;
     }
@@ -147,30 +147,30 @@ static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd
     If that is found then the SwPaM contains the section that surrounds the
     attribute (w.r.t. the search area).
 
-    @param rTxtNd   Text node to search in.
+    @param rTextNd   Text node to search in.
     @param rPam     ???
     @param rCmpItem ???
     @param fnMove   ???
     @param bValue   ???
     @return Returns <true> if found, <false> otherwise.
 */
-static bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
+static bool lcl_Search( const SwTextNode& rTextNd, SwPaM& rPam,
                     const SfxPoolItem& rCmpItem,
                     SwMoveFn fnMove, bool bValue )
 {
-    if ( !rTxtNd.HasHints() )
+    if ( !rTextNd.HasHints() )
         return false;
 
-    const SwTxtAttr *pTxtHt = 0;
+    const SwTextAttr *pTextHt = 0;
     bool bForward = fnMove == fnMoveForward;
-    sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count();
-    sal_Int32 nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+    sal_uInt16 nPos = bForward ? 0 : rTextNd.GetSwpHints().Count();
+    sal_Int32 nContentPos = rPam.GetPoint()->nContent.GetIndex();
 
-    while( 0 != ( pTxtHt=(*fnMove->fnGetHint)(rTxtNd.GetSwpHints(),nPos,nCntntPos)))
-        if( pTxtHt->Which() == rCmpItem.Which() &&
-            ( !bValue || CmpAttr( pTxtHt->GetAttr(), rCmpItem )))
+    while( 0 != ( pTextHt=(*fnMove->fnGetHint)(rTextNd.GetSwpHints(),nPos,nContentPos)))
+        if( pTextHt->Which() == rCmpItem.Which() &&
+            ( !bValue || CmpAttr( pTextHt->GetAttr(), rCmpItem )))
         {
-            lcl_SetAttrPam( rPam, pTxtHt->GetStart(), pTxtHt->End(), bForward );
+            lcl_SetAttrPam( rPam, pTextHt->GetStart(), pTextHt->End(), bForward );
             return true;
         }
     return false;
@@ -204,7 +204,7 @@ public:
     SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections );
     ~SwAttrCheckArr();
 
-    void SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam );
+    void SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam );
 
     /// how many attributes are there in total?
     sal_uInt16 Count() const    { return aCmpSet.Count(); }
@@ -217,8 +217,8 @@ public:
     sal_Int32 GetNdStt() const { return nNdStt; }
     sal_Int32 GetNdEnd() const { return nNdEnd; }
 
-    bool SetAttrFwd( const SwTxtAttr& rAttr );
-    bool SetAttrBwd( const SwTxtAttr& rAttr );
+    bool SetAttrFwd( const SwTextAttr& rAttr );
+    bool SetAttrBwd( const SwTextAttr& rAttr );
 };
 
 SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd,
@@ -251,7 +251,7 @@ SwAttrCheckArr::~SwAttrCheckArr()
     delete[] reinterpret_cast<char*>(pStackArr);
 }
 
-void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
+void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam )
 {
     memset( pFndArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
     memset( pStackArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
@@ -263,7 +263,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
         nNdStt = rPam.GetPoint()->nContent.GetIndex();
         nNdEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
                 ? rPam.GetMark()->nContent.GetIndex()
-                : rTxtNd.GetTxt().getLength();
+                : rTextNd.GetText().getLength();
     }
     else
     {
@@ -273,10 +273,10 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
                 : 0;
     }
 
-    if( bNoColls && !rTxtNd.HasSwAttrSet() )
+    if( bNoColls && !rTextNd.HasSwAttrSet() )
         return ;
 
-    const SfxItemSet& rSet = rTxtNd.GetSwAttrSet();
+    const SfxItemSet& rSet = rTextNd.GetSwAttrSet();
 
     SfxItemIter aIter( aCmpSet );
     const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -333,7 +333,7 @@ lcl_IsAttributeIgnorable(sal_Int32 const nNdStart, sal_Int32 const nNdEnd,
             : ((rTmp.nEnd <= nNdStart) || (nNdEnd <= rTmp.nStt)));
 }
 
-bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr )
 {
     _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
 
@@ -354,7 +354,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
         if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
             return Found();
         pTmpItem = NULL;
-        pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( pSet )
         {
             pIter = new SfxWhichIter( *pSet );
@@ -486,7 +486,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
     return Found();
 }
 
-bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr )
 {
     _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
 
@@ -507,7 +507,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
         if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
             return Found();
 
-        pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( pSet )
         {
             pIter = new SfxWhichIter( *pSet );
@@ -693,12 +693,12 @@ bool SwAttrCheckArr::CheckStack()
     return nFound == aCmpSet.Count();
 }
 
-static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchForward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
                             SwPaM& rPam )
 {
     sal_Int32 nEndPos;
-    rCmpArr.SetNewSet( rTxtNd, rPam );
-    if( !rTxtNd.HasHints() )
+    rCmpArr.SetNewSet( rTextNd, rPam );
+    if( !rTextNd.HasHints() )
     {
         if( !rCmpArr.Found() )
             return false;
@@ -707,8 +707,8 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         return true;
     }
 
-    const SwpHints& rHtArr = rTxtNd.GetSwpHints();
-    const SwTxtAttr* pAttr;
+    const SwpHints& rHtArr = rTextNd.GetSwpHints();
+    const SwTextAttr* pAttr;
     size_t nPos = 0;
 
     // if everything is already there then check with which it will be ended
@@ -767,12 +767,12 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
     return true;
 }
 
-static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchBackward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
                             SwPaM& rPam )
 {
     sal_Int32 nEndPos;
-    rCmpArr.SetNewSet( rTxtNd, rPam );
-    if( !rTxtNd.HasHints() )
+    rCmpArr.SetNewSet( rTextNd, rPam );
+    if( !rTextNd.HasHints() )
     {
         if( !rCmpArr.Found() )
             return false;
@@ -781,8 +781,8 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
         return true;
     }
 
-    const SwpHints& rHtArr = rTxtNd.GetSwpHints();
-    const SwTxtAttr* pAttr;
+    const SwpHints& rHtArr = rTextNd.GetSwpHints();
+    const SwTextAttr* pAttr;
     size_t nPos = rHtArr.Count();
     sal_Int32 nSttPos;
 
@@ -845,7 +845,7 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
     return true;
 }
 
-static bool lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
+static bool lcl_Search( const SwContentNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
 {
     // search only hard attribution?
     if( bNoColls && !rCNd.HasSwAttrSet() )
@@ -893,20 +893,20 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     bool bFound = false;
     bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
-    SwCntntNode * pNode;
+    SwContentNode * pNode;
     const SfxPoolItem* pItem;
-    SwpFmts aFmtArr;
+    SwpFormats aFormatArr;
 
     // if at beginning/end then move it out of the node
     if( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetCntntNode();
+        SwContentNode *pNd = pPam->GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
@@ -914,11 +914,11 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     {
         if( bCharAttr )
         {
-            if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+            if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
                 continue;
 
-            if( pNode->GetTxtNode()->HasHints() &&
-                lcl_Search( *pNode->GetTxtNode(), *pPam, rAttr, fnMove,  bValue ))
+            if( pNode->GetTextNode()->HasHints() &&
+                lcl_Search( *pNode->GetTextNode(), *pPam, rAttr, fnMove,  bValue ))
             {
                 // set to the values of the attribute
                 SetMark();
@@ -934,10 +934,10 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
         // no hard attribution, so check if node was asked for this attr before
         if( !pNode->HasSwAttrSet() )
         {
-            SwFmt* pTmpFmt = pNode->GetFmtColl();
-            if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+            SwFormat* pTmpFormat = pNode->GetFormatColl();
+            if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
                 continue; // collection was requested earlier
-            aFmtArr.insert( pTmpFmt );
+            aFormatArr.insert( pTmpFormat );
         }
 
         if( SfxItemState::SET == pNode->GetSwAttrSet().GetItemState( nWhich,
@@ -961,7 +961,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     return bFound;
 }
 
-typedef bool (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& );
+typedef bool (*FnSearchAttr)( const SwTextNode&, SwAttrCheckArr&, SwPaM& );
 
 bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
                   const SwPaM *pRegion, bool bInReadOnly, bool bMoveFirst )
@@ -971,8 +971,8 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     bool bFound = false;
     bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
-    SwCntntNode * pNode;
-    SwpFmts aFmtArr;
+    SwContentNode * pNode;
+    SwpFormats aFormatArr;
 
     // check which text/char attributes are searched
     SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls );
@@ -987,14 +987,14 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     // if at beginning/end then move it out of the node
     if( bMoveFirst &&
         ( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() ) )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetCntntNode();
+        SwContentNode *pNd = pPam->GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
@@ -1002,12 +1002,12 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     {
         if( aCmpArr.Count() )
         {
-            if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+            if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
                 continue;
 
             if( (!aOtherSet.Count() ||
                 lcl_Search( *pNode, aOtherSet, bNoColls )) &&
-                (*fnSearch)( *pNode->GetTxtNode(), aCmpArr, *pPam ))
+                (*fnSearch)( *pNode->GetTextNode(), aCmpArr, *pPam ))
             {
                 // set to the values of the attribute
                 SetMark();
@@ -1025,10 +1025,10 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
         // no hard attribution, so check if node was asked for this attr before
         if( !pNode->HasSwAttrSet() )
         {
-            SwFmt* pTmpFmt = pNode->GetFmtColl();
-            if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+            SwFormat* pTmpFormat = pNode->GetFormatColl();
+            if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
                 continue; // collection was requested earlier
-            aFmtArr.insert( pTmpFmt );
+            aFormatArr.insert( pTmpFormat );
         }
 
         if( lcl_Search( *pNode, aOtherSet, bNoColls ))
@@ -1058,15 +1058,15 @@ struct SwFindParaAttr : public SwFindParas
     const SfxItemSet *pSet, *pReplSet;
     const SearchOptions *pSearchOpt;
     SwCursor& rCursor;
-    utl::TextSearch* pSTxt;
+    utl::TextSearch* pSText;
 
     SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
                     const SearchOptions* pOpt, const SfxItemSet* pRSet,
                     SwCursor& rCrsr )
         : bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
-          pSearchOpt( pOpt ), rCursor( rCrsr ),pSTxt( 0 ) {}
+          pSearchOpt( pOpt ), rCursor( rCrsr ),pSText( 0 ) {}
 
-    virtual ~SwFindParaAttr()   { delete pSTxt; }
+    virtual ~SwFindParaAttr()   { delete pSText; }
 
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -1076,11 +1076,11 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                           bool bInReadOnly )
 {
     // replace string (only if text given and search is not parameterized)?
-    bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
+    bool bReplaceText = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
                                     !pSet->Count() );
     bool bReplaceAttr = pReplSet && pReplSet->Count();
     bool bMoveFirst = !bReplaceAttr;
-    if( bInReadOnly && (bReplaceAttr || bReplaceTxt ))
+    if( bInReadOnly && (bReplaceAttr || bReplaceText ))
         bInReadOnly = false;
 
     // We search for attributes, should we search for text as well?
@@ -1107,7 +1107,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                 return FIND_NOT_FOUND;
 
             // then search in text of it
-            if( !pSTxt )
+            if( !pSText )
             {
                 SearchOptions aTmp( *pSearchOpt );
 
@@ -1117,14 +1117,14 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
 
                 aTmp.Locale = SvtSysLocale().GetLanguageTag().getLocale();
 
-                pSTxt = new utl::TextSearch( aTmp );
+                pSText = new utl::TextSearch( aTmp );
             }
 
             // TODO: searching for attributes in Outliner text?!
             bool bSearchInNotes = false;
 
             // continue search in correct section (pTextRegion)
-            if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
+            if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSText, fnMove, pTextRegion, bInReadOnly ) &&
                 *aSrchPam.GetMark() != *aSrchPam.GetPoint() )
                 break; // found
             else if( !pSet->Count() )
@@ -1138,7 +1138,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
         *pCrsr->GetMark() = *aSrchPam.GetMark();
     }
 
-    if( bReplaceTxt )
+    if( bReplaceText )
     {
         const bool bRegExp(
                 SearchAlgorithms_REGEXP == pSearchOpt->algorithmType);
@@ -1158,7 +1158,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
         rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr,
             (pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
             bRegExp );
-        rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+        rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
 
         if( bRegExp )
         {
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 62e9e799fb18..762e53309f18 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -28,45 +28,45 @@
 #include <comcore.hrc>
 
 /// parameters for a search for FormatCollections
-struct SwFindParaFmtColl : public SwFindParas
+struct SwFindParaFormatColl : public SwFindParas
 {
-    const SwTxtFmtColl *pFmtColl, *pReplColl;
+    const SwTextFormatColl *pFormatColl, *pReplColl;
     SwCursor& rCursor;
-    SwFindParaFmtColl( const SwTxtFmtColl& rFmtColl,
-                        const SwTxtFmtColl* pRpColl, SwCursor& rCrsr )
-        : pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr )
+    SwFindParaFormatColl( const SwTextFormatColl& rFormatColl,
+                        const SwTextFormatColl* pRpColl, SwCursor& rCrsr )
+        : pFormatColl( &rFormatColl ), pReplColl( pRpColl ), rCursor( rCrsr )
     {}
-    virtual ~SwFindParaFmtColl() {}
+    virtual ~SwFindParaFormatColl() {}
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
 };
 
-int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
+int SwFindParaFormatColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                              bool bInReadOnly )
 {
     int nRet = FIND_FOUND;
     if( bInReadOnly && pReplColl )
         bInReadOnly = false;
 
-    if( !pCrsr->Find( *pFmtColl, fnMove, pRegion, bInReadOnly ) )
+    if( !pCrsr->Find( *pFormatColl, fnMove, pRegion, bInReadOnly ) )
         nRet = FIND_NOT_FOUND;
     else if( pReplColl )
     {
-        pCrsr->GetDoc()->SetTxtFmtColl( *pCrsr, const_cast<SwTxtFmtColl*>(pReplColl) );
+        pCrsr->GetDoc()->SetTextFormatColl( *pCrsr, const_cast<SwTextFormatColl*>(pReplColl) );
         nRet = FIND_NO_RING;
     }
     return nRet;
 }
 
-bool SwFindParaFmtColl::IsReplaceMode() const
+bool SwFindParaFormatColl::IsReplaceMode() const
 {
     return 0 != pReplColl;
 }
 
 /// search for Format-Collections
-sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
+sal_uLong SwCursor::Find( const SwTextFormatColl& rFormatColl, SwDocPositions nStart,
                           SwDocPositions nEnd, bool& bCancel,
-                          FindRanges eFndRngs, const SwTxtFmtColl* pReplFmtColl )
+                          FindRanges eFndRngs, const SwTextFormatColl* pReplFormatColl )
 {
     // switch off OLE-notifications
     SwDoc* pDoc = GetDoc();
@@ -74,24 +74,24 @@ sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
     pDoc->SetOle2Link( Link<>() );
 
     bool const bStartUndo =
-        pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFmtColl;
+        pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFormatColl;
     if (bStartUndo)
     {
         SwRewriter aRewriter;
-        aRewriter.AddRule(UndoArg1, rFmtColl.GetName());
+        aRewriter.AddRule(UndoArg1, rFormatColl.GetName());
         aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS));
-        aRewriter.AddRule(UndoArg3, pReplFmtColl->GetName());
+        aRewriter.AddRule(UndoArg3, pReplFormatColl->GetName());
 
         pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE_STYLE,
                 &aRewriter );
     }
 
-    SwFindParaFmtColl aSwFindParaFmtColl( rFmtColl, pReplFmtColl, *this );
+    SwFindParaFormatColl aSwFindParaFormatColl( rFormatColl, pReplFormatColl, *this );
 
-    sal_uLong nRet = FindAll( aSwFindParaFmtColl, nStart, nEnd, eFndRngs, bCancel );
+    sal_uLong nRet = FindAll( aSwFindParaFormatColl, nStart, nEnd, eFndRngs, bCancel );
     pDoc->SetOle2Link( aLnk );
 
-    if( nRet && pReplFmtColl )
+    if( nRet && pReplFormatColl )
         pDoc->getIDocumentState().SetModified();
 
     if (bStartUndo)
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 8ffc5b307b06..e9e745514557 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -21,7 +21,7 @@
 #include <pamtyp.hxx>
 #include <boost/scoped_ptr.hpp>
 
-bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
+bool SwPaM::Find( const SwFormat& rFormat, SwMoveFn fnMove,
                   const SwPaM *pRegion, bool bInReadOnly  )
 {
     bool bFound = false;
@@ -30,24 +30,24 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
 
     // if at beginning/end then move it out of the node
     if( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetPoint()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = pPam->GetPoint()->nNode.GetNode().GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
     bool bFirst = true;
-    SwCntntNode* pNode;
+    SwContentNode* pNode;
     while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly )))
     {
-        if ( pNode->GetFmtColl() == &rFmt )
+        if ( pNode->GetFormatColl() == &rFormat )
         {
-            // if a FormatCollection is found then it is definitely a SwCntntNode
+            // if a FormatCollection is found then it is definitely a SwContentNode
 
             // FORWARD:  SPoint at the end, GetMark at the beginning of the node
             // BACKWARD: SPoint at the beginning, GetMark at the end of the node
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index ba7dcbdefe01..9a2a8a1e7060 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -51,10 +51,10 @@ using namespace ::com::sun::star;
 using namespace util;
 
 static OUString
-lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
+lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
              std::vector<sal_Int32> &rArr, bool const bRemoveSoftHyphen)
 {
-    OUStringBuffer buf(rNd.GetTxt());
+    OUStringBuffer buf(rNd.GetText());
     rArr.clear();
 
     const SwpHints *pHts = rNd.GetpSwpHints();
@@ -77,7 +77,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
         if ( bNewSoftHyphen )
         {
             nSoftHyphen = (bRemoveSoftHyphen)
-                    ?  rNd.GetTxt().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
+                    ?  rNd.GetText().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
                     : -1;
         }
 
@@ -115,7 +115,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
 
         if ( bNewHint )
         {
-            const SwTxtAttr* pHt = (*pHts)[n];
+            const SwTextAttr* pHt = (*pHts)[n];
             if ( pHt->HasDummyChar() && (nStt >= nStart) )
             {
                 switch( pHt->Which() )
@@ -139,7 +139,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
                         const bool bEmpty =
                             ( pHt->Which() != RES_TXTATR_FIELD
                               && pHt->Which() != RES_TXTATR_ANNOTATION )
-                            || (static_txtattr_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true).isEmpty());;
+                            || (static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true).isEmpty());;
                         if ( bEmpty && nStart == nAkt )
                         {
                             rArr.push_back( nAkt );
@@ -195,8 +195,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
         for (size_t i = 0; i < pHts->Count(); ++i )
         {
             aIndex++;
-            const SwTxtAttr* pTxtAttr = (*pHts)[i];
-            if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+            const SwTextAttr* pTextAttr = (*pHts)[i];
+            if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
             {
                 aCount--;
                 if (!aCount)
@@ -207,8 +207,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
     // throw away all following non postits
     for( size_t i = aIndex; i < pHts->Count(); ++i )
     {
-        const SwTxtAttr* pTxtAttr = (*pHts)[i];
-        if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+        const SwTextAttr* pTextAttr = (*pHts)[i];
+        if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
             break;
         else
             aIndex++;
@@ -216,7 +216,7 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
     return aIndex;
 }
 
-bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSTxt,
+bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSText,
                   SwMoveFn fnMove, const SwPaM * pRegion,
                   bool bInReadOnly )
 {
@@ -226,13 +226,13 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     SwPaM* pPam = MakeRegion( fnMove, pRegion );
     const bool bSrchForward = fnMove == fnMoveForward;
     SwNodeIndex& rNdIdx = pPam->GetPoint()->nNode;
-    SwIndex& rCntntIdx = pPam->GetPoint()->nContent;
+    SwIndex& rContentIdx = pPam->GetPoint()->nContent;
 
     // If bFound is true then the string was found and is between nStart and nEnd
     bool bFound = false;
     // start position in text or initial position
     bool bFirst = true;
-    SwCntntNode * pNode;
+    SwContentNode * pNode;
 
     const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType;
     const bool bChkEmptyPara = bRegSearch && 2 == rSearchOpt.searchString.getLength() &&
@@ -243,22 +243,22 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     // LanguageType eLastLang = 0;
     while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) ))
     {
-        if( pNode->IsTxtNode() )
+        if( pNode->IsTextNode() )
         {
-            SwTxtNode& rTxtNode = *pNode->GetTxtNode();
-            sal_Int32 nTxtLen = rTxtNode.GetTxt().getLength();
+            SwTextNode& rTextNode = *pNode->GetTextNode();
+            sal_Int32 nTextLen = rTextNode.GetText().getLength();
             sal_Int32 nEnd;
             if( rNdIdx == pPam->GetMark()->nNode )
                 nEnd = pPam->GetMark()->nContent.GetIndex();
             else
-                nEnd = bSrchForward ? nTxtLen : 0;
-            sal_Int32 nStart = rCntntIdx.GetIndex();
+                nEnd = bSrchForward ? nTextLen : 0;
+            sal_Int32 nStart = rContentIdx.GetIndex();
 
             /* #i80135# */
             // if there are SwPostItFields inside our current node text, we
             // split the text into separate pieces and search for text inside
             // the pieces as well as inside the fields
-            const SwpHints *pHts = rTxtNode.GetpSwpHints();
+            const SwpHints *pHts = rTextNode.GetpSwpHints();
 
             // count PostItFields by looping over all fields
             sal_Int32 aNumberPostits = 0;
@@ -272,10 +272,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
 
                 for( size_t i = 0; i < pHts->Count(); ++i )
                 {
-                    const SwTxtAttr* pTxtAttr = (*pHts)[i];
-                    if ( pTxtAttr->Which()==RES_TXTATR_ANNOTATION )
+                    const SwTextAttr* pTextAttr = (*pHts)[i];
+                    if ( pTextAttr->Which()==RES_TXTATR_ANNOTATION )
                     {
-                        const sal_Int32 aPos = pTxtAttr->GetStart();
+                        const sal_Int32 aPos = pTextAttr->GetStart();
                         if ( (aPos >= nStart) && (aPos <= nEnd) )
                             aNumberPostits++;
                         else
@@ -323,11 +323,11 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
 
             // If there are any shapes anchored to this node, search there.
             SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
-            aPaM.GetPoint()->nNode = rTxtNode;
-            aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTxtNode(), nStart);
+            aPaM.GetPoint()->nNode = rTextNode;
+            aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTextNode(), nStart);
             aPaM.SetMark();
-            aPaM.GetMark()->nNode = rTxtNode.GetIndex() + 1;
-            aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTxtNode(), 0);
+            aPaM.GetMark()->nNode = rTextNode.GetIndex() + 1;
+            aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTextNode(), 0);
             if (pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM, aSearchItem))
             {
                 bFound = true;
@@ -373,18 +373,18 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
                     {
                         nStartInside = aLoop==0 ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
                         nEndInside = aLoop==aNumberPostits ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
-                        nTxtLen = nEndInside - nStartInside;
+                        nTextLen = nEndInside - nStartInside;
                     }
                     else
                     {
                         nStartInside =  aLoop==aNumberPostits ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
                         nEndInside = aLoop==0 ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
-                        nTxtLen = nStartInside - nEndInside;
+                        nTextLen = nStartInside - nEndInside;
                     }
                     // search inside the text between a note
-                    bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+                    bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
                                        bRegSearch, bChkEmptyPara, bChkParaEnd,
-                                       nStartInside, nEndInside, nTxtLen, pNode,
+                                       nStartInside, nEndInside, nTextLen, pNode,
                                        pPam );
                     if ( bFound )
                         break;
@@ -393,9 +393,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
                         // we should now be right in front of a note, search inside
                         if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
                         {
-                            const SwTxtAttr* pTxtAttr = bSrchForward ?  (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
+                            const SwTextAttr* pTextAttr = bSrchForward ?  (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
                             if (pPostItMgr && pPostItMgr->SearchReplace(
-                                    static_txtattr_cast<SwTxtFld const*>(pTxtAttr)->GetFmtFld(),rSearchOpt,bSrchForward))
+                                    static_txtattr_cast<SwTextField const*>(pTextAttr)->GetFormatField(),rSearchOpt,bSrchForward))
                             {
                                 bFound = true ;
                                 break;
@@ -409,9 +409,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
             {
                 // if there is no SwPostItField inside or searching inside notes
                 // is disabled, we search the whole length just like before
-                bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+                bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
                                    bRegSearch, bChkEmptyPara, bChkParaEnd,
-                                   nStart, nEnd, nTxtLen, pNode, pPam );
+                                   nStart, nEnd, nTextLen, pNode, pPam );
             }
             if (bFound)
                 break;
@@ -421,10 +421,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     return bFound;
 }
 
-bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSText,
                       SwMoveFn fnMove, bool bSrchForward, bool bRegSearch,
                       bool bChkEmptyPara, bool bChkParaEnd,
-                      sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen,
+                      sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen,
                       SwNode* pNode, SwPaM* pPam)
 {
     bool bFound = false;
@@ -456,10 +456,10 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
     }
 
     if( bSrchForward )
-        sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nStart, nEnd,
+        sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nStart, nEnd,
                         aFltArr, bRemoveSoftHyphens);
     else
-        sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nEnd, nStart,
+        sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nEnd, nStart,
                         aFltArr, bRemoveSoftHyphens);
 
     SwScriptIterator* pScriptIter = 0;
@@ -488,7 +488,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
             if ( nSearchScript == nCurrScript )
             {
                 const LanguageType eCurrLang =
-                        pNode->GetTxtNode()->GetLang( bSrchForward ?
+                        pNode->GetTextNode()->GetLang( bSrchForward ?
                                                       nStart :
                                                       nEnd );
 
@@ -496,7 +496,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
                 {
                     const lang::Locale aLocale(
                             g_pBreakIt->GetLocale( eCurrLang ) );
-                    rSTxt.SetLocale( rSearchOpt, aLocale );
+                    rSText.SetLocale( rSearchOpt, aLocale );
                     eLastLang = eCurrLang;
                 }
             }
@@ -505,7 +505,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
         sal_Int32 nProxyStart = nStart;
         sal_Int32 nProxyEnd = nEnd;
         if( nSearchScript == nCurrScript &&
-                (rSTxt.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
+                (rSText.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
                 !(bZeroMatch = (nProxyStart == nProxyEnd)))
         {
             nStart = nProxyStart;
@@ -558,16 +558,16 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
 
     if ( bFound )
         return true;
-    else if( ( bChkEmptyPara && !nStart && !nTxtLen ) || bChkParaEnd)
+    else if( ( bChkEmptyPara && !nStart && !nTextLen ) || bChkParaEnd)
     {
         *GetPoint() = *pPam->GetPoint();
-        GetPoint()->nContent = bChkParaEnd ? nTxtLen : 0;
+        GetPoint()->nContent = bChkParaEnd ? nTextLen : 0;
         SetMark();
         /* FIXME: this condition does not work for !bSrchForward backward
          * search, it probably never did. (pSttNd != &rNdIdx.GetNode())
          * is never true in this case. */
         if( (bSrchForward || pSttNd != &rNdIdx.GetNode()) &&
-            Move( fnMoveForward, fnGoCntnt ) &&
+            Move( fnMoveForward, fnGoContent ) &&
             (!bSrchForward || pSttNd != &GetPoint()->nNode.GetNode()) &&
             1 == std::abs( (int)( GetPoint()->nNode.GetIndex() -
                              GetMark()->nNode.GetIndex()) ) )
@@ -586,12 +586,12 @@ struct SwFindParaText : public SwFindParas
 {
     const SearchOptions& rSearchOpt;
     SwCursor& rCursor;
-    utl::TextSearch aSTxt;
+    utl::TextSearch aSText;
     bool bReplace;
     bool bSearchInNotes;
 
     SwFindParaText( const SearchOptions& rOpt, bool bSearchNotes, bool bRepl, SwCursor& rCrsr )
-        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
+        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSText( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
     {}
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -608,7 +608,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
     if( bInReadOnly && bReplace )
         bInReadOnly = false;
 
-    const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
+    const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSText, fnMove, pRegion, bInReadOnly );
 
     if( bFnd && bReplace ) // replace string
     {
@@ -631,7 +631,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
                 *pCrsr,
                 (pRepl.get()) ? *pRepl : rSearchOpt.replaceString,
                 bRegExp );
-        rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+        rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
 
         if( bRegExp )
         {
@@ -649,7 +649,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
             bool bRet = ((fnMoveForward == fnMove) ? &GoNextPara : &GoPrevPara)
                 (*pCrsr, fnMove);
             (void) bRet;
-            assert(bRet); // if join failed, next node must be SwTxtNode
+            assert(bRet); // if join failed, next node must be SwTextNode
         }
         else
             pCrsr->Start()->nContent = nSttCnt;
@@ -702,18 +702,18 @@ OUString *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam )
     if( pPam && pPam->HasMark() &&
         SearchAlgorithms_REGEXP == rSearchOpt.algorithmType )
     {
-        const SwCntntNode* pTxtNode = pPam->GetCntntNode( true );
-        if( pTxtNode && pTxtNode->IsTxtNode() && pTxtNode == pPam->GetCntntNode( false ) )
+        const SwContentNode* pTextNode = pPam->GetContentNode( true );
+        if( pTextNode && pTextNode->IsTextNode() && pTextNode == pPam->GetContentNode( false ) )
         {
-            utl::TextSearch aSTxt( rSearchOpt );
-            const OUString& rStr = pTxtNode->GetTxtNode()->GetTxt();
+            utl::TextSearch aSText( rSearchOpt );
+            const OUString& rStr = pTextNode->GetTextNode()->GetText();
             sal_Int32 nStart = pPam->Start()->nContent.GetIndex();
             sal_Int32 nEnd = pPam->End()->nContent.GetIndex();
             SearchResult aResult;
-            if( aSTxt.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
+            if( aSText.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
             {
                 OUString aReplaceStr( rSearchOpt.replaceString );
-                aSTxt.ReplaceBackReferences( aReplaceStr, rStr, aResult );
+                aSText.ReplaceBackReferences( aReplaceStr, rStr, aResult );
                 pRet = new OUString( aReplaceStr );
             }
         }
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 95794338782f..a1cbabf2f112 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -44,27 +44,27 @@
 #include <xmloff/odffields.hxx>
 
 // for the dump "MSC-" compiler
-inline sal_Int32 GetSttOrEnd( bool bCondition, const SwCntntNode& rNd )
+inline sal_Int32 GetSttOrEnd( bool bCondition, const SwContentNode& rNd )
 {
     return bCondition ? 0 : rNd.Len();
 }
 
-SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rCntnt )
-    : nNode( rNodeIndex ), nContent( rCntnt )
+SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rContent )
+    : nNode( rNodeIndex ), nContent( rContent )
 {
 }
 
 SwPosition::SwPosition( const SwNodeIndex & rNodeIndex )
-    : nNode( rNodeIndex ), nContent( nNode.GetNode().GetCntntNode() )
+    : nNode( rNodeIndex ), nContent( nNode.GetNode().GetContentNode() )
 {
 }
 
 SwPosition::SwPosition( const SwNode& rNode )
-    : nNode( rNode ), nContent( nNode.GetNode().GetCntntNode() )
+    : nNode( rNode ), nContent( nNode.GetNode().GetContentNode() )
 {
 }
 
-SwPosition::SwPosition( SwCntntNode & rNode, const sal_Int32 nOffset )
+SwPosition::SwPosition( SwContentNode & rNode, const sal_Int32 nOffset )
     : nNode( rNode ), nContent( &rNode, nOffset )
 {
 }
@@ -279,22 +279,22 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
 
 bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
-    if( pNd->IsCntntNode() )
-        return static_cast<SwCntntNode*>(pNd)->GoNext( pIdx, nMode );
+    if( pNd->IsContentNode() )
+        return static_cast<SwContentNode*>(pNd)->GoNext( pIdx, nMode );
     return false;
 }
 
 bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
-    if( pNd->IsCntntNode() )
-        return static_cast<SwCntntNode*>(pNd)->GoPrevious( pIdx, nMode );
+    if( pNd->IsContentNode() )
+        return static_cast<SwContentNode*>(pNd)->GoPrevious( pIdx, nMode );
     return false;
 }
 
-SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
+SwContentNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
-    SwCntntNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
+    SwContentNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
     if( pNd )
     {
         if( bChk && 1 != aIdx.GetIndex() - pIdx->GetIndex() &&
@@ -306,10 +306,10 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
     return pNd;
 }
 
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
+SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
-    SwCntntNode* pNd = SwNodes::GoPrevious( &aIdx );
+    SwContentNode* pNd = SwNodes::GoPrevious( &aIdx );
     if( pNd )
     {
         if( bChk && 1 != pIdx->GetIndex() - aIdx.GetIndex() &&
@@ -358,8 +358,8 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex& rPoint,
     {
         m_pPoint->nNode += nPointOffset;
     }
-    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
-    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
 }
 
 SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
@@ -379,12 +379,12 @@ SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
     {
         m_pPoint->nNode += nPointOffset;
     }
-    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
-    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
-              const SwNodeIndex& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkContent,
+              const SwNodeIndex& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -392,12 +392,12 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( rPoint.GetNode().GetCntntNode(), nPointCntnt);
-    m_pMark ->nContent.Assign( rMark .GetNode().GetCntntNode(), nMarkCntnt );
+    m_pPoint->nContent.Assign( rPoint.GetNode().GetContentNode(), nPointContent);
+    m_pMark ->nContent.Assign( rMark .GetNode().GetContentNode(), nMarkContent );
 }
 
-SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
-              const SwNode& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkContent,
+              const SwNode& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -405,13 +405,13 @@ SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
-        nPointCntnt);
-    m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetCntntNode(),
-        nMarkCntnt );
+    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+        nPointContent);
+    m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetContentNode(),
+        nMarkContent );
 }
 
-SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNode )
     , m_Bound2( m_Bound1.nNode.GetNode().GetNodes() ) // default initialize
@@ -419,11 +419,11 @@ SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
-        nCntnt );
+    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+        nContent );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNodeIdx )
     , m_Bound2( rNodeIdx.GetNode().GetNodes() ) // default initialize
@@ -431,7 +431,7 @@ SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetCntntNode(), nCntnt );
+    m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetContentNode(), nContent );
 }
 
 SwPaM::~SwPaM() {}
@@ -543,12 +543,12 @@ SwPaM & SwPaM::Normalize(bool bPointFirst)
 /// return page number at cursor (for reader and page bound frames)
 sal_uInt16 SwPaM::GetPageNum( bool bAtPoint, const Point* pLayPos )
 {
-    const SwCntntFrm* pCFrm;
+    const SwContentFrm* pCFrm;
     const SwPageFrm *pPg;
-    const SwCntntNode *pNd ;
+    const SwContentNode *pNd ;
     const SwPosition* pPos = bAtPoint ? m_pPoint : m_pMark;
 
-    if( 0 != ( pNd = pPos->nNode.GetNode().GetCntntNode() ) &&
+    if( 0 != ( pNd = pPos->nNode.GetNode().GetContentNode() ) &&
         0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), pLayPos, pPos, false )) &&
         0 != ( pPg = pCFrm->FindPageFrm() ))
         return pPg->GetPhyPageNum();
@@ -564,9 +564,9 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
     const SwSectionFrm* pSectionFrm;
 
     if( rFrm.IsInFly() &&
-       (pFly = rFrm.FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+       (pFly = rFrm.FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
         pFly->Lower() &&
-       !pFly->Lower()->IsNoTxtFrm() )
+       !pFly->Lower()->IsNoTextFrm() )
     {
        pRet = pFly;
     }
@@ -585,8 +585,8 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 {
     bool bRet = false;
 
-    const SwCntntNode* pNd = GetPoint()->nNode.GetNode().GetCntntNode();
-    const SwCntntFrm *pFrm = NULL;
+    const SwContentNode* pNd = GetPoint()->nNode.GetNode().GetContentNode();
+    const SwContentFrm *pFrm = NULL;
     if ( pNd != NULL )
     {
         Point aTmpPt;
@@ -618,7 +618,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
          && HasMark()
          && GetPoint()->nNode != GetMark()->nNode )
     {
-        pNd = GetMark()->nNode.GetNode().GetCntntNode();
+        pNd = GetMark()->nNode.GetNode().GetContentNode();
         pFrm = NULL;
         if ( pNd != NULL )
         {
@@ -668,20 +668,20 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 
             // If a protected section should be between nodes, then the
             // selection needs to contain already x nodes.
-            // (TxtNd, SectNd, TxtNd, EndNd, TxtNd )
+            // (TextNd, SectNd, TextNd, EndNd, TextNd )
             if( nSttIdx + 3 < nEndIdx )
             {
-                const SwSectionFmts& rFmts = GetDoc()->GetSections();
-                for( SwSectionFmts::size_type n = rFmts.size(); n;  )
+                const SwSectionFormats& rFormats = GetDoc()->GetSections();
+                for( SwSectionFormats::size_type n = rFormats.size(); n;  )
                 {
-                    const SwSectionFmt* pFmt = rFmts[ --n ];
-                    if( pFmt->GetProtect().IsCntntProtected() )
+                    const SwSectionFormat* pFormat = rFormats[ --n ];
+                    if( pFormat->GetProtect().IsContentProtected() )
                     {
-                        const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
-                        OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the SectionNode?" );
-                        sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+                        const SwFormatContent& rContent = pFormat->GetContent(false);
+                        OSL_ENSURE( rContent.GetContentIdx(), "where is the SectionNode?" );
+                        sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
                         if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
-                            rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
+                            rContent.GetContentIdx()->GetNode().GetNodes().IsDocNodes() )
                         {
                             bRet = true;
                             break;
@@ -729,7 +729,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
     // the 'comment anchor', unless the cursor is inside the annotation.
     if (!bRet && !bAnnotationMode)
     {
-        if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTxtNode() && GetPoint()->nContent.GetIndex() > 0)
+        if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTextNode() && GetPoint()->nContent.GetIndex() > 0)
         {
             // getFieldmarkFor() searches for >= start and < end, so check for
             // the previous character, to also get the fieldmark, if we're
@@ -749,25 +749,25 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 /// left or the next is out of the area, then a null-pointer is returned.
 /// @param rbFirst If <true> than first time request. If so than the position of
 ///        the PaM must not be changed!
-SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
+SwContentNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
                       bool bInReadOnly )
 {
-    SwCntntNode * pNd = 0;
-    SwCntntFrm* pFrm;
+    SwContentNode * pNd = 0;
+    SwContentFrm* pFrm;
     if( ((*rPam.GetPoint()).*fnMove->fnCmpOp)( *rPam.GetMark() ) ||
         ( *rPam.GetPoint() == *rPam.GetMark() && rbFirst ) )
     {
         if( rbFirst )
         {
             rbFirst = false;
-            pNd = rPam.GetCntntNode();
+            pNd = rPam.GetContentNode();
             if( pNd )
             {
                 if(
                     (
                         0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
                         ( !bInReadOnly && pFrm->IsProtected() ) ||
-                        (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow())
+                        (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow())
                     ) ||
                     ( !bInReadOnly && pNd->FindSectionNode() &&
                         pNd->FindSectionNode()->GetSection().IsProtect()
@@ -779,13 +779,13 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
             }
         }
 
-        if( !pNd ) // is the cursor not on a CntntNode?
+        if( !pNd ) // is the cursor not on a ContentNode?
         {
             SwPosition aPos( *rPam.GetPoint() );
             bool bSrchForward = fnMove == fnMoveForward;
             SwNodes& rNodes = aPos.nNode.GetNodes();
 
-            // go to next/previous CntntNode
+            // go to next/previous ContentNode
             while( true )
             {
                 pNd = bSrchForward
@@ -800,8 +800,8 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
                         // only in AutoTextSection can be nodes that are hidden
                         if( 0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
                             ( !bInReadOnly && pFrm->IsProtected() ) ||
-                            ( pFrm->IsTxtFrm() &&
-                                static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() ) )
+                            ( pFrm->IsTextFrm() &&
+                                static_cast<SwTextFrm*>(pFrm)->IsHiddenNow() ) )
                         {
                             pNd = 0;
                             continue;
@@ -824,7 +824,7 @@ void GoStartDoc( SwPosition * pPos )
     SwNodes& rNodes = pPos->nNode.GetNodes();
     pPos->nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
     // we always need to find a ContentNode!
-    SwCntntNode* pCNd = rNodes.GoNext( &pPos->nNode );
+    SwContentNode* pCNd = rNodes.GoNext( &pPos->nNode );
     if( pCNd )
         pCNd->MakeStartIndex( &pPos->nContent );
 }
@@ -833,7 +833,7 @@ void GoEndDoc( SwPosition * pPos )
 {
     SwNodes& rNodes = pPos->nNode.GetNodes();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = GoPreviousNds( &pPos->nNode, true );
+    SwContentNode* pCNd = GoPreviousNds( &pPos->nNode, true );
     if( pCNd )
         pCNd->MakeEndIndex( &pPos->nContent );
 }
@@ -847,8 +847,8 @@ void GoStartSection( SwPosition * pPos )
         nLevel--;
     do { SwNodes::GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
 
-    // already on a CntntNode
-    pPos->nNode.GetNode().GetCntntNode()->MakeStartIndex( &pPos->nContent );
+    // already on a ContentNode
+    pPos->nNode.GetNode().GetContentNode()->MakeStartIndex( &pPos->nContent );
 }
 
 /// go to the end of the current base section
@@ -861,9 +861,9 @@ void GoEndSection( SwPosition * pPos )
         nLevel--;
     do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
 
-    // now on a EndNode, thus to the previous CntntNode
+    // now on a EndNode, thus to the previous ContentNode
     if( GoPreviousNds( &pPos->nNode, true ) )
-        pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
+        pPos->nNode.GetNode().GetContentNode()->MakeEndIndex( &pPos->nContent );
 }
 
 bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
@@ -880,14 +880,14 @@ bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
 
 bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
 {
-    SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
+    SwContentNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
     if( pNd )
         rPam.GetPoint()->nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
     return pNd;
 }
 
-bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContent( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                         &rPam.GetPoint()->nContent, CRSR_SKIP_CHARS ))
@@ -895,7 +895,7 @@ bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCells( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                          &rPam.GetPoint()->nContent, CRSR_SKIP_CELLS ))
@@ -903,7 +903,7 @@ bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                         &rPam.GetPoint()->nContent, CRSR_SKIP_CHARS | CRSR_SKIP_HIDDEN ) )
@@ -911,7 +911,7 @@ bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                          &rPam.GetPoint()->nContent, CRSR_SKIP_CELLS | CRSR_SKIP_HIDDEN ) )
@@ -923,9 +923,9 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveBackward, fnGoNode ) )
     {
-        // always on a CntntNode
+        // always on a ContentNode
         SwPosition& rPos = *rPam.GetPoint();
-        SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+        SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
         rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
         return true;
@@ -936,7 +936,7 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
 bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     SwPosition& rPos = *rPam.GetPoint();
-    SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
     if( pNd )
     {
         const sal_Int32 nOld = rPos.nContent.GetIndex();
@@ -948,7 +948,7 @@ bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
             return true;
         }
     }
-    // move node to next/previous CntntNode
+    // move node to next/previous ContentNode
     if( ( aPosPara==fnParaStart && 0 != ( pNd =
             GoPreviousNds( &rPos.nNode, true ))) ||
         ( aPosPara==fnParaEnd && 0 != ( pNd =
@@ -965,9 +965,9 @@ bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveForward, fnGoNode ) )
     {
-        // always on a CntntNode
+        // always on a ContentNode
         SwPosition& rPos = *rPam.GetPoint();
-        SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+        SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
         rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
         return true;
@@ -980,8 +980,8 @@ bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd;
-    if( 0 == ( pNd = rPos.nNode.GetNode().GetCntntNode()) &&
+    SwContentNode *pNd;
+    if( 0 == ( pNd = rPos.nNode.GetNode().GetContentNode()) &&
         0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, true )) )
     {
         rPos = aSavePos; // do not change cursor
@@ -999,14 +999,14 @@ bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition aSavePos( rPos ); // position for comparison
     SwNodes::GoEndOfSection( &rPos.nNode );
 
-    // no other CntntNode existent?
-    if( !GoInCntnt( rPam, fnMoveForward ) )
+    // no other ContentNode existent?
+    if( !GoInContent( rPam, fnMoveForward ) )
     {
         rPos = aSavePos; // do not change cursor
         return false;
     }
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
     rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
     return true;
@@ -1018,20 +1018,20 @@ bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition aSavePos( rPos ); // position for comparison
     SwNodes::GoStartOfSection( &rPos.nNode );
 
-    // no further CntntNode existent?
-    if( !GoInCntnt( rPam, fnMoveBackward ))
+    // no further ContentNode existent?
+    if( !GoInContent( rPam, fnMoveBackward ))
     {
         rPos = aSavePos; // do not change cursor
         return false;
     }
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
     rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ));
     return true;
 }
 
-OUString SwPaM::GetTxt() const
+OUString SwPaM::GetText() const
 {
     OUString aResult;
 
@@ -1044,11 +1044,11 @@ OUString SwPaM::GetTxt() const
     for (;;)
     {
         const bool bIsEndNode = aNodeIndex == End()->nNode;
-        SwTxtNode * pTxtNode = aNodeIndex.GetNode().GetTxtNode();
+        SwTextNode * pTextNode = aNodeIndex.GetNode().GetTextNode();
 
-        if (pTxtNode != NULL)
+        if (pTextNode != NULL)
         {
-            const OUString aTmpStr = pTxtNode->GetTxt();
+            const OUString aTmpStr = pTextNode->GetText();
 
             if (bIsStartNode || bIsEndNode)
             {
@@ -1083,13 +1083,13 @@ OUString SwPaM::GetTxt() const
 void SwPaM::InvalidatePaM()
 {
     const SwNode &_pNd = this->GetNode();
-    const SwTxtNode *_pTxtNd = _pNd.GetTxtNode();
-    if (_pTxtNd != NULL)
+    const SwTextNode *_pTextNd = _pNd.GetTextNode();
+    if (_pTextNd != NULL)
     {
         // pretend that the PaM marks inserted text to recalc the portion...
-        SwInsTxt aHint( Start()->nContent.GetIndex(),
+        SwInsText aHint( Start()->nContent.GetIndex(),
                         End()->nContent.GetIndex() - Start()->nContent.GetIndex() + 1 );
-        SwModify *_pModify=(SwModify*)_pTxtNd;
+        SwModify *_pModify=(SwModify*)_pTextNd;
         _pModify->ModifyNotification( 0, &aHint);
     }
 }
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 4069a1225ce9..479fa12745d4 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -28,7 +28,7 @@ static SwMoveFnCollection aFwrd = {
     /* fnDoc        */  &GoEndDoc,
     /* fnSections   */  &GoEndSection,
     /* fnCmpOp      */  &SwPosition::operator<,
-    /* fnGetHint    */  &GetFrwrdTxtHint,
+    /* fnGetHint    */  &GetFrwrdTextHint,
     /* fnSearch     */  &utl::TextSearch::SearchForward,
     /* fnSection    */  &SwNodes::GoStartOfSection
 };
@@ -39,7 +39,7 @@ static SwMoveFnCollection aBwrd = {
     /* fnDoc        */  &GoStartDoc,
     /* fnSections   */  &GoStartSection,
     /* fnCmpOp      */  &SwPosition::operator>,
-    /* fnGetHint    */  &GetBkwrdTxtHint,
+    /* fnGetHint    */  &GetBkwrdTextHint,
     /* fnSearch     */  &utl::TextSearch::SearchBackward,
     /* fnSection    */  &SwNodes::GoEndOfSection
 };
@@ -47,10 +47,10 @@ static SwMoveFnCollection aBwrd = {
 SwGoInDoc fnGoDoc       = &GoInDoc;
 SwGoInDoc fnGoSection   = &GoInSection;
 SwGoInDoc fnGoNode      = &GoInNode;
-SwGoInDoc fnGoCntnt     = &GoInCntnt;
-SwGoInDoc fnGoCntntCells = &GoInCntntCells;
-SwGoInDoc fnGoCntntSkipHidden      = &GoInCntntSkipHidden;
-SwGoInDoc fnGoCntntCellsSkipHidden = &GoInCntntCellsSkipHidden;
+SwGoInDoc fnGoContent     = &GoInContent;
+SwGoInDoc fnGoContentCells = &GoInContentCells;
+SwGoInDoc fnGoContentSkipHidden      = &GoInContentSkipHidden;
+SwGoInDoc fnGoContentCellsSkipHidden = &GoInContentCellsSkipHidden;
 
 SwWhichPara fnParaPrev  = &GoPrevPara;
 SwWhichPara fnParaCurr  = &GoCurrPara;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 1df0894774ed..9baa90101297 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -187,7 +187,7 @@ _SwCursor_SavePos* SwCursor::CreateNewSavePos() const
 }
 
 /// determine if point is outside of the node-array's content area
-bool SwCursor::IsNoCntnt() const
+bool SwCursor::IsNoContent() const
 {
     return GetPoint()->nNode.GetIndex() <
             GetDoc()->GetNodes().GetEndOfExtras().GetIndex();
@@ -210,7 +210,7 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
         if( !CheckNodesRange( aOldPos, GetPoint()->nNode, true ))
         {
             GetPoint()->nNode = aOldPos;
-            GetPoint()->nContent.Assign( GetCntntNode(), GetSavePos()->nCntnt );
+            GetPoint()->nContent.Assign( GetContentNode(), GetSavePos()->nContent );
             return true;
         }
     }
@@ -219,12 +219,12 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
 
 namespace
 {
-    const SwTxtAttr* InputFieldAtPos(SwPosition *pPos)
+    const SwTextAttr* InputFieldAtPos(SwPosition *pPos)
     {
-        SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        if (!pTxtNd)
+        SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+        if (!pTextNd)
             return NULL;
-        return pTxtNd->GetTxtAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTxtNode::PARENT);
+        return pTextNd->GetTextAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTextNode::PARENT);
     }
 }
 
@@ -261,9 +261,9 @@ bool SwCursor::IsSelOvr( int eFlags )
 
             // set cursor to new position:
             SwNodeIndex aIdx( rPtIdx );
-            sal_Int32 nCntntPos = m_pSavePos->nCntnt;
+            sal_Int32 nContentPos = m_pSavePos->nContent;
             bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
-            SwCntntNode* pCNd = bGoNxt
+            SwContentNode* pCNd = bGoNxt
                 ? rNds.GoNextSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections)
                 : SwNodes::GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
             if( !pCNd && ( nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION & eFlags ))
@@ -279,12 +279,12 @@ bool SwCursor::IsSelOvr( int eFlags )
             if( !bValidNodesRange )
             {
                 rPtIdx = m_pSavePos->nNode;
-                if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+                if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
                 {
                     bIsValidPos = false;
-                    nCntntPos = 0;
+                    nContentPos = 0;
                     rPtIdx = aIdx;
-                    if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+                    if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
                     {
                         // then to the beginning of the document
                         rPtIdx = rNds.GetEndOfExtras();
@@ -294,7 +294,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             }
 
             // register ContentIndex:
-            const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nCntntPos;
+            const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nContentPos;
             GetPoint()->nContent.Assign( pCNd, nTmpPos );
             if( !bIsValidPos || !bValidNodesRange ||
                 IsInProtectTable( true ) )
@@ -313,20 +313,20 @@ bool SwCursor::IsSelOvr( int eFlags )
                 nEndIdx = nTmp;
             }
 
-            const SwSectionFmts& rFmts = pDoc->GetSections();
-            for( SwSectionFmts::size_type n = 0; n < rFmts.size(); ++n )
+            const SwSectionFormats& rFormats = pDoc->GetSections();
+            for( SwSectionFormats::size_type n = 0; n < rFormats.size(); ++n )
             {
-                const SwSectionFmt* pFmt = rFmts[n];
-                const SvxProtectItem& rProtect = pFmt->GetProtect();
-                if( rProtect.IsCntntProtected() )
+                const SwSectionFormat* pFormat = rFormats[n];
+                const SvxProtectItem& rProtect = pFormat->GetProtect();
+                if( rProtect.IsContentProtected() )
                 {
-                    const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
-                    OSL_ENSURE( rCntnt.GetCntntIdx(), "No SectionNode?" );
-                    sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+                    const SwFormatContent& rContent = pFormat->GetContent(false);
+                    OSL_ENSURE( rContent.GetContentIdx(), "No SectionNode?" );
+                    sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
                     if( nSttIdx <= nIdx && nEndIdx >= nIdx )
                     {
                         // if it is no linked section then we cannot select it
-                        const SwSection& rSect = *pFmt->GetSection();
+                        const SwSection& rSect = *pFormat->GetSection();
                         if( CONTENT_SECTION == rSect.GetType() )
                         {
                             RestoreSavePos();
@@ -339,9 +339,9 @@ bool SwCursor::IsSelOvr( int eFlags )
     }
 
     const SwNode* pNd = &GetPoint()->nNode.GetNode();
-    if( pNd->IsCntntNode() && !dynamic_cast<SwUnoCrsr*>(this) )
+    if( pNd->IsContentNode() && !dynamic_cast<SwUnoCrsr*>(this) )
     {
-        const SwCntntFrm* pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+        const SwContentFrm* pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
         if ( (nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags)   //allowed to change position if it's a bad one
             && pFrm && pFrm->IsValid() && !pFrm->Frm().Height()     //a bad zero height position
             && !InputFieldAtPos(GetPoint()) )                       //unless it's a (vertical) input field
@@ -349,7 +349,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             // skip to the next/prev valid paragraph with a layout
             SwNodeIndex& rPtIdx = GetPoint()->nNode;
             bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
-            while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() : pFrm->GetPrevCntntFrm() ))
+            while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextContentFrm() : pFrm->GetPrevContentFrm() ))
                    && 0 == pFrm->Frm().Height() )
                 ;
 
@@ -358,18 +358,18 @@ bool SwCursor::IsSelOvr( int eFlags )
             if( !pFrm )
             {
                 bGoNxt = !bGoNxt;
-                pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+                pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
                 while ( pFrm && 0 == pFrm->Frm().Height() )
                 {
-                    pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
-                        :   pFrm->GetPrevCntntFrm();
+                    pFrm = bGoNxt ? pFrm->GetNextContentFrm()
+                        :   pFrm->GetPrevContentFrm();
                 }
             }
 
-            SwCntntNode* pCNd = (pFrm != NULL) ? const_cast<SwCntntNode*>(pFrm->GetNode()) : NULL;
+            SwContentNode* pCNd = (pFrm != NULL) ? const_cast<SwContentNode*>(pFrm->GetNode()) : NULL;
             if ( pCNd != NULL )
             {
-                // set this CntntNode as new position
+                // set this ContentNode as new position
                 rPtIdx = *pCNd;
 
                 // assign corresponding ContentIndex
@@ -377,7 +377,7 @@ bool SwCursor::IsSelOvr( int eFlags )
                 GetPoint()->nContent.Assign( pCNd, nTmpPos );
 
                 if (rPtIdx.GetIndex() == m_pSavePos->nNode
-                    && nTmpPos == m_pSavePos->nCntnt)
+                    && nTmpPos == m_pSavePos->nContent)
                 {
                     // new position equals saved one
                     // --> trigger restore of saved pos by setting <pFrm> to NULL - see below
@@ -420,8 +420,8 @@ bool SwCursor::IsSelOvr( int eFlags )
         return true; // we need a frame
     }
 
-    if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode()
-        && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
+    if( (pNd = &GetMark()->nNode.GetNode())->IsContentNode()
+        && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
         && !dynamic_cast<SwUnoCrsr*>(this) )
     {
         DeleteMark();
@@ -431,10 +431,10 @@ bool SwCursor::IsSelOvr( int eFlags )
 
     // ensure that selection is only inside an InputField or contains the InputField completely
     {
-        const SwTxtAttr* pInputFldTxtAttrAtPoint = InputFieldAtPos(GetPoint());
-        const SwTxtAttr* pInputFldTxtAttrAtMark = InputFieldAtPos(GetMark());
+        const SwTextAttr* pInputFieldTextAttrAtPoint = InputFieldAtPos(GetPoint());
+        const SwTextAttr* pInputFieldTextAttrAtMark = InputFieldAtPos(GetMark());
 
-        if ( pInputFldTxtAttrAtPoint != pInputFldTxtAttrAtMark )
+        if ( pInputFieldTextAttrAtPoint != pInputFieldTextAttrAtMark )
         {
             const sal_uLong nRefNodeIdx =
                 ( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
@@ -442,27 +442,27 @@ bool SwCursor::IsSelOvr( int eFlags )
                 : GetMark()->nNode.GetIndex();
             const sal_Int32 nRefContentIdx =
                 ( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
-                ? m_pSavePos->nCntnt
+                ? m_pSavePos->nContent
                 : GetMark()->nContent.GetIndex();
             const bool bIsForwardSelection =
                 nRefNodeIdx < GetPoint()->nNode.GetIndex()
                 || ( nRefNodeIdx == GetPoint()->nNode.GetIndex()
                      && nRefContentIdx < GetPoint()->nContent.GetIndex() );
 
-            if ( pInputFldTxtAttrAtPoint != NULL )
+            if ( pInputFieldTextAttrAtPoint != NULL )
             {
                 const sal_Int32 nNewPointPos =
-                    bIsForwardSelection ? *(pInputFldTxtAttrAtPoint->End()) : pInputFldTxtAttrAtPoint->GetStart();
-                SwTxtNode* pTxtNdAtPoint = GetPoint()->nNode.GetNode().GetTxtNode();
-                GetPoint()->nContent.Assign( pTxtNdAtPoint, nNewPointPos );
+                    bIsForwardSelection ? *(pInputFieldTextAttrAtPoint->End()) : pInputFieldTextAttrAtPoint->GetStart();
+                SwTextNode* pTextNdAtPoint = GetPoint()->nNode.GetNode().GetTextNode();
+                GetPoint()->nContent.Assign( pTextNdAtPoint, nNewPointPos );
             }
 
-            if ( pInputFldTxtAttrAtMark != NULL )
+            if ( pInputFieldTextAttrAtMark != NULL )
             {
                 const sal_Int32 nNewMarkPos =
-                    bIsForwardSelection ? pInputFldTxtAttrAtMark->GetStart() : *(pInputFldTxtAttrAtMark->End());
-                SwTxtNode* pTxtNdAtMark = GetMark()->nNode.GetNode().GetTxtNode();
-                GetMark()->nContent.Assign( pTxtNdAtMark, nNewMarkPos );
+                    bIsForwardSelection ? pInputFieldTextAttrAtMark->GetStart() : *(pInputFieldTextAttrAtMark->End());
+                SwTextNode* pTextNdAtMark = GetMark()->nNode.GetNode().GetTextNode();
+                GetMark()->nContent.Assign( pTextNdAtMark, nNewMarkPos );
             }
         }
     }
@@ -492,12 +492,12 @@ bool SwCursor::IsSelOvr( int eFlags )
 
         do { // loop for table after table
             sal_uLong nSEIdx = pPtNd->EndOfSectionIndex();
-            sal_uLong nSttEndTbl = nSEIdx + 1;
+            sal_uLong nSttEndTable = nSEIdx + 1;
 
             if( bSelTop )
-                nSttEndTbl = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
+                nSttEndTable = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
 
-            GetPoint()->nNode = nSttEndTbl;
+            GetPoint()->nNode = nSttEndTable;
             const SwNode* pMyNd = &(GetNode());
 
             if( pMyNd->IsSectionNode() || ( pMyNd->IsEndNode() &&
@@ -516,7 +516,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             }
 
             // we permit these
-            if( pMyNd->IsCntntNode() &&
+            if( pMyNd->IsContentNode() &&
                 ::CheckNodesRange( GetMark()->nNode,
                 GetPoint()->nNode, true ))
             {
@@ -526,7 +526,7 @@ bool SwCursor::IsSelOvr( int eFlags )
                     pMyNd = pOuterTableNd;
                 else
                 {
-                    SwCntntNode* pCNd = const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMyNd));
+                    SwContentNode* pCNd = const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pMyNd));
                     GetPoint()->nContent.Assign( pCNd, bSelTop ? pCNd->Len() : 0 );
                     return false;
                 }
@@ -545,7 +545,7 @@ bool SwCursor::IsSelOvr( int eFlags )
 
 bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
 {
-    SwCntntNode* pCNd = GetCntntNode();
+    SwContentNode* pCNd = GetContentNode();
     if( !pCNd )
         return false;
 
@@ -562,7 +562,7 @@ bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
     bool bInCoveredCell = false;
     const SwStartNode* pTmpSttNode = pCNd->FindTableBoxStartNode();
     OSL_ENSURE( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" );
-    const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTblBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
+    const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTableBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
     if ( pBox && pBox->getRowSpan() < 1 ) // Robust #151270
         bInCoveredCell = true;
 
@@ -602,7 +602,7 @@ GoNextCell:
             if( !aCellStt.GetNode().IsStartNode() )
                 break;
             ++aCellStt;
-            if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+            if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
                 pCNd = aCellStt.GetNodes().GoNext( &aCellStt );
             if( !( bProt = pCNd->IsProtect() ))
                 break;
@@ -613,7 +613,7 @@ SetNextCrsr:
         if( !bProt ) // found free cell
         {
             GetPoint()->nNode = aCellStt;
-            SwCntntNode* pTmpCNd = GetCntntNode();
+            SwContentNode* pTmpCNd = GetContentNode();
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -651,7 +651,7 @@ GoPrevCell:
             if( !( pNd = &aCellStt.GetNode())->IsEndNode() )
                 break;
             aCellStt.Assign( *pNd->StartOfSectionNode(), +1 );
-            if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+            if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
                 pCNd = pNd->GetNodes().GoNext( &aCellStt );
             if( !( bProt = pCNd->IsProtect() ))
                 break;
@@ -662,7 +662,7 @@ SetPrevCrsr:
         if( !bProt ) // found free cell
         {
             GetPoint()->nNode = aCellStt;
-            SwCntntNode* pTmpCNd = GetCntntNode();
+            SwContentNode* pTmpCNd = GetContentNode();
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -695,7 +695,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
     const SwPosition* pPos = bPoint ? GetPoint() : GetMark();
     const SwNode* pNd = &pPos->nNode.GetNode();
 
-    if( pNd->IsCntntNode() && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+    if( pNd->IsContentNode() && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
         !dynamic_cast<const SwUnoCrsr*>(this) )
     {
         return false;
@@ -717,7 +717,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
     return true;
 }
 
-void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
+void SwCursor::SaveTableBoxContent( const SwPosition* ) {}
 
 /// set range for search in document
 SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
@@ -867,7 +867,7 @@ static bool lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 
     SwNodes& rNds = rPam.GetDoc()->GetNodes();
     rPam.DeleteMark();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( !bFirst )
     {
         rPam.GetPoint()->nNode = rSttNd;
@@ -899,7 +899,7 @@ static bool lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 
     SwNodes& rNds = rPam.GetDoc()->GetNodes();
     rPam.DeleteMark();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( !bFirst )
     {
         rPam.GetPoint()->nNode = rSttNd;
@@ -1081,7 +1081,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
 void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
 {
     bool bIsStart = true;
-    SwCntntNode* pCNd = 0;
+    SwContentNode* pCNd = 0;
     SwNodes& rNds = GetDoc()->GetNodes();
 
     switch( ePos )
@@ -1162,13 +1162,13 @@ bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
 bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         bRet = g_pBreakIt->GetBreakIter()->isBeginWord(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos )),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos )),
                             nWordType );
     }
     return bRet;
@@ -1177,13 +1177,13 @@ bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         bRet = g_pBreakIt->GetBreakIter()->isEndWord(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType );
 
     }
@@ -1193,13 +1193,13 @@ bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         Boundary aBoundary = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             true );
 
@@ -1209,7 +1209,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
         if(bRet)
         {
             const CharClass& rCC = GetAppCharClass();
-            bRet = rCC.isLetterNumeric( pTxtNd->GetTxt(), aBoundary.startPos );
+            bRet = rCC.isLetterNumeric( pTextNd->GetText(), aBoundary.startPos );
         }
     }
     return bRet;
@@ -1218,7 +1218,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsStartEndSentence( bool bEnd ) const
 {
     bool bRet = bEnd ?
-                    GetCntntNode() && GetPoint()->nContent == GetCntntNode()->Len() :
+                    GetContentNode() && GetPoint()->nContent == GetContentNode()->Len() :
                     GetPoint()->nContent.GetIndex() == 0;
 
     if( !bRet )
@@ -1234,18 +1234,18 @@ bool SwCursor::IsStartEndSentence( bool bEnd ) const
 bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             false ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1258,18 +1258,18 @@ bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             true ).endPos;
 
-        if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0 &&
+        if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0 &&
             GetPoint()->nContent.GetIndex() != nPtPos )
         {
             GetPoint()->nContent = nPtPos;
@@ -1283,18 +1283,18 @@ bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
 
         nPtPos = g_pBreakIt->GetBreakIter()->nextWord(
-                                pTxtNd->GetTxt(), nPtPos,
-            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+                                pTextNd->GetText(), nPtPos,
+            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1307,8 +1307,8 @@ bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1317,11 +1317,11 @@ bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
         if( nPtPos )
             --nPtPos;
         nPtPos = g_pBreakIt->GetBreakIter()->previousWord(
-                                pTxtNd->GetTxt(), nPtStart,
-            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+                                pTextNd->GetText(), nPtStart,
+            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1346,8 +1346,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
         pLayout->GetCrsrOfst( GetPoint(), aPt );
     }
 
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         // Should we select the whole fieldmark?
         const IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
@@ -1374,8 +1374,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
         {
             sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
             Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                pTxtNd->GetTxt(), nPtPos,
-                                g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                pTextNd->GetText(), nPtPos,
+                                g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                 nWordType,
                                 bForward ));
 
@@ -1384,8 +1384,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
                 // nPtPos is the end of the paragraph, select the last word then.
                 --nPtPos;
                 aBndry = Boundary( g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                    pTxtNd->GetTxt(), nPtPos,
-                                    g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                    pTextNd->GetText(), nPtPos,
+                                    g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                     nWordType,
                                     bForward ));
             }
@@ -1424,28 +1424,28 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
     return bRet;
 }
 
-static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
+static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd )
 {
     OUString aRes;
-    if (pTxtNd)
+    if (pTextNd)
     {
         //mask deleted redlines
-        OUString sNodeText(pTxtNd->GetTxt());
-        const SwDoc& rDoc = *pTxtNd->GetDoc();
+        OUString sNodeText(pTextNd->GetText());
+        const SwDoc& rDoc = *pTextNd->GetDoc();
         const bool nShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
         if ( nShowChg )
         {
-            sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTxtNd, USHRT_MAX );
-            for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size(); nAct++ )
+            sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX );
+            for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
             {
-                const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
-                if ( pRed->Start()->nNode > pTxtNd->GetIndex() )
+                const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
+                if ( pRed->Start()->nNode > pTextNd->GetIndex() )
                     break;
 
                 if( nsRedlineType_t::REDLINE_DELETE == pRed->GetType() )
                 {
                     sal_Int32 nStart, nEnd;
-                    pRed->CalcStartEnd( pTxtNd->GetIndex(), nStart, nEnd );
+                    pRed->CalcStartEnd( pTextNd->GetIndex(), nStart, nEnd );
 
                     while ( nStart < nEnd && nStart < sNodeText.getLength() )
                         sNodeText = sNodeText.replaceAt( nStart++, 1, OUString(CH_TXTATR_INWORD) );
@@ -1460,10 +1460,10 @@ static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
 bool SwCursor::GoSentence( SentenceMoveType eMoveType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
-        OUString sNodeText( lcl_MaskDeletedRedlines( pTxtNd ) );
+        OUString sNodeText( lcl_MaskDeletedRedlines( pTextNd ) );
 
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1473,22 +1473,22 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
             nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                            pTxtNd->GetLang( nPtPos ) ));
+                                            pTextNd->GetLang( nPtPos ) ));
             break;
         case END_SENT: /* when modifying: see also ExpandToSentenceBorders below! */
             nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             break;
         case NEXT_SENT:
             {
                 nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
                                         sNodeText,
                                         nPtPos, g_pBreakIt->GetLocale(
-                                                    pTxtNd->GetLang( nPtPos ) ));
+                                                    pTextNd->GetLang( nPtPos ) ));
                 while (nPtPos>=0 && ++nPtPos < sNodeText.getLength()
-                       && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aTxt.GetChar(nPtPos)*/ )
+                       && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aText.GetChar(nPtPos)*/ )
                     ;
                 break;
             }
@@ -1496,20 +1496,20 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
             nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             if (nPtPos == 0)
                 return false;   // the previous sentence is not in this paragraph
             if (nPtPos > 0)
                 nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos - 1, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             break;
         }
 
         // it is allowed to place the PaM just behind the last
         // character in the text thus <= ...Len
-        if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1522,8 +1522,8 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
 bool SwCursor::ExpandToSentenceBorders()
 {
     bool bRes = false;
-    const SwTxtNode* pStartNd = Start()->nNode.GetNode().GetTxtNode();
-    const SwTxtNode* pEndNd   = End()->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pStartNd = Start()->nNode.GetNode().GetTextNode();
+    const SwTextNode* pEndNd   = End()->nNode.GetNode().GetTextNode();
     if (pStartNd && pEndNd && g_pBreakIt->GetBreakIter().is())
     {
         if (!HasMark())
@@ -1546,12 +1546,12 @@ bool SwCursor::ExpandToSentenceBorders()
         // it is allowed to place the PaM just behind the last
         // character in the text thus <= ...Len
         bool bChanged = false;
-        if (nStartPos <= pStartNd->GetTxt().getLength() && nStartPos >= 0)
+        if (nStartPos <= pStartNd->GetText().getLength() && nStartPos >= 0)
         {
             GetMark()->nContent = nStartPos;
             bChanged = true;
         }
-        if (nEndPos <= pEndNd->GetTxt().getLength() && nEndPos >= 0)
+        if (nEndPos <= pEndNd->GetText().getLength() && nEndPos >= 0)
         {
             GetPoint()->nContent = nEndPos;
             bChanged = true;
@@ -1570,17 +1570,17 @@ bool SwTableCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/
 }
 
 // calculate cursor bidi level: extracted from LeftRight()
-const SwCntntFrm*
+const SwContentFrm*
 SwCursor::DoSetBidiLevelLeftRight(
     bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr)
 {
     // calculate cursor bidi level
-    const SwCntntFrm* pSttFrm = NULL;
+    const SwContentFrm* pSttFrm = NULL;
     SwNode& rNode = GetPoint()->nNode.GetNode();
 
-    if( rNode.IsTxtNode() )
+    if( rNode.IsTextNode() )
     {
-        const SwTxtNode& rTNd = *rNode.GetTxtNode();
+        const SwTextNode& rTNd = *rNode.GetTextNode();
         SwIndex& rIdx = GetPoint()->nContent;
         sal_Int32 nPos = rIdx.GetIndex();
 
@@ -1597,7 +1597,7 @@ SwCursor::DoSetBidiLevelLeftRight(
             {
                 sal_uInt8 nCrsrLevel = GetCrsrBidiLevel();
                 bool bForward = ! io_rbLeft;
-                const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
+                const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
                                                          bForward, bInsertCrsr );
                 rIdx = nPos;
                 SetCrsrBidiLevel( nCrsrLevel );
@@ -1624,7 +1624,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 {
     // calculate cursor bidi level
     SwNode& rNode = GetPoint()->nNode.GetNode();
-    const SwCntntFrm* pSttFrm = // may side-effect bLeft!
+    const SwContentFrm* pSttFrm = // may side-effect bLeft!
         DoSetBidiLevelLeftRight(bLeft, bVisualAllowed, bInsertCrsr);
 
     // can the cursor be moved n times?
@@ -1633,9 +1633,9 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 
     SwGoInDoc fnGo;
     if ( bSkipHidden )
-        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCellsSkipHidden : fnGoCntntSkipHidden;
+        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCellsSkipHidden : fnGoContentSkipHidden;
     else
-        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCells : fnGoCntnt;
+        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCells : fnGoContent;
 
     while( nCnt )
     {
@@ -1663,7 +1663,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
             if ( bCellChanged )
             {
                 // Set cursor to start/end of covered cell:
-                SwTableBox* pTableBox = pOldTabBoxSttNode->GetTblBox();
+                SwTableBox* pTableBox = pOldTabBoxSttNode->GetTableBox();
                 if ( pTableBox && pTableBox->getRowSpan() > 1 )
                 {
                     pTableBox = & pTableBox->FindEndOfRowSpan(
@@ -1674,10 +1674,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
                     rPtIdx = aNewIdx;
 
                     GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
-                    SwCntntNode* pCntntNode = GetCntntNode();
-                    if ( pCntntNode )
+                    SwContentNode* pContentNode = GetContentNode();
+                    if ( pContentNode )
                     {
-                        GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+                        GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
 
                         // Redo the move:
                         if ( !Move( fnMove, fnGo ) )
@@ -1693,24 +1693,24 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
         const SwNode* pTableBoxStartNode = GetPoint()->nNode.GetNode().FindTableBoxStartNode();
         if ( pTableBoxStartNode )
         {
-            const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+            const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
             if ( pTableBox && pTableBox->getRowSpan() < 1 )
             {
                 // Store the row span offset:
                 m_nRowSpanOffset = pTableBox->getRowSpan();
 
                 // Move cursor to non-covered cell:
-                const SwTableNode* pTblNd = pTableBoxStartNode->FindTableNode();
-                pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+                const SwTableNode* pTableNd = pTableBoxStartNode->FindTableNode();
+                pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
                  SwNodeIndex& rPtIdx = GetPoint()->nNode;
                 SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
                 rPtIdx = aNewIdx;
 
                 GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
-                SwCntntNode* pCntntNode = GetCntntNode();
-                if ( pCntntNode )
+                SwContentNode* pContentNode = GetContentNode();
+                if ( pContentNode )
                 {
-                    GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+                    GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
                 }
             }
         }
@@ -1721,10 +1721,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     if ( pSttFrm )
     {
         SwNode& rTmpNode = GetPoint()->nNode.GetNode();
-        if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() )
+        if ( &rTmpNode != &rNode && rTmpNode.IsTextNode() )
         {
             Point aPt;
-            const SwCntntFrm* pEndFrm = rTmpNode.GetTxtNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+            const SwContentFrm* pEndFrm = rTmpNode.GetTextNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             if ( pEndFrm )
             {
                 if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() )
@@ -1747,16 +1747,16 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 void SwCursor::DoSetBidiLevelUpDown()
 {
     SwNode& rNode = GetPoint()->nNode.GetNode();
-    if ( rNode.IsTxtNode() )
+    if ( rNode.IsTextNode() )
     {
         const SwScriptInfo* pSI =
-            SwScriptInfo::GetScriptInfo( *rNode.GetTxtNode() );
+            SwScriptInfo::GetScriptInfo( *rNode.GetTextNode() );
         if ( pSI )
         {
             SwIndex& rIdx = GetPoint()->nContent;
             const sal_Int32 nPos = rIdx.GetIndex();
 
-            if (nPos && nPos < rNode.GetTxtNode()->GetTxt().getLength())
+            if (nPos && nPos < rNode.GetTextNode()->GetText().getLength())
             {
                 const sal_uInt8 nCurrLevel = pSI->DirType( nPos );
                 const sal_uInt8 nPrevLevel = pSI->DirType( nPos - 1 );
@@ -1776,12 +1776,12 @@ void SwCursor::DoSetBidiLevelUpDown()
 bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
                             Point* pPt, long nUpDownX )
 {
-    SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+    SwTableCursor* pTableCrsr = dynamic_cast<SwTableCursor*>(this);
     bool bAdjustTableCrsr = false;
 
     // If the point/mark of the table cursor in the same box then set cursor to
     // beginning of the box
-    if( pTblCrsr && GetNode( true ).StartOfSectionNode() ==
+    if( pTableCrsr && GetNode( true ).StartOfSectionNode() ==
                     GetNode( false ).StartOfSectionNode() )
     {
         if ( End() != GetPoint() )
@@ -1793,7 +1793,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
     Point aPt;
     if( pPt )
         aPt = *pPt;
-    SwCntntFrm* pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm* pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
 
     if( pFrm )
     {
@@ -1811,7 +1811,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
         }
 
         // It is allowed to move footnotes in other footnotes but not sections
-        const bool bChkRange = !pFrm->IsInFtn() || HasMark();
+        const bool bChkRange = !pFrm->IsInFootnote() || HasMark();
         const SwPosition aOldPos( *GetPoint() );
         const bool bInReadOnly = IsReadOnlyAvailable();
 
@@ -1821,15 +1821,15 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
             // than one paragraph. If we want to go down, we have to set the
             // point to the last frame in the table box. This is only necessary
             // if we do not already have a table selection
-            const SwStartNode* pTblNd = GetNode( true ).FindTableBoxStartNode();
-            OSL_ENSURE( pTblNd, "pTblCrsr without SwTableNode?" );
+            const SwStartNode* pTableNd = GetNode( true ).FindTableBoxStartNode();
+            OSL_ENSURE( pTableNd, "pTableCrsr without SwTableNode?" );
 
-            if ( pTblNd ) // safety first
+            if ( pTableNd ) // safety first
             {
-                const SwNode* pEndNd = pTblNd->EndOfSectionNode();
+                const SwNode* pEndNd = pTableNd->EndOfSectionNode();
                 GetPoint()->nNode = *pEndNd;
-                pTblCrsr->Move( fnMoveBackward, fnGoNode );
-                   pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+                pTableCrsr->Move( fnMoveBackward, fnGoNode );
+                   pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             }
         }
 
@@ -1838,7 +1838,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
                     : pFrm->UnitDown( this, nUpDownX, bInReadOnly ) ) &&
                 CheckNodesRange( aOldPos.nNode, GetPoint()->nNode, bChkRange ))
         {
-               pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+               pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             --nCnt;
         }
 
@@ -1846,10 +1846,10 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
         if( !nCnt && !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                 nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
         {
-            if( !pTblCrsr )
+            if( !pTableCrsr )
             {
                 // try to position the cursor at half of the char-rect's height
-                pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+                pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
                 SwCrsrMoveState eTmpState( MV_UPDOWN );
                 eTmpState.bSetInReadOnly = bInReadOnly;
                 SwRect aTmpRect;
@@ -1881,7 +1881,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 bool SwCursor::LeftRightMargin( bool bLeft, bool bAPI )
 {
     Point aPt;
-    SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
 
     // calculate cursor bidi level
     if ( pFrm )
@@ -1897,7 +1897,7 @@ bool SwCursor::IsAtLeftRightMargin( bool bLeft, bool bAPI ) const
 {
     bool bRet = false;
     Point aPt;
-    SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
     if( pFrm )
     {
         SwPaM aPam( *GetPoint() );
@@ -1916,7 +1916,7 @@ bool SwCursor::SttEndDoc( bool bStt )
     // Never jump over section boundaries during selection!
     // Can the cursor still moved on?
     SwMoveFn fnMove = bStt ? fnMoveBackward : fnMoveForward;
-    bool bRet = (!HasMark() || !IsNoCntnt() ) &&
+    bool bRet = (!HasMark() || !IsNoContent() ) &&
                     Move( fnMove, fnGoDoc ) &&
                     !IsInProtectTable( true ) &&
                     !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -1927,8 +1927,8 @@ bool SwCursor::SttEndDoc( bool bStt )
 
 bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
 {
-    const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
-    if( !pTblNd )
+    const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+    if( !pTableNd )
         return false;
 
     // If there is another EndNode in front of the cell's StartNode then there
@@ -1939,7 +1939,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
     while( nCnt-- )
     {
         const SwNode* pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
-        const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+        const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
 
         // Check if we have to move the cursor to a covered cell before
         // proceeding:
@@ -1947,7 +1947,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
         {
             if ( pTableBox && pTableBox->getRowSpan() > 1 )
             {
-                pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+                pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
                     static_cast<sal_uInt16>(pTableBox->getRowSpan() + m_nRowSpanOffset));
                 SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
                 rPtIdx = aNewIdx;
@@ -1968,21 +1968,21 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
         rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
 
         pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
-        pTableBox = pTableBoxStartNode->GetTblBox();
+        pTableBox = pTableBoxStartNode->GetTableBox();
         if ( pTableBox && pTableBox->getRowSpan() < 1 )
         {
             m_nRowSpanOffset = pTableBox->getRowSpan();
             // move cursor to non-covered cell:
-            pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+            pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
             SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
             rPtIdx = aNewIdx;
         }
     }
 
     ++rPtIdx;
-    if( !rPtIdx.GetNode().IsCntntNode() )
+    if( !rPtIdx.GetNode().IsContentNode() )
         GetDoc()->GetNodes().GoNextSection( &rPtIdx, true, false );
-    GetPoint()->nContent.Assign( GetCntntNode(), 0 );
+    GetPoint()->nContent.Assign( GetContentNode(), 0 );
 
     return !IsInProtectTable( true );
 }
@@ -1997,35 +1997,35 @@ bool SwCursor::GotoTable( const OUString& rName )
     bool bRet = false;
     if ( !HasMark() )
     {
-        SwTable* pTmpTbl = SwTable::FindTable( GetDoc()->FindTblFmtByName( rName ) );
-        if( pTmpTbl )
+        SwTable* pTmpTable = SwTable::FindTable( GetDoc()->FindTableFormatByName( rName ) );
+        if( pTmpTable )
         {
             // a table in a normal nodes array
             SwCrsrSaveState aSave( *this );
-            GetPoint()->nNode = *pTmpTbl->GetTabSortBoxes()[ 0 ]->
+            GetPoint()->nNode = *pTmpTable->GetTabSortBoxes()[ 0 ]->
                                 GetSttNd()->FindTableNode();
-            Move( fnMoveForward, fnGoCntnt );
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
     return bRet;
 }
 
-bool SwCursor::GotoTblBox( const OUString& rName )
+bool SwCursor::GotoTableBox( const OUString& rName )
 {
     bool bRet = false;
-    const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         // retrieve box by name
-        const SwTableBox* pTblBox = pTblNd->GetTable().GetTblBox( rName );
-        if( pTblBox && pTblBox->GetSttNd() &&
-            ( !pTblBox->GetFrmFmt()->GetProtect().IsCntntProtected() ||
+        const SwTableBox* pTableBox = pTableNd->GetTable().GetTableBox( rName );
+        if( pTableBox && pTableBox->GetSttNd() &&
+            ( !pTableBox->GetFrameFormat()->GetProtect().IsContentProtected() ||
               IsReadOnlyAvailable() ) )
         {
             SwCrsrSaveState aSave( *this );
-            GetPoint()->nNode = *pTblBox->GetSttNd();
-            Move( fnMoveForward, fnGoCntnt );
+            GetPoint()->nNode = *pTableBox->GetSttNd();
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
@@ -2043,19 +2043,19 @@ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
         // If fnWhichPara == fnParaCurr then (*fnWhichPara)( *this, fnPosPara )
         // can already move the cursor to a different text node. In this case
         // we better check if IsSelOvr().
-        const SwCntntNode* pCntntNd = pNd->GetCntntNode();
-        if ( pCntntNd )
+        const SwContentNode* pContentNd = pNd->GetContentNode();
+        if ( pContentNd )
         {
-            const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pCntntNd->Len();
+            const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pContentNd->Len();
             if ( GetPoint()->nContent.GetIndex() != nSttEnd )
                 bShortCut = true;
         }
     }
     else
     {
-        if ( pNd->IsTxtNode() &&
+        if ( pNd->IsTextNode() &&
              pNd->GetNodes()[ pNd->GetIndex() +
-                    (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTxtNode() )
+                    (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTextNode() )
             bShortCut = true;
     }
 
@@ -2094,17 +2094,17 @@ void SwCursor::RestoreSavePos()
         GetPoint()->nNode = m_pSavePos->nNode;
 
         sal_Int32 nIdx = 0;
-        if ( GetCntntNode() )
+        if ( GetContentNode() )
         {
-            if (m_pSavePos->nCntnt <= GetCntntNode()->Len())
-                nIdx = m_pSavePos->nCntnt;
+            if (m_pSavePos->nContent <= GetContentNode()->Len())
+                nIdx = m_pSavePos->nContent;
             else
             {
-                nIdx = GetCntntNode()->Len();
+                nIdx = GetContentNode()->Len();
                 OSL_FAIL("SwCursor::RestoreSavePos: invalid content index");
             }
         }
-        GetPoint()->nContent.Assign( GetCntntNode(), nIdx );
+        GetPoint()->nContent.Assign( GetContentNode(), nIdx );
     }
 }
 
@@ -2113,8 +2113,8 @@ SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
 {
     m_bParked = false;
     m_bChanged = false;
-    m_nTblPtNd = 0, m_nTblMkNd = 0;
-    m_nTblPtCnt = 0, m_nTblMkCnt = 0;
+    m_nTablePtNd = 0, m_nTableMkNd = 0;
+    m_nTablePtCnt = 0, m_nTableMkCnt = 0;
 }
 
 SwTableCursor::~SwTableCursor() {}
@@ -2185,22 +2185,22 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             {
                 SwNodeIndex aIdx( *pSttNd, 1 );
                 const SwNode* pNd = &aIdx.GetNode();
-                if( !pNd->IsCntntNode() )
+                if( !pNd->IsContentNode() )
                     pNd = rNds.GoNextSection( &aIdx, true, false );
 
                 SwPosition* pPos = pCur->GetMark();
                 if( pNd != &pPos->nNode.GetNode() )
                     pPos->nNode = *pNd;
-                pPos->nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), 0 );
+                pPos->nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), 0 );
 
                 aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 );
-                if( !( pNd = &aIdx.GetNode())->IsCntntNode() )
+                if( !( pNd = &aIdx.GetNode())->IsContentNode() )
                     pNd = SwNodes::GoPrevSection( &aIdx, true, false );
 
                 pPos = pCur->GetPoint();
                 if (pNd && pNd != &pPos->nNode.GetNode())
                     pPos->nNode = *pNd;
-                pPos->nContent.Assign(const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), pNd ? static_cast<const SwCntntNode*>(pNd)->Len() : 0);
+                pPos->nContent.Assign(const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), pNd ? static_cast<const SwContentNode*>(pNd)->Len() : 0);
 
                 aTmp.erase( aTmp.begin() + nPos );
             }
@@ -2227,30 +2227,30 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             if( &aIdx.GetNodes() != &rNds )
                 break;
             SwNode* pNd = &aIdx.GetNode();
-            if( !pNd->IsCntntNode() )
+            if( !pNd->IsContentNode() )
                 pNd = rNds.GoNextSection( &aIdx, true, false );
 
             SwPaM *const pNew = (!pAktCrsr->IsMultiSelection() && !pAktCrsr->HasMark())
                 ? pAktCrsr
                 : pAktCrsr->Create( pAktCrsr );
             pNew->GetPoint()->nNode = *pNd;
-            pNew->GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pNd), 0 );
+            pNew->GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pNd), 0 );
             pNew->SetMark();
 
             SwPosition* pPos = pNew->GetPoint();
             pPos->nNode.Assign( *pSttNd->EndOfSectionNode(), - 1 );
-            if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() )
+            if( !( pNd = &pPos->nNode.GetNode())->IsContentNode() )
                 pNd = SwNodes::GoPrevSection( &pPos->nNode, true, false );
 
-            pPos->nContent.Assign(static_cast<SwCntntNode*>(pNd), pNd ? static_cast<SwCntntNode*>(pNd)->Len() : 0);
+            pPos->nContent.Assign(static_cast<SwContentNode*>(pNd), pNd ? static_cast<SwContentNode*>(pNd)->Len() : 0);
         }
     }
     return pAktCrsr;
 }
 
-void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
+void SwTableCursor::InsertBox( const SwTableBox& rTableBox )
 {
-    SwTableBox* pBox = const_cast<SwTableBox*>(&rTblBox);
+    SwTableBox* pBox = const_cast<SwTableBox*>(&rTableBox);
     m_SelectedBoxes.insert(pBox);
     m_bChanged = true;
 }
@@ -2264,8 +2264,8 @@ void SwTableCursor::DeleteBox(size_t const nPos)
 bool SwTableCursor::NewTableSelection()
 {
     bool bRet = false;
-    const SwNode *pStart = GetCntntNode()->FindTableBoxStartNode();
-    const SwNode *pEnd = GetCntntNode(false)->FindTableBoxStartNode();
+    const SwNode *pStart = GetContentNode()->FindTableBoxStartNode();
+    const SwNode *pEnd = GetContentNode(false)->FindTableBoxStartNode();
     if( pStart && pEnd )
     {
         const SwTableNode *pTableNode = pStart->FindTableNode();
@@ -2317,15 +2317,15 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
     }
 }
 
-bool SwTableCursor::IsCrsrMovedUpdt()
+bool SwTableCursor::IsCrsrMovedUpdate()
 {
     if( !IsCrsrMoved() )
         return false;
 
-    m_nTblMkNd = GetMark()->nNode.GetIndex();
-    m_nTblPtNd = GetPoint()->nNode.GetIndex();
-    m_nTblMkCnt = GetMark()->nContent.GetIndex();
-    m_nTblPtCnt = GetPoint()->nContent.GetIndex();
+    m_nTableMkNd = GetMark()->nNode.GetIndex();
+    m_nTablePtNd = GetPoint()->nNode.GetIndex();
+    m_nTableMkCnt = GetMark()->nContent.GetIndex();
+    m_nTablePtCnt = GetPoint()->nContent.GetIndex();
     return true;
 }
 
@@ -2354,7 +2354,7 @@ bool SwTableCursor::HasReadOnlyBoxSel() const
     bool bRet = false;
     for (size_t n = m_SelectedBoxes.size(); n; )
     {
-        if (m_SelectedBoxes[--n]->GetFrmFmt()->GetProtect().IsCntntProtected())
+        if (m_SelectedBoxes[--n]->GetFrameFormat()->GetProtect().IsContentProtected())
         {
             bRet = true;
             break;
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index ffd22a28cd78..e5b5c865fdb5 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -44,22 +44,22 @@ SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
     return pActCol ? static_cast<SwLayoutFrm*>(pActCol->GetPrev()) : 0;
 }
 
-SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
 {
-    return pColFrm ? const_cast<SwCntntFrm*>(pColFrm->ContainsCntnt()) : 0;
+    return pColFrm ? const_cast<SwContentFrm*>(pColFrm->ContainsContent()) : 0;
 }
 
-SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
 {
-    SwCntntFrm *pRet = GetColumnStt( pColFrm );
+    SwContentFrm *pRet = GetColumnStt( pColFrm );
     if( !pRet )
         return 0;
 
-    SwCntntFrm *pNxt = pRet->GetNextCntntFrm();
+    SwContentFrm *pNxt = pRet->GetNextContentFrm();
     while( pNxt && pColFrm->IsAnLower( pNxt ) )
     {
         pRet = pNxt;
-        pNxt = pNxt->GetNextCntntFrm();
+        pNxt = pNxt->GetNextContentFrm();
     }
     return pRet;
 }
@@ -73,12 +73,12 @@ SwPosColumn fnColumnEnd = &GetColumnEnd;
 bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
 {
     bool bRet = false;
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
         SwLayoutFrm* pLayFrm = GetCurrFrm()->GetUpper();
         if( pLayFrm && 0 != ( pLayFrm = (*fnWhichCol)( pLayFrm )) )
         {
-            SwCntntFrm* pCnt = (*fnPosCol)( pLayFrm );
+            SwContentFrm* pCnt = (*fnPosCol)( pLayFrm );
             if( pCnt )
             {
                 SET_CURR_SHELL( this );
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 62cdca2b27e2..31fe101dd889 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -46,22 +46,22 @@ bool SwCrsrShell::CallCrsrFN( FNCrsr fnCrsr )
     return bRet;
 }
 
-bool SwCursor::GotoFtnTxt()
+bool SwCursor::GotoFootnoteText()
 {
     // jump from content to footnote
     bool bRet = false;
-    SwTxtNode* pTxtNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = GetPoint()->nNode.GetNode().GetTextNode();
 
-    SwTxtAttr *const pFtn( (pTxtNd)
-        ? pTxtNd->GetTxtAttrForCharAt(
+    SwTextAttr *const pFootnote( (pTextNd)
+        ? pTextNd->GetTextAttrForCharAt(
             GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN)
         : 0);
-    if (pFtn)
+    if (pFootnote)
     {
         SwCrsrSaveState aSaveState( *this );
-        GetPoint()->nNode = *static_cast<SwTxtFtn*>(pFtn)->GetStartNode();
+        GetPoint()->nNode = *static_cast<SwTextFootnote*>(pFootnote)->GetStartNode();
 
-        SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+        SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
                                             &GetPoint()->nNode,
                                             true, !IsReadOnlyAvailable() );
         if( pCNd )
@@ -74,36 +74,36 @@ bool SwCursor::GotoFtnTxt()
     return bRet;
 }
 
-bool SwCrsrShell::GotoFtnTxt()
+bool SwCrsrShell::GotoFootnoteText()
 {
-    bool bRet = CallCrsrFN( &SwCursor::GotoFtnTxt );
+    bool bRet = CallCrsrFN( &SwCursor::GotoFootnoteText );
     if( !bRet )
     {
-        SwTxtNode* pTxtNd = _GetCrsr() ?
-                   _GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode() : NULL;
-        if( pTxtNd )
+        SwTextNode* pTextNd = _GetCrsr() ?
+                   _GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode() : NULL;
+        if( pTextNd )
         {
-            const SwFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
+            const SwFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
                                                  _GetCrsr()->Start() );
-            const SwFtnBossFrm* pFtnBoss;
-            bool bSkip = pFrm && pFrm->IsInFtn();
-            while( pFrm && 0 != ( pFtnBoss = pFrm->FindFtnBossFrm() ) )
+            const SwFootnoteBossFrm* pFootnoteBoss;
+            bool bSkip = pFrm && pFrm->IsInFootnote();
+            while( pFrm && 0 != ( pFootnoteBoss = pFrm->FindFootnoteBossFrm() ) )
             {
-                if( 0 != ( pFrm = pFtnBoss->FindFtnCont() ) )
+                if( 0 != ( pFrm = pFootnoteBoss->FindFootnoteCont() ) )
                 {
                     if( bSkip )
                         bSkip = false;
                     else
                     {
-                        const SwCntntFrm* pCnt = static_cast<const SwLayoutFrm*>
-                                                        (pFrm)->ContainsCntnt();
+                        const SwContentFrm* pCnt = static_cast<const SwLayoutFrm*>
+                                                        (pFrm)->ContainsContent();
                         if( pCnt )
                         {
-                            const SwCntntNode* pNode = pCnt->GetNode();
+                            const SwContentNode* pNode = pCnt->GetNode();
                             _GetCrsr()->GetPoint()->nNode = *pNode;
                             _GetCrsr()->GetPoint()->nContent.Assign(
-                                const_cast<SwCntntNode*>(pNode),
-                                static_cast<const SwTxtFrm*>(pCnt)->GetOfst() );
+                                const_cast<SwContentNode*>(pNode),
+                                static_cast<const SwTextFrm*>(pCnt)->GetOfst() );
                             UpdateCrsr( SwCrsrShell::SCROLLWIN |
                                 SwCrsrShell::CHKRANGE | SwCrsrShell::READONLY );
                             bRet = true;
@@ -111,34 +111,34 @@ bool SwCrsrShell::GotoFtnTxt()
                         }
                     }
                 }
-                if( pFtnBoss->GetNext() && !pFtnBoss->IsPageFrm() )
-                    pFrm = pFtnBoss->GetNext();
+                if( pFootnoteBoss->GetNext() && !pFootnoteBoss->IsPageFrm() )
+                    pFrm = pFootnoteBoss->GetNext();
                 else
-                    pFrm = pFtnBoss->GetUpper();
+                    pFrm = pFootnoteBoss->GetUpper();
             }
         }
     }
     return bRet;
 }
 
-bool SwCursor::GotoFtnAnchor()
+bool SwCursor::GotoFootnoteAnchor()
 {
     // jump from footnote to anchor
     const SwNode* pSttNd = GetNode().FindFootnoteStartNode();
     if( pSttNd )
     {
         // search in all footnotes in document for this StartIndex
-        const SwTxtFtn* pTxtFtn;
-        const SwFtnIdxs& rFtnArr = pSttNd->GetDoc()->GetFtnIdxs();
-        for( size_t n = 0; n < rFtnArr.size(); ++n )
-            if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
-                pSttNd == &pTxtFtn->GetStartNode()->GetNode() )
+        const SwTextFootnote* pTextFootnote;
+        const SwFootnoteIdxs& rFootnoteArr = pSttNd->GetDoc()->GetFootnoteIdxs();
+        for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+            if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
+                pSttNd == &pTextFootnote->GetStartNode()->GetNode() )
             {
                 SwCrsrSaveState aSaveState( *this );
 
-                SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+                SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
                 GetPoint()->nNode = rTNd;
-                GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+                GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
 
                 return !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                   nsSwCursorSelOverFlags::SELOVER_TOGGLE );
@@ -147,11 +147,11 @@ bool SwCursor::GotoFtnAnchor()
     return false;
 }
 
-bool SwCrsrShell::GotoFtnAnchor()
+bool SwCrsrShell::GotoFootnoteAnchor()
 {
     // jump from footnote to anchor
     SwCallLink aLk( *this ); // watch Crsr-Moves
-    bool bRet = m_pCurCrsr->GotoFtnAnchor();
+    bool bRet = m_pCurCrsr->GotoFootnoteAnchor();
     if( bRet )
     {
         // special treatment for table header row
@@ -162,99 +162,99 @@ bool SwCrsrShell::GotoFtnAnchor()
     return bRet;
 }
 
-inline bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpLE( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
 {
-    const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
-    return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() <= nCnt );
+    const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+    return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() <= nCnt );
 }
 
-inline bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpL( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
 {
-    const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
-    return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() < nCnt );
+    const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+    return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() < nCnt );
 }
 
-bool SwCursor::GotoNextFtnAnchor()
+bool SwCursor::GotoNextFootnoteAnchor()
 {
-    const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
-    const SwTxtFtn* pTxtFtn = 0;
+    const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+    const SwTextFootnote* pTextFootnote = 0;
     size_t nPos = 0;
 
-    if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ))
+    if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ))
     {
         // there is a footnote with this index, so search also for the next one
-        if( nPos < rFtnArr.size() )
+        if( nPos < rFootnoteArr.size() )
         {
             sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
             const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
 
-            pTxtFtn = rFtnArr[ nPos ];
+            pTextFootnote = rFootnoteArr[ nPos ];
             // search forwards
-            if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+            if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
             {
-                pTxtFtn = 0;
-                for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+                pTextFootnote = 0;
+                for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
                 {
-                    pTxtFtn = rFtnArr[ nPos ];
-                    if( !CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+                    pTextFootnote = rFootnoteArr[ nPos ];
+                    if( !CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
                         break; // found
-                    pTxtFtn = 0;
+                    pTextFootnote = 0;
                 }
             }
             else if( nPos )
             {
                 // search backwards
-                pTxtFtn = 0;
+                pTextFootnote = 0;
                 while( nPos )
                 {
-                    pTxtFtn = rFtnArr[ --nPos ];
-                    if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+                    pTextFootnote = rFootnoteArr[ --nPos ];
+                    if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
                     {
-                        pTxtFtn = rFtnArr[ ++nPos ];
+                        pTextFootnote = rFootnoteArr[ ++nPos ];
                         break; // found
                     }
                 }
             }
         }
     }
-    else if( nPos < rFtnArr.size() )
-        pTxtFtn = rFtnArr[ nPos ];
+    else if( nPos < rFootnoteArr.size() )
+        pTextFootnote = rFootnoteArr[ nPos ];
 
-    bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTextFootnote;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
 
-        SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+        SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
         GetPoint()->nNode = rTNd;
-        GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+        GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
         bRet = !IsSelOvr();
     }
     return bRet;
 }
 
-bool SwCursor::GotoPrevFtnAnchor()
+bool SwCursor::GotoPrevFootnoteAnchor()
 {
-    const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
-    const SwTxtFtn* pTxtFtn = 0;
+    const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+    const SwTextFootnote* pTextFootnote = 0;
     size_t nPos = 0;
 
-    if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ) )
+    if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ) )
     {
         // there is a footnote with this index, so search also for the next one
         sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
         const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
 
-        pTxtFtn = rFtnArr[ nPos ];
+        pTextFootnote = rFootnoteArr[ nPos ];
         // search forwards
-        if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+        if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
         {
-            for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+            for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
             {
-                pTxtFtn = rFtnArr[ nPos ];
-                if( !CmpL( *pTxtFtn, nNdPos, nCntPos ) )
+                pTextFootnote = rFootnoteArr[ nPos ];
+                if( !CmpL( *pTextFootnote, nNdPos, nCntPos ) )
                 {
-                    pTxtFtn = rFtnArr[ nPos-1 ];
+                    pTextFootnote = rFootnoteArr[ nPos-1 ];
                     break;
                 }
             }
@@ -262,42 +262,42 @@ bool SwCursor::GotoPrevFtnAnchor()
         else if( nPos )
         {
             // search backwards
-            pTxtFtn = 0;
+            pTextFootnote = 0;
             while( nPos )
             {
-                pTxtFtn = rFtnArr[ --nPos ];
-                if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+                pTextFootnote = rFootnoteArr[ --nPos ];
+                if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
                     break; // found
-                pTxtFtn = 0;
+                pTextFootnote = 0;
             }
         }
         else
-            pTxtFtn = 0;
+            pTextFootnote = 0;
     }
     else if( nPos )
-        pTxtFtn = rFtnArr[ nPos-1 ];
+        pTextFootnote = rFootnoteArr[ nPos-1 ];
 
-    bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTextFootnote;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
 
-        SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+        SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
         GetPoint()->nNode = rTNd;
-        GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+        GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
         bRet = !IsSelOvr();
     }
     return bRet;
 }
 
-bool SwCrsrShell::GotoNextFtnAnchor()
+bool SwCrsrShell::GotoNextFootnoteAnchor()
 {
-    return CallCrsrFN( &SwCursor::GotoNextFtnAnchor );
+    return CallCrsrFN( &SwCursor::GotoNextFootnoteAnchor );
 }
 
-bool SwCrsrShell::GotoPrevFtnAnchor()
+bool SwCrsrShell::GotoPrevFootnoteAnchor()
 {
-    return CallCrsrFN( &SwCursor::GotoPrevFtnAnchor );
+    return CallCrsrFN( &SwCursor::GotoPrevFootnoteAnchor );
 }
 
 /// jump from border to anchor
@@ -326,7 +326,7 @@ bool SwCrsrShell::GotoFlyAnchor()
                 : pFrm->Frm().Left());
 
     const SwPageFrm* pPageFrm = pFrm->FindPageFrm();
-    const SwCntntFrm* pFndFrm = pPageFrm->GetCntntPos( aPt, false, true );
+    const SwContentFrm* pFndFrm = pPageFrm->GetContentPos( aPt, false, true );
     pFndFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
 
     bool bRet = !m_pCurCrsr->IsInProtectTable() && !m_pCurCrsr->IsSelOvr();
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 92d40ed3e3a5..8c2ba4e36b2e 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -53,7 +53,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else if( fnPosRegion == fnMoveForward )
             {
                 aIdx = *pNd;
-                SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+                SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -65,7 +65,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+                SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -107,7 +107,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else if( fnPosRegion == fnMoveForward )
             {
                 aIdx = *pNd;
-                SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+                SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -119,7 +119,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+                SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -145,7 +145,7 @@ bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     SwPosition* pPos = rCurCrsr.GetPoint();
     bool bMoveBackward = fnPosRegion == fnMoveBackward;
 
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( bMoveBackward )
     {
         SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -178,7 +178,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     bool bMoveBackward = fnPosRegion == fnMoveBackward;
 
     do {
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         if( bMoveBackward ) // to the end of the section
         {
             SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -205,7 +205,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
 
         // try also the parent of this section
         SwSection* pParent = pNd->GetSection().GetParent();
-        pNd = pParent ? pParent->GetFmt()->GetSectionNode() : 0;
+        pNd = pParent ? pParent->GetFormat()->GetSectionNode() : 0;
     } while( pNd );
     return false;
 }
@@ -217,13 +217,13 @@ bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion
             (*fnWhichRegion)( *this, fnPosRegion, IsReadOnlyAvailable()  ) &&
             !IsSelOvr() &&
             (GetPoint()->nNode.GetIndex() != m_pSavePos->nNode ||
-             GetPoint()->nContent.GetIndex() != m_pSavePos->nCntnt);
+             GetPoint()->nContent.GetIndex() != m_pSavePos->nContent);
 }
 
 bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
     if( bRet )
         UpdateCrsr();
     return bRet;
@@ -232,22 +232,22 @@ bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegi
 bool SwCursor::GotoRegion( const OUString& rName )
 {
     bool bRet = false;
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSectionFmt* pFmt = rFmts[ --n ];
+        const SwSectionFormat* pFormat = rFormats[ --n ];
         const SwNodeIndex* pIdx = 0;
         const SwSection* pSect;
-        if( 0 != ( pSect = pFmt->GetSection() ) &&
+        if( 0 != ( pSect = pFormat->GetSection() ) &&
             pSect->GetSectionName() == rName &&
-            0 != ( pIdx = pFmt->GetCntnt().GetCntntIdx() ) &&
+            0 != ( pIdx = pFormat->GetContent().GetContentIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             // area in normal nodes array
             SwCrsrSaveState aSaveState( *this );
 
             GetPoint()->nNode = *pIdx;
-            Move( fnMoveForward, fnGoCntnt );
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
@@ -257,7 +257,7 @@ bool SwCursor::GotoRegion( const OUString& rName )
 bool SwCrsrShell::GotoRegion( const OUString& rName )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoRegion( rName );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoRegion( rName );
     if( bRet )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
                     SwCrsrShell::READONLY );
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 33d29140a431..6c7ae407b910 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -44,11 +44,11 @@
 bool SwCrsrShell::GoNextCell( bool bAppendLine )
 {
     bool bRet = false;
-    const SwTableNode* pTblNd = 0;
+    const SwTableNode* pTableNd = 0;
 
-    if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
+    if( IsTableMode() || 0 != ( pTableNd = IsCrsrInTable() ))
     {
-        SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
         SwCallLink aLk( *this ); // watch Crsr-Moves
         bRet = true;
 
@@ -59,13 +59,13 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
 
         if ( pCrsr->GetCrsrRowSpanOffset() )
         {
-            pTableBox = pTableBoxStartNode->GetTblBox();
+            pTableBox = pTableBoxStartNode->GetTableBox();
             if ( pTableBox->getRowSpan() > 1 )
             {
-                if ( !pTblNd )
-                    pTblNd = IsCrsrInTbl();
-                assert (pTblNd);
-                pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+                if ( !pTableNd )
+                    pTableNd = IsCrsrInTable();
+                assert (pTableNd);
+                pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
                                                            (sal_uInt16)(pTableBox->getRowSpan() + pCrsr->GetCrsrRowSpanOffset() ) );
                 pTableBoxStartNode = pTableBox->GetSttNd();
             }
@@ -79,11 +79,11 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
         {
             if( pCrsr->HasMark() || !bAppendLine )
                 bRet = false;
-            else if (pTblNd)
+            else if (pTableNd)
             {
                 // if there is no list anymore then create new one
                 if ( !pTableBox )
-                    pTableBox = pTblNd->GetTable().GetTblBox(
+                    pTableBox = pTableNd->GetTable().GetTableBox(
                                     pCrsr->GetPoint()->nNode.GetNode().
                                     StartOfSectionIndex() );
 
@@ -105,9 +105,9 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
 bool SwCrsrShell::GoPrevCell()
 {
     bool bRet = false;
-    if( IsTableMode() || IsCrsrInTbl() )
+    if( IsTableMode() || IsCrsrInTable() )
     {
-        SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
         SwCallLink aLk( *this ); // watch Crsr-Moves
         bRet = pCrsr->GoPrevCell();
         if( bRet )
@@ -128,7 +128,7 @@ static const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
     return pFrm;
 }
 
-bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
+bool SwCrsrShell::_SelTableRowOrCol( bool bRow, bool bRowSimple )
 {
     // check if the current cursor's SPoint/Mark are in a table
     SwFrm *pFrm = GetCurrFrm();
@@ -146,15 +146,15 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
 
     // search box based on layout
     SwSelBoxes aBoxes;
-    SwTblSearchType eType = bRow ? nsSwTblSearchType::TBLSEARCH_ROW : nsSwTblSearchType::TBLSEARCH_COL;
+    SwTableSearchType eType = bRow ? nsSwTableSearchType::TBLSEARCH_ROW : nsSwTableSearchType::TBLSEARCH_COL;
     const bool bCheckProtected = !IsReadOnlyAvailable();
 
     if( bCheckProtected )
-        eType = (SwTblSearchType)(eType | nsSwTblSearchType::TBLSEARCH_PROTECT);
+        eType = (SwTableSearchType)(eType | nsSwTableSearchType::TBLSEARCH_PROTECT);
 
     if ( !bRowSimple )
     {
-        GetTblSel( *this, aBoxes, eType );
+        GetTableSel( *this, aBoxes, eType );
 
         if( aBoxes.empty() )
             return false;
@@ -178,7 +178,7 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     {
         const SwShellCrsr *pCrsr = _GetCrsr();
         const SwFrm* pStartFrm = pFrm;
-        const SwCntntNode *pCNd = pCrsr->GetCntntNode( false );
+        const SwContentNode *pCNd = pCrsr->GetContentNode( false );
         const SwFrm* pEndFrm   = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0;
 
         if ( bRow )
@@ -194,13 +194,13 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
 
         // If we select upwards it is sufficient to set pStt and pEnd
         // to the first resp. last box of the selection obtained from
-        // GetTblSel. However, selecting downwards requires the frames
+        // GetTableSel. However, selecting downwards requires the frames
         // located at the corners of the selection. This does not work
         // for column selections in vertical tables:
         const bool bSelectUp = ( bVert && !bRow ) ||
                                 *pCrsr->GetPoint() <= *pCrsr->GetMark();
         SwCellFrms aCells;
-        GetTblSel( static_cast<const SwCellFrm*>(pStartFrm),
+        GetTableSel( static_cast<const SwCellFrm*>(pStartFrm),
                    static_cast<const SwCellFrm*>(pEndFrm),
                    aBoxes, bSelectUp ? 0 : &aCells, eType );
 
@@ -222,26 +222,26 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     }
 
     // if no table cursor exists, create one
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    m_pTblCrsr->DeleteMark();
+    m_pTableCrsr->DeleteMark();
 
     // set start and end of a column
-    m_pTblCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
-    m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
-    m_pTblCrsr->SetMark();
-    m_pTblCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
-    m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+    m_pTableCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
+    m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+    m_pTableCrsr->SetMark();
+    m_pTableCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
+    m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
 
     // set PtPos 'close' to the reference table, otherwise we might get problems
     // with the repeated headlines check in UpdateCrsr():
     if ( !bRow )
-        m_pTblCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
+        m_pTableCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
                                    ? pMasterTabFrm->Frm().TopRight()
                                    : pMasterTabFrm->Frm().TopLeft();
 
@@ -249,40 +249,40 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     return true;
 }
 
-bool SwCrsrShell::SelTbl()
+bool SwCrsrShell::SelTable()
 {
     // check if the current cursor's SPoint/Mark are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm->IsInTab() )
         return false;
 
-    const SwTabFrm *pTblFrm = pFrm->ImplFindTabFrm();
-    const SwTabFrm* pMasterTabFrm = pTblFrm->IsFollow() ? pTblFrm->FindMaster( true ) : pTblFrm;
-    const SwTableNode* pTblNd = pTblFrm->GetTable()->GetTableNode();
+    const SwTabFrm *pTableFrm = pFrm->ImplFindTabFrm();
+    const SwTabFrm* pMasterTabFrm = pTableFrm->IsFollow() ? pTableFrm->FindMaster( true ) : pTableFrm;
+    const SwTableNode* pTableNd = pTableFrm->GetTable()->GetTableNode();
 
     SET_CURR_SHELL( this );
 
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    m_pTblCrsr->DeleteMark();
-    m_pTblCrsr->GetPoint()->nNode = *pTblNd;
-    m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
-    m_pTblCrsr->SetMark();
+    m_pTableCrsr->DeleteMark();
+    m_pTableCrsr->GetPoint()->nNode = *pTableNd;
+    m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+    m_pTableCrsr->SetMark();
     // set MkPos 'close' to the master table, otherwise we might get problems
     // with the repeated headlines check in UpdateCrsr():
-    m_pTblCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
-    m_pTblCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
-    m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+    m_pTableCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
+    m_pTableCrsr->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
+    m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
     UpdateCrsr();
     return true;
 }
 
-bool SwCrsrShell::SelTblBox()
+bool SwCrsrShell::SelTableBox()
 {
     // if we're in a table, create a table cursor, and select the cell
     // that the current cursor's point resides in
@@ -305,26 +305,26 @@ bool SwCrsrShell::SelTblBox()
     SET_CURR_SHELL( this );
 
     // create a table cursor, if there isn't one already
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    // select the complete box with our shiny new m_pTblCrsr
+    // select the complete box with our shiny new m_pTableCrsr
     // 1. delete mark, and move point to first content node in box
-    m_pTblCrsr->DeleteMark();
-    *(m_pTblCrsr->GetPoint()) = SwPosition( *pStartNode );
-    m_pTblCrsr->Move( fnMoveForward, fnGoNode );
+    m_pTableCrsr->DeleteMark();
+    *(m_pTableCrsr->GetPoint()) = SwPosition( *pStartNode );
+    m_pTableCrsr->Move( fnMoveForward, fnGoNode );
 
     // 2. set mark, and move point to last content node in box
-    m_pTblCrsr->SetMark();
-    *(m_pTblCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
-    m_pTblCrsr->Move( fnMoveBackward, fnGoNode );
+    m_pTableCrsr->SetMark();
+    *(m_pTableCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
+    m_pTableCrsr->Move( fnMoveBackward, fnGoNode );
 
     // 3. exchange
-    m_pTblCrsr->Exchange();
+    m_pTableCrsr->Exchange();
 
     // with some luck, UpdateCrsr() will now update everything that
     // needs updating
@@ -348,18 +348,18 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
     SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
 
     // the resulting cell should be in that table:
-    const SwTableNode* pTblNd = rIdx.GetNode().GetTableNode();
+    const SwTableNode* pTableNd = rIdx.GetNode().GetTableNode();
 
-    if ( !pTblNd )
+    if ( !pTableNd )
     {
         OSL_FAIL( "lcl_FindNextCell not celled with table start node!" );
         return false;
     }
 
-    const SwNode* pTableEndNode = pTblNd->EndOfSectionNode();
+    const SwNode* pTableEndNode = pTableNd->EndOfSectionNode();
 
     SwNodes& rNds = aTmp.GetNode().GetNodes();
-    SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
 
     // no content node => go to next content node
     if( !pCNd )
@@ -369,9 +369,9 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
     if ( !pCNd )
         return false;
 
-    SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+    SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-    if ( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+    if ( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
         (!bInReadOnly && pFrm->IsProtected() ) )
     {
         // we are not located inside a 'valid' cell. We have to continue searching...
@@ -392,7 +392,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
                 return false;
 
             // ok, get the next content node:
-            pCNd = aTmp.GetNode().GetCntntNode();
+            pCNd = aTmp.GetNode().GetContentNode();
             if( 0 == pCNd )
                 pCNd = rNds.GoNext( &aTmp );
 
@@ -403,7 +403,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
             // check if we have found a suitable table cell:
             pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-            if ( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+            if ( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
                 (bInReadOnly || !pFrm->IsProtected() ) )
             {
                 // finally, we have found a suitable table cell => set index and return
@@ -425,15 +425,15 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
 
     const SwNode* pTableEndNode = &rIdx.GetNode();
-    const SwTableNode* pTblNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
+    const SwTableNode* pTableNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
 
-    if ( !pTblNd )
+    if ( !pTableNd )
     {
         OSL_FAIL( "lcl_FindPrevCell not celled with table start node!" );
         return false;
     }
 
-    SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
 
     if( !pCNd )
         pCNd = SwNodes::GoPrevious( &aTmp );
@@ -441,9 +441,9 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     if ( !pCNd )
         return false;
 
-    SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+    SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-    if( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+    if( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
         (!bInReadOnly && pFrm->IsProtected() ))
     {
         // skip before current section
@@ -452,10 +452,10 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
         {
             SwNode* pNd = &aTmp.GetNode();
 
-            if( pNd == pTblNd || pNd->GetIndex() < pTblNd->GetIndex() )
+            if( pNd == pTableNd || pNd->GetIndex() < pTableNd->GetIndex() )
                 return false;
 
-            pCNd = aTmp.GetNode().GetCntntNode();
+            pCNd = aTmp.GetNode().GetContentNode();
             if( 0 == pCNd )
                 pCNd = SwNodes::GoPrevious( &aTmp );
 
@@ -464,7 +464,7 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
 
             pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-            if( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+            if( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
                 (bInReadOnly || !pFrm->IsProtected() ) )
             {
                 rIdx = *pCNd;
@@ -477,40 +477,40 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     return true;
 }
 
-bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
 
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
+    if( pTableNd )
     {
         // #i26532#: If we are inside a table, we may not go backward to the
         // table start node, because we would miss any tables inside this table.
-        SwTableNode* pInnerTblNd = 0;
+        SwTableNode* pInnerTableNd = 0;
         SwNodeIndex aTmpIdx( aIdx );
         while( aTmpIdx.GetIndex() &&
-                0 == ( pInnerTblNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+                0 == ( pInnerTableNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
             --aTmpIdx;
 
-        if( pInnerTblNd == pTblNd )
-            aIdx.Assign( *pTblNd, - 1 );
+        if( pInnerTableNd == pTableNd )
+            aIdx.Assign( *pTableNd, - 1 );
     }
 
     do {
         while( aIdx.GetIndex() &&
-            0 == ( pTblNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+            0 == ( pTableNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
             --aIdx;
 
-        if( pTblNd ) // any further table node?
+        if( pTableNd ) // any further table node?
         {
-            if( fnPosTbl == fnMoveForward ) // at the beginning?
+            if( fnPosTable == fnMoveForward ) // at the beginning?
             {
                 aIdx = *aIdx.GetNode().StartOfSectionNode();
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd, -1 );
+                    aIdx.Assign( *pTableNd, -1 );
                     continue;
                 }
             }
@@ -520,48 +520,48 @@ bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd, -1 );
+                    aIdx.Assign( *pTableNd, -1 );
                     continue;
                 }
             }
 
-            SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-            if ( pTxtNode )
+            SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+            if ( pTextNode )
             {
-                rCurCrsr.GetPoint()->nNode = *pTxtNode;
-                rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                      pTxtNode->Len() :
+                rCurCrsr.GetPoint()->nNode = *pTextNode;
+                rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                      pTextNode->Len() :
                                                       0 );
             }
             return true;
         }
-    } while( pTblNd );
+    } while( pTableNd );
 
     return false;
 }
 
-bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
 
-    if( pTblNd )
-        aIdx.Assign( *pTblNd->EndOfSectionNode(), 1 );
+    if( pTableNd )
+        aIdx.Assign( *pTableNd->EndOfSectionNode(), 1 );
 
     sal_uLong nLastNd = rCurCrsr.GetDoc()->GetNodes().Count() - 1;
     do {
         while( aIdx.GetIndex() < nLastNd &&
-                0 == ( pTblNd = aIdx.GetNode().GetTableNode()) )
+                0 == ( pTableNd = aIdx.GetNode().GetTableNode()) )
             ++aIdx;
-        if( pTblNd ) // any further table node?
+        if( pTableNd ) // any further table node?
         {
-            if( fnPosTbl == fnMoveForward ) // at the beginning?
+            if( fnPosTable == fnMoveForward ) // at the beginning?
             {
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+                    aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
                     continue;
                 }
             }
@@ -572,93 +572,93 @@ bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+                    aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
                     continue;
                 }
             }
 
-            SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-            if ( pTxtNode )
+            SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+            if ( pTextNode )
             {
-                rCurCrsr.GetPoint()->nNode = *pTxtNode;
-                rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                      pTxtNode->Len() :
+                rCurCrsr.GetPoint()->nNode = *pTextNode;
+                rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                      pTextNode->Len() :
                                                       0 );
             }
             return true;
         }
-    } while( pTblNd );
+    } while( pTableNd );
 
     return false;
 }
 
-bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
-    SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
-    if( !pTblNd )
+    SwTableNode* pTableNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
+    if( !pTableNd )
         return false;
 
-    SwTxtNode* pTxtNode = 0;
-    if( fnPosTbl == fnMoveBackward ) // to the end of the table
+    SwTextNode* pTextNode = 0;
+    if( fnPosTable == fnMoveBackward ) // to the end of the table
     {
-        SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
+        SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
         if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
             return false;
-        pTxtNode = aIdx.GetNode().GetTxtNode();
+        pTextNode = aIdx.GetNode().GetTextNode();
     }
     else
     {
-        SwNodeIndex aIdx( *pTblNd );
+        SwNodeIndex aIdx( *pTableNd );
         if( !lcl_FindNextCell( aIdx, bInReadOnly ))
             return false;
-        pTxtNode = aIdx.GetNode().GetTxtNode();
+        pTextNode = aIdx.GetNode().GetTextNode();
     }
 
-    if ( pTxtNode )
+    if ( pTextNode )
     {
-        rCurCrsr.GetPoint()->nNode = *pTxtNode;
-        rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                        pTxtNode->Len() :
+        rCurCrsr.GetPoint()->nNode = *pTextNode;
+        rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                        pTextNode->Len() :
                                                         0 );
     }
 
     return true;
 }
 
-bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCursor::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
 {
     bool bRet = false;
-    SwTableCursor* m_pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+    SwTableCursor* m_pTableCrsr = dynamic_cast<SwTableCursor*>(this);
 
-    if( m_pTblCrsr || !HasMark() )
+    if( m_pTableCrsr || !HasMark() )
     {
         SwCrsrSaveState aSaveState( *this );
-        bRet = (*fnWhichTbl)( *this, fnPosTbl, IsReadOnlyAvailable() ) &&
+        bRet = (*fnWhichTable)( *this, fnPosTable, IsReadOnlyAvailable() ) &&
                 !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                            nsSwCursorSelOverFlags::SELOVER_TOGGLE );
     }
     return bRet;
 }
 
-bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
-    SwShellCrsr* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     bool bCheckPos;
     bool bRet;
     sal_uLong nPtNd = 0;
     sal_Int32 nPtCnt = 0;
 
-    if ( !m_pTblCrsr && m_pCurCrsr->HasMark() )
+    if ( !m_pTableCrsr && m_pCurCrsr->HasMark() )
     {
         // switch to table mode
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
-        m_pTblCrsr->SetMark();
-        pCrsr = m_pTblCrsr;
+        m_pTableCrsr->SetMark();
+        pCrsr = m_pTableCrsr;
         bCheckPos = false;
     }
     else
@@ -668,7 +668,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
         nPtCnt = pCrsr->GetPoint()->nContent.GetIndex();
     }
 
-    bRet = pCrsr->MoveTable( fnWhichTbl, fnPosTbl );
+    bRet = pCrsr->MoveTable( fnWhichTable, fnPosTable );
 
     if( bRet )
     {
@@ -685,7 +685,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
     return bRet;
 }
 
-bool SwCrsrShell::IsTblComplexForChart()
+bool SwCrsrShell::IsTableComplexForChart()
 {
     bool bRet = false;
 
@@ -696,9 +696,9 @@ bool SwCrsrShell::IsTblComplexForChart()
     {
         // in a table; check if table or section is balanced
         OUString sSel;
-        if( m_pTblCrsr )
+        if( m_pTableCrsr )
             sSel = GetBoxNms();
-        bRet = pTNd->GetTable().IsTblComplexForChart( sSel );
+        bRet = pTNd->GetTable().IsTableComplexForChart( sSel );
     }
     EndAction();
 
@@ -713,7 +713,7 @@ OUString SwCrsrShell::GetBoxNms() const
 
     if( IsTableMode() )
     {
-        SwCntntNode *pCNd = m_pTblCrsr->Start()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pCNd = m_pTableCrsr->Start()->nNode.GetNode().GetContentNode();
         pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
         if( !pFrm )
             return sNm;
@@ -729,17 +729,17 @@ OUString SwCrsrShell::GetBoxNms() const
 
         sNm = static_cast<SwCellFrm*>(pFrm)->GetTabBox()->GetName();
         sNm += ":";
-        pPos = m_pTblCrsr->End();
+        pPos = m_pTableCrsr->End();
     }
     else
     {
-        const SwTableNode* pTblNd = IsCrsrInTbl();
-        if( !pTblNd )
+        const SwTableNode* pTableNd = IsCrsrInTable();
+        if( !pTableNd )
             return sNm;
         pPos = GetCrsr()->GetPoint();
     }
 
-    SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
+    SwContentNode* pCNd = pPos->nNode.GetNode().GetContentNode();
     pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
 
     if( pFrm )
@@ -757,7 +757,7 @@ OUString SwCrsrShell::GetBoxNms() const
 bool SwCrsrShell::GotoTable( const OUString& rName )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoTable( rName );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoTable( rName );
     if( bRet )
     {
         m_pCurCrsr->GetPtPos() = Point();
@@ -767,9 +767,9 @@ bool SwCrsrShell::GotoTable( const OUString& rName )
     return bRet;
 }
 
-bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
+bool SwCrsrShell::CheckTableBoxContent( const SwPosition* pPos )
 {
-    if( !m_pBoxIdx || !m_pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
+    if( !m_pBoxIdx || !m_pBoxPtr || IsSelTableCells() || !IsAutoUpdateCells() )
         return false;
 
     // check if box content is consistent with given box format, reset if not
@@ -782,13 +782,13 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
             0 != ( pSttNd = m_pBoxIdx->GetNode().GetStartNode() ) &&
             SwTableBoxStartNode == pSttNd->GetStartNodeType() &&
             m_pBoxPtr == pSttNd->FindTableNode()->GetTable().
-                        GetTblBox( m_pBoxIdx->GetIndex() ) )
+                        GetTableBox( m_pBoxIdx->GetIndex() ) )
             pChkBox = m_pBoxPtr;
     }
     else if( 0 != ( pSttNd = pPos->nNode.GetNode().
                                 FindSttNodeByType( SwTableBoxStartNode )) )
     {
-        pChkBox = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+        pChkBox = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
     }
 
     // box has more than one paragraph
@@ -797,7 +797,7 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
 
     // destroy pointer before next action starts
     if( !pPos && !pChkBox )
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     // cursor not anymore in this section?
     if( pChkBox && !pPos &&
@@ -809,11 +809,11 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
     // could not restore the content properly.
     if( pChkBox )
     {
-        const SwTxtNode* pNd = GetDoc()->GetNodes()[
-                                    pSttNd->GetIndex() + 1 ]->GetTxtNode();
+        const SwTextNode* pNd = GetDoc()->GetNodes()[
+                                    pSttNd->GetIndex() + 1 ]->GetTextNode();
         if( !pNd ||
-            ( pNd->GetTxt() == SwViewShell::GetShellRes()->aCalc_Error &&
-              SfxItemState::SET == pChkBox->GetFrmFmt()->
+            ( pNd->GetText() == SwViewShell::GetShellRes()->aCalc_Error &&
+              SfxItemState::SET == pChkBox->GetFrameFormat()->
                             GetItemState( RES_BOXATR_FORMULA )) )
             pChkBox = 0;
     }
@@ -821,18 +821,18 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
     if( pChkBox )
     {
         // destroy pointer before next action starts
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
         StartAction();
-        GetDoc()->ChkBoxNumFmt( *pChkBox, true );
+        GetDoc()->ChkBoxNumFormat( *pChkBox, true );
         EndAction();
     }
 
     return 0 != pChkBox;
 }
 
-void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwCrsrShell::SaveTableBoxContent( const SwPosition* pPos )
 {
-    if( IsSelTblCells() || !IsAutoUpdateCells() )
+    if( IsSelTableCells() || !IsAutoUpdateCells() )
         return ;
 
     if( !pPos )
@@ -855,12 +855,12 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
     {
         // check m_pBoxIdx
         SwPosition aPos( *m_pBoxIdx );
-        CheckTblBoxCntnt( &aPos );
+        CheckTableBoxContent( &aPos );
     }
 
     if( pSttNd )
     {
-        m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+        m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
 
         if( m_pBoxIdx )
             *m_pBoxIdx = *pSttNd;
@@ -869,19 +869,19 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
     }
 }
 
-void SwCrsrShell::ClearTblBoxCntnt()
+void SwCrsrShell::ClearTableBoxContent()
 {
     delete m_pBoxIdx, m_pBoxIdx = 0;
     m_pBoxPtr = 0;
 }
 
-bool SwCrsrShell::EndAllTblBoxEdit()
+bool SwCrsrShell::EndAllTableBoxEdit()
 {
     bool bRet = false;
     for(SwViewShell& rSh : GetRingContainer())
     {
         if( rSh.IsA( TYPE( SwCrsrShell ) ) )
-            bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTblBoxCntnt(
+            bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTableBoxContent(
                         static_cast<SwCrsrShell*>(&rSh)->m_pCurCrsr->GetPoint() );
 
     }
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 991c5548612b..1366935e485c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -68,16 +68,16 @@ MapMode* SwSelPaintRects::s_pMapMode = 0;
 SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
     : m_pCrsrShell( pCShell )
 {
-    pCShell->GetWin()->SetCursor( &m_aTxtCrsr );
-    m_bIsVisible = m_aTxtCrsr.IsVisible();
+    pCShell->GetWin()->SetCursor( &m_aTextCrsr );
+    m_bIsVisible = m_aTextCrsr.IsVisible();
     m_bIsDragCrsr = false;
-    m_aTxtCrsr.SetWidth( 0 );
+    m_aTextCrsr.SetWidth( 0 );
 }
 
 SwVisCrsr::~SwVisCrsr()
 {
-    if( m_bIsVisible && m_aTxtCrsr.IsVisible() )
-        m_aTxtCrsr.Hide();
+    if( m_bIsVisible && m_aTextCrsr.IsVisible() )
+        m_aTextCrsr.Hide();
 
     m_pCrsrShell->GetWin()->SetCursor( 0 );
 }
@@ -100,8 +100,8 @@ void SwVisCrsr::Hide()
     {
         m_bIsVisible = false;
 
-        if( m_aTxtCrsr.IsVisible() )      // Shouldn't the flags be in effect?
-            m_aTxtCrsr.Hide();
+        if( m_aTextCrsr.IsVisible() )      // Shouldn't the flags be in effect?
+            m_aTextCrsr.Hide();
     }
 }
 
@@ -112,7 +112,7 @@ void SwVisCrsr::_SetPosAndShow()
     if( 0 > nTmpY )
     {
         nTmpY = -nTmpY;
-        m_aTxtCrsr.SetOrientation( 900 );
+        m_aTextCrsr.SetOrientation( 900 );
         aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
            Size( m_pCrsrShell->m_aCharRect.Height(), nTmpY ) );
         aRect.Pos().setX(aRect.Pos().getX() + m_pCrsrShell->m_aCrsrHeight.getX());
@@ -121,30 +121,30 @@ void SwVisCrsr::_SetPosAndShow()
     }
     else
     {
-        m_aTxtCrsr.SetOrientation( 0 );
+        m_aTextCrsr.SetOrientation( 0 );
         aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
            Size( m_pCrsrShell->m_aCharRect.Width(), nTmpY ) );
         aRect.Pos().setY(aRect.Pos().getY() + m_pCrsrShell->m_aCrsrHeight.getX());
     }
 
     // check if cursor should show the current cursor bidi level
-    m_aTxtCrsr.SetDirection( CursorDirection::NONE );
+    m_aTextCrsr.SetDirection( CursorDirection::NONE );
     const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr();
 
     if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() )
     {
         SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
-        if( rNode.IsTxtNode() )
+        if( rNode.IsTextNode() )
         {
-            const SwTxtNode& rTNd = *rNode.GetTxtNode();
+            const SwTextNode& rTNd = *rNode.GetTextNode();
             const SwFrm* pFrm = rTNd.getLayoutFrm( m_pCrsrShell->GetLayout(), 0, 0, false );
             if ( pFrm )
             {
-                const SwScriptInfo* pSI = static_cast<const SwTxtFrm*>(pFrm)->GetScriptInfo();
+                const SwScriptInfo* pSI = static_cast<const SwTextFrm*>(pFrm)->GetScriptInfo();
                  // cursor level has to be shown
                 if ( pSI && pSI->CountDirChg() > 1 )
                 {
-                    m_aTxtCrsr.SetDirection(
+                    m_aTextCrsr.SetDirection(
                         ( pTmpCrsr->GetCrsrBidiLevel() % 2 ) ?
                           CursorDirection::RTL :
                           CursorDirection::LTR );
@@ -173,9 +173,9 @@ void SwVisCrsr::_SetPosAndShow()
         m_pCrsrShell->IsSelection() )
         aRect.Width( 0 );
 
-    m_aTxtCrsr.SetSize( aRect.SSize() );
+    m_aTextCrsr.SetSize( aRect.SSize() );
 
-    m_aTxtCrsr.SetPos( aRect.Pos() );
+    m_aTextCrsr.SetPos( aRect.Pos() );
 
     if (m_pCrsrShell->isTiledRendering())
     {
@@ -191,13 +191,13 @@ void SwVisCrsr::_SetPosAndShow()
                     !m_pCrsrShell->IsSelection() );
 
         sal_uInt16 nStyle = m_bIsDragCrsr ? CURSOR_SHADOW : 0;
-        if( nStyle != m_aTxtCrsr.GetStyle() )
+        if( nStyle != m_aTextCrsr.GetStyle() )
         {
-            m_aTxtCrsr.SetStyle( nStyle );
-            m_aTxtCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
+            m_aTextCrsr.SetStyle( nStyle );
+            m_aTextCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
         }
 
-        m_aTxtCrsr.Show();
+        m_aTextCrsr.Show();
     }
 }
 
@@ -206,8 +206,8 @@ SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
     , m_pCursorShell( &rCSh )
 #if HAVE_FEATURE_DESKTOP
     , m_pCursorOverlay(nullptr)
-    , m_bShowTxtInputFldOverlay(true)
-    , m_pTxtInputFldOverlay(nullptr)
+    , m_bShowTextInputFieldOverlay(true)
+    , m_pTextInputFieldOverlay(nullptr)
 #endif
 {
 }
@@ -227,13 +227,13 @@ void SwSelPaintRects::swapContent(SwSelPaintRects& rSwap)
     setCursorOverlay(rSwap.getCursorOverlay());
     rSwap.setCursorOverlay(pTempOverlay);
 
-    const bool bTempShowTxtInputFldOverlay = m_bShowTxtInputFldOverlay;
-    m_bShowTxtInputFldOverlay = rSwap.m_bShowTxtInputFldOverlay;
-    rSwap.m_bShowTxtInputFldOverlay = bTempShowTxtInputFldOverlay;
+    const bool bTempShowTextInputFieldOverlay = m_bShowTextInputFieldOverlay;
+    m_bShowTextInputFieldOverlay = rSwap.m_bShowTextInputFieldOverlay;
+    rSwap.m_bShowTextInputFieldOverlay = bTempShowTextInputFieldOverlay;
 
-    sw::overlay::OverlayRangesOutline* pTempTxtInputFldOverlay = m_pTxtInputFldOverlay;
-    m_pTxtInputFldOverlay = rSwap.m_pTxtInputFldOverlay;
-    rSwap.m_pTxtInputFldOverlay = pTempTxtInputFldOverlay;
+    sw::overlay::OverlayRangesOutline* pTempTextInputFieldOverlay = m_pTextInputFieldOverlay;
+    m_pTextInputFieldOverlay = rSwap.m_pTextInputFieldOverlay;
+    rSwap.m_pTextInputFieldOverlay = pTempTextInputFieldOverlay;
 #endif
 }
 
@@ -246,10 +246,10 @@ void SwSelPaintRects::Hide()
         m_pCursorOverlay = nullptr;
     }
 
-    if (m_pTxtInputFldOverlay != nullptr)
+    if (m_pTextInputFieldOverlay != nullptr)
     {
-        delete m_pTxtInputFldOverlay;
-        m_pTxtInputFldOverlay = nullptr;
+        delete m_pTextInputFieldOverlay;
+        m_pTextInputFieldOverlay = nullptr;
     }
 #endif
 
@@ -266,8 +266,8 @@ void SwSelPaintRects::Hide()
  */
 static SwRect lcl_getLayoutRect(const Point& rPoint, const SwPosition& rPosition)
 {
-    const SwCntntNode* pNode = rPosition.nNode.GetNode().GetCntntNode();
-    const SwCntntFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
+    const SwContentNode* pNode = rPosition.nNode.GetNode().GetContentNode();
+    const SwContentFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
     SwRect aRect;
     pFrm->GetCharRect(aRect, rPosition);
     return aRect;
@@ -338,7 +338,7 @@ void SwSelPaintRects::Show()
             }
         }
 
-        HighlightInputFld();
+        HighlightInputField();
 #endif
 
         // Tiled editing does not expose the draw and writer cursor, it just
@@ -384,42 +384,42 @@ void SwSelPaintRects::Show()
     }
 }
 
-void SwSelPaintRects::HighlightInputFld()
+void SwSelPaintRects::HighlightInputField()
 {
-    std::vector< basegfx::B2DRange > aInputFldRanges;
+    std::vector< basegfx::B2DRange > aInputFieldRanges;
 
-    if (m_bShowTxtInputFldOverlay)
+    if (m_bShowTextInputFieldOverlay)
     {
-        SwTxtInputFld* pCurTxtInputFldAtCrsr =
-            dynamic_cast<SwTxtInputFld*>(SwCrsrShell::GetTxtFldAtPos( GetShell()->GetCrsr()->Start(), false ));
-        if ( pCurTxtInputFldAtCrsr != NULL )
+        SwTextInputField* pCurTextInputFieldAtCrsr =
+            dynamic_cast<SwTextInputField*>(SwCrsrShell::GetTextFieldAtPos( GetShell()->GetCrsr()->Start(), false ));
+        if ( pCurTextInputFieldAtCrsr != NULL )
         {
-            SwTxtNode* pTxtNode = pCurTxtInputFldAtCrsr->GetpTxtNode();
-            ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTxtFld(
-                new SwShellCrsr( *GetShell(), SwPosition( *pTxtNode, pCurTxtInputFldAtCrsr->GetStart() ) ) );
-            pCrsrForInputTxtFld->SetMark();
-            pCrsrForInputTxtFld->GetMark()->nNode = *pTxtNode;
-            pCrsrForInputTxtFld->GetMark()->nContent.Assign( pTxtNode, *(pCurTxtInputFldAtCrsr->End()) );
-
-            pCrsrForInputTxtFld->FillRects();
-            SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTxtFld.get());
+            SwTextNode* pTextNode = pCurTextInputFieldAtCrsr->GetpTextNode();
+            ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTextField(
+                new SwShellCrsr( *GetShell(), SwPosition( *pTextNode, pCurTextInputFieldAtCrsr->GetStart() ) ) );
+            pCrsrForInputTextField->SetMark();
+            pCrsrForInputTextField->GetMark()->nNode = *pTextNode;
+            pCrsrForInputTextField->GetMark()->nContent.Assign( pTextNode, *(pCurTextInputFieldAtCrsr->End()) );
+
+            pCrsrForInputTextField->FillRects();
+            SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTextField.get());
             for (size_t a(0); a < pRects->size(); ++a)
             {
                 const SwRect aNextRect((*pRects)[a]);
                 const Rectangle aPntRect(aNextRect.SVRect());
 
-                aInputFldRanges.push_back(basegfx::B2DRange(
+                aInputFieldRanges.push_back(basegfx::B2DRange(
                     aPntRect.Left(), aPntRect.Top(),
                     aPntRect.Right() + 1, aPntRect.Bottom() + 1));
             }
         }
     }
 
-    if ( aInputFldRanges.size() > 0 )
+    if ( aInputFieldRanges.size() > 0 )
     {
-        if (m_pTxtInputFldOverlay != nullptr)
+        if (m_pTextInputFieldOverlay != nullptr)
         {
-            m_pTxtInputFldOverlay->setRanges( aInputFldRanges );
+            m_pTextInputFieldOverlay->setRanges( aInputFieldRanges );
         }
         else
         {
@@ -434,18 +434,18 @@ void SwSelPaintRects::HighlightInputFld()
                 Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
                 aHighlight.DecreaseLuminance( 128 );
 
-                m_pTxtInputFldOverlay = new sw::overlay::OverlayRangesOutline(
-                        aHighlight, aInputFldRanges );
-                xTargetOverlay->add( *m_pTxtInputFldOverlay );
+                m_pTextInputFieldOverlay = new sw::overlay::OverlayRangesOutline(
+                        aHighlight, aInputFieldRanges );
+                xTargetOverlay->add( *m_pTextInputFieldOverlay );
             }
         }
     }
     else
     {
-        if (m_pTxtInputFldOverlay != nullptr)
+        if (m_pTextInputFieldOverlay != nullptr)
         {
-            delete m_pTxtInputFldOverlay;
-            m_pTxtInputFldOverlay = nullptr;
+            delete m_pTextInputFieldOverlay;
+            m_pTextInputFieldOverlay = nullptr;
         }
     }
 }
@@ -556,11 +556,11 @@ void SwShellCrsr::FillRects()
 {
     // calculate the new rectangles
     if( HasMark() &&
-        GetPoint()->nNode.GetNode().IsCntntNode() &&
-        GetPoint()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
+        GetPoint()->nNode.GetNode().IsContentNode() &&
+        GetPoint()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
         (GetMark()->nNode == GetPoint()->nNode ||
-        (GetMark()->nNode.GetNode().IsCntntNode() &&
-         GetMark()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) )   ))
+        (GetMark()->nNode.GetNode().IsContentNode() &&
+         GetMark()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) )   ))
         GetShell()->GetLayout()->CalcFrmRects( *this );
 }
 
@@ -642,9 +642,9 @@ short SwShellCrsr::MaxReplaceArived()
     return nRet;
 }
 
-void SwShellCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellCrsr::SaveTableBoxContent( const SwPosition* pPos )
 {
-    const_cast<SwCrsrShell*>(GetShell())->SaveTblBoxCntnt( pPos );
+    const_cast<SwCrsrShell*>(GetShell())->SaveTableBoxContent( pPos );
 }
 
 bool SwShellCrsr::UpDown( bool bUp, sal_uInt16 nCnt )
@@ -696,9 +696,9 @@ short SwShellTableCrsr::MaxReplaceArived()
     return SwShellCrsr::MaxReplaceArived();
 }
 
-void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellTableCrsr::SaveTableBoxContent( const SwPosition* pPos )
 {
-    SwShellCrsr::SaveTblBoxCntnt( pPos );
+    SwShellCrsr::SaveTableBoxContent( pPos );
 }
 
 void SwShellTableCrsr::FillRects()
@@ -716,20 +716,20 @@ void SwShellTableCrsr::FillRects()
     for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
     {
         const SwStartNode* pSttNd = m_SelectedBoxes[n]->GetSttNd();
-        const SwTableNode* pSelTblNd = pSttNd->FindTableNode();
+        const SwTableNode* pSelTableNd = pSttNd->FindTableNode();
 
         SwNodeIndex aIdx( *pSttNd );
-        SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+        SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
 
         // table in table
         // (see also lcl_FindTopLevelTable in unoobj2.cxx for a different
         // version to do this)
-        const SwTableNode* pCurTblNd = pCNd ? pCNd->FindTableNode() : NULL;
-        while ( pSelTblNd != pCurTblNd && pCurTblNd )
+        const SwTableNode* pCurTableNd = pCNd ? pCNd->FindTableNode() : NULL;
+        while ( pSelTableNd != pCurTableNd && pCurTableNd )
         {
-            aIdx = pCurTblNd->EndOfSectionIndex();
+            aIdx = pCurTableNd->EndOfSectionIndex();
             pCNd = rNds.GoNextSection( &aIdx, true, false );
-            pCurTblNd = pCNd->FindTableNode();
+            pCurTableNd = pCNd->FindTableNode();
         }
 
         if( !pCNd )
@@ -780,7 +780,7 @@ bool SwShellTableCrsr::IsInside( const Point& rPt ) const
     for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
     {
         SwNodeIndex aIdx( *m_SelectedBoxes[n]->GetSttNd() );
-        SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+        SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
         if( !pCNd )
             continue;
 
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 1f0260e1c1d0..119376d84e3d 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -54,16 +54,16 @@ namespace
     static const int BEHIND_SAME_NODE = 3;     // Same node index but content index behind given content index
     static const int BEHIND_NODE = 4;          // Position behind the given node index
 
-    static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nCntnt )
+    static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nContent )
     {
         sal_uLong nIndex = rPos.nNode.GetIndex();
         int nReturn = BEFORE_NODE;
         if( nIndex == nNode )
         {
             const sal_Int32 nCntIdx = rPos.nContent.GetIndex();
-            if( nCntIdx < nCntnt )
+            if( nCntIdx < nContent )
                 nReturn = BEFORE_SAME_NODE;
-            else if( nCntIdx == nCntnt )
+            else if( nCntIdx == nContent )
                 nReturn = SAME_POSITION;
             else
                 nReturn = BEHIND_SAME_NODE;
@@ -76,11 +76,11 @@ namespace
     {
         long int m_nIdx;
         bool m_bOther;
-        sal_Int32 m_nCntnt;
+        sal_Int32 m_nContent;
 #if 0
         void Dump()
         {
-            SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nCntnt);
+            SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nContent);
         }
 #endif
     };
@@ -88,33 +88,33 @@ namespace
     {
         SwPaM* m_pPaM;
         bool m_isMark;
-        sal_Int32 m_nCntnt;
+        sal_Int32 m_nContent;
     };
     struct OffsetUpdater
     {
-        const SwCntntNode* m_pNewCntntNode;
+        const SwContentNode* m_pNewContentNode;
         const sal_Int32 m_nOffset;
-        OffsetUpdater(SwCntntNode* pNewCntntNode, sal_Int32 nOffset)
-            : m_pNewCntntNode(pNewCntntNode), m_nOffset(nOffset) {};
-        void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+        OffsetUpdater(SwContentNode* pNewContentNode, sal_Int32 nOffset)
+            : m_pNewContentNode(pNewContentNode), m_nOffset(nOffset) {};
+        void operator()(SwPosition& rPos, sal_Int32 nContent) const
         {
-            rPos.nNode = *m_pNewCntntNode;
-            rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), nCntnt + m_nOffset);
+            rPos.nNode = *m_pNewContentNode;
+            rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), nContent + m_nOffset);
         };
     };
     struct LimitUpdater
     {
-        const SwCntntNode* m_pNewCntntNode;
+        const SwContentNode* m_pNewContentNode;
         const sal_uLong m_nLen;
         const sal_Int32 m_nCorrLen;
-        LimitUpdater(SwCntntNode* pNewCntntNode, sal_uLong nLen, sal_Int32 nCorrLen)
-            : m_pNewCntntNode(pNewCntntNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
-        void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+        LimitUpdater(SwContentNode* pNewContentNode, sal_uLong nLen, sal_Int32 nCorrLen)
+            : m_pNewContentNode(pNewContentNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
+        void operator()(SwPosition& rPos, sal_Int32 nContent) const
         {
-            rPos.nNode = *m_pNewCntntNode;
-            if( nCntnt < m_nCorrLen )
+            rPos.nNode = *m_pNewContentNode;
+            if( nContent < m_nCorrLen )
             {
-                rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), std::min( nCntnt, static_cast<sal_Int32>(m_nLen) ) );
+                rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), std::min( nContent, static_cast<sal_Int32>(m_nLen) ) );
             }
             else
             {
@@ -122,14 +122,14 @@ namespace
             }
         };
     };
-    struct CntntIdxStoreImpl : sw::mark::CntntIdxStore
+    struct ContentIdxStoreImpl : sw::mark::ContentIdxStore
     {
         std::vector<MarkEntry> m_aBkmkEntries;
         std::vector<MarkEntry> m_aRedlineEntries;
         std::vector<MarkEntry> m_aFlyEntries;
         std::vector<PaMEntry> m_aUnoCrsrEntries;
         std::vector<PaMEntry> m_aShellCrsrEntries;
-        typedef boost::function<void (SwPosition& rPos, sal_Int32 nCntnt)> updater_t;
+        typedef boost::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t;
         virtual void Clear() SAL_OVERRIDE
         {
             m_aBkmkEntries.clear();
@@ -142,17 +142,17 @@ namespace
         {
             return m_aBkmkEntries.empty() && m_aRedlineEntries.empty() && m_aFlyEntries.empty() && m_aUnoCrsrEntries.empty() && m_aShellCrsrEntries.empty();
         }
-        virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit=false) SAL_OVERRIDE
+        virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) SAL_OVERRIDE
         {
-            SaveBkmks(pDoc, nNode, nCntnt);
-            SaveRedlines(pDoc, nNode, nCntnt);
-            SaveFlys(pDoc, nNode, nCntnt, bSaveFlySplit);
-            SaveUnoCrsrs(pDoc, nNode, nCntnt);
-            SaveShellCrsrs(pDoc, nNode, nCntnt);
+            SaveBkmks(pDoc, nNode, nContent);
+            SaveRedlines(pDoc, nNode, nContent);
+            SaveFlys(pDoc, nNode, nContent, bSaveFlySplit);
+            SaveUnoCrsrs(pDoc, nNode, nContent);
+            SaveShellCrsrs(pDoc, nNode, nContent);
         }
         virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) SAL_OVERRIDE
         {
-            SwCntntNode* pCNd = pDoc->GetNodes()[ nNode ]->GetCntntNode();
+            SwContentNode* pCNd = pDoc->GetNodes()[ nNode ]->GetContentNode();
             updater_t aUpdater = OffsetUpdater(pCNd, nOffset);
             RestoreBkmks(pDoc, aUpdater);
             RestoreRedlines(pDoc, aUpdater);
@@ -162,7 +162,7 @@ namespace
         }
         virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) SAL_OVERRIDE
         {
-            SwCntntNode* pCNd = rNd.GetCntntNode();
+            SwContentNode* pCNd = rNd.GetContentNode();
             SwDoc* pDoc = rNd.GetDoc();
             updater_t aUpdater = LimitUpdater(pCNd, nLen, nCorrLen);
             RestoreBkmks(pDoc, aUpdater);
@@ -171,36 +171,36 @@ namespace
             RestoreUnoCrsrs(aUpdater);
             RestoreShellCrsrs(aUpdater);
         }
-        virtual ~CntntIdxStoreImpl(){};
+        virtual ~ContentIdxStoreImpl(){};
         private:
-            inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater);
-            inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater);
-            inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit);
+            inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit);
             inline void RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto);
-            inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreUnoCrsrs(updater_t& rUpdater);
-            inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreShellCrsrs(updater_t& rUpdater);
             static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
                 { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
             static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
                 { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
     };
-    static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM, const bool bPoint)
+    static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bPoint)
     {
         const SwPosition* pPos = &rPaM.GetBound( bPoint );
-        if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nCntnt )
+        if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nContent )
         {
             const PaMEntry aEntry = { &rPaM, bPoint, pPos->nContent.GetIndex() };
             rPaMEntries.push_back(aEntry);
         }
     }
-    static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM)
+    static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM)
     {
-        lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, true);
-        lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, false);
+        lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, true);
+        lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, false);
     }
 
 #if 0
@@ -212,7 +212,7 @@ namespace
 #endif
 }
 
-void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
     IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     const IDocumentMarkAccess::const_iterator_t ppBkmkEnd = pMarkAccess->getAllMarksEnd();
@@ -224,19 +224,19 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
         const ::sw::mark::IMark* pBkmk = ppBkmk->get();
         bool bMarkPosEqual = false;
         if(pBkmk->GetMarkPos().nNode.GetIndex() == nNode
-            && pBkmk->GetMarkPos().nContent.GetIndex() <= nCntnt)
+            && pBkmk->GetMarkPos().nContent.GetIndex() <= nContent)
         {
-            if(pBkmk->GetMarkPos().nContent.GetIndex() < nCntnt)
+            if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent)
             {
                 const MarkEntry aEntry = { ppBkmk - pMarkAccess->getAllMarksBegin(), false, pBkmk->GetMarkPos().nContent.GetIndex() };
                 m_aBkmkEntries.push_back(aEntry);
             }
-            else // if a bookmark position is equal nCntnt, the other position
+            else // if a bookmark position is equal nContent, the other position
                 bMarkPosEqual = true; // has to decide if it is added to the array
         }
         if(pBkmk->IsExpanded()
             && pBkmk->GetOtherMarkPos().nNode.GetIndex() == nNode
-            && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nCntnt)
+            && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nContent)
         {
             if(bMarkPosEqual)
             { // the other position is before, the (main) position is equal
@@ -249,7 +249,7 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
     }
 }
 
-void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
 {
     IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     for (const MarkEntry& aEntry : m_aBkmkEntries)
@@ -257,20 +257,20 @@ void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
         if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aEntry.m_nIdx].get()))
         {
             SwPosition aNewPos(GetRightMarkPos(pMark, aEntry.m_bOther));
-            rUpdater(aNewPos, aEntry.m_nCntnt);
+            rUpdater(aNewPos, aEntry.m_nContent);
             SetRightMarkPos(pMark, aEntry.m_bOther, &aNewPos);
         }
     }
 }
 
-void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
-    SwRedlineTbl const & pRedlineTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+    SwRedlineTable const & pRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
     long int nIdx = 0;
-    for (const SwRangeRedline* pRdl : pRedlineTbl)
+    for (const SwRangeRedline* pRdl : pRedlineTable)
     {
-        int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nCntnt );
-        int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nCntnt ) :
+        int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nContent );
+        int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nContent ) :
                                           nPointPos;
         // #i59534: We have to store the positions inside the same node before the insert position
         // and the one at the insert position if the corresponding Point/Mark position is before
@@ -291,21 +291,21 @@ void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCn
     }
 }
 
-void CntntIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
 {
-    const SwRedlineTbl& rRedlTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rRedlTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
     for (const MarkEntry& aEntry : m_aRedlineEntries)
     {
         SwPosition* const pPos = aEntry.m_bOther
-            ? rRedlTbl[ aEntry.m_nIdx ]->GetMark()
-            : rRedlTbl[ aEntry.m_nIdx ]->GetPoint();
-        rUpdater(*pPos, aEntry.m_nCntnt);
+            ? rRedlTable[ aEntry.m_nIdx ]->GetMark()
+            : rRedlTable[ aEntry.m_nIdx ]->GetPoint();
+        rUpdater(*pPos, aEntry.m_nContent);
     }
 }
 
-void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit)
+void ContentIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit)
 {
-    SwCntntNode *pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+    SwContentNode *pNode = pDoc->GetNodes()[nNode]->GetContentNode();
     if( !pNode )
         return;
     SwFrm* pFrm = pNode->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
@@ -315,22 +315,22 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
             return; // if we have a layout and no DrawObjs, we can skip this
     }
     MarkEntry aSave = { 0, false, 0 };
-    for (const SwFrmFmt* pFrmFmt : *pDoc->GetSpzFrmFmts())
+    for (const SwFrameFormat* pFrameFormat : *pDoc->GetSpzFrameFormats())
     {
-        if ( RES_FLYFRMFMT == pFrmFmt->Which() || RES_DRAWFRMFMT == pFrmFmt->Which() )
+        if ( RES_FLYFRMFMT == pFrameFormat->Which() || RES_DRAWFRMFMT == pFrameFormat->Which() )
         {
-            const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if ( pAPos && ( nNode == pAPos->nNode.GetIndex() ) &&
                  ( FLY_AT_PARA == rAnchor.GetAnchorId() ||
                    FLY_AT_CHAR == rAnchor.GetAnchorId() ) )
             {
                 bool bSkip = false;
                 aSave.m_bOther = false;
-                aSave.m_nCntnt = pAPos->nContent.GetIndex();
+                aSave.m_nContent = pAPos->nContent.GetIndex();
                 if ( FLY_AT_CHAR == rAnchor.GetAnchorId() )
                 {
-                    if( nCntnt <= aSave.m_nCntnt )
+                    if( nContent <= aSave.m_nContent )
                     {
                         if( bSaveFlySplit )
                             aSave.m_bOther = true;
@@ -346,65 +346,65 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
     }
 }
 
-void CntntIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
+void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
 {
-    SwFrmFmts* pSpz = pDoc->GetSpzFrmFmts();
+    SwFrameFormats* pSpz = pDoc->GetSpzFrameFormats();
     for (const MarkEntry& aEntry : m_aFlyEntries)
     {
         if(!aEntry.m_bOther)
         {
-            SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
-            const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor();
-            if( rFlyAnchor.GetCntntAnchor() )
+            SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+            const SwFormatAnchor& rFlyAnchor = pFrameFormat->GetAnchor();
+            if( rFlyAnchor.GetContentAnchor() )
             {
-                SwFmtAnchor aNew( rFlyAnchor );
-                SwPosition aNewPos( *rFlyAnchor.GetCntntAnchor() );
-                rUpdater(aNewPos, aEntry.m_nCntnt);
+                SwFormatAnchor aNew( rFlyAnchor );
+                SwPosition aNewPos( *rFlyAnchor.GetContentAnchor() );
+                rUpdater(aNewPos, aEntry.m_nContent);
                 if ( FLY_AT_CHAR != rFlyAnchor.GetAnchorId() )
                 {
                     aNewPos.nContent.Assign( 0, 0 );
                 }
                 aNew.SetAnchor( &aNewPos );
-                pFrmFmt->SetFmtAttr( aNew );
+                pFrameFormat->SetFormatAttr( aNew );
             }
         }
         else if( bAuto )
         {
-            SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
-            SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrmFmt->GetAnchor();
-            pFrmFmt->NotifyClients( pAnchor, pAnchor );
+            SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+            SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrameFormat->GetAnchor();
+            pFrameFormat->NotifyClients( pAnchor, pAnchor );
         }
     }
 }
 
-void CntntIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
-    for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTbl())
+    for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTable())
     {
         for(SwPaM& rPaM : (const_cast<SwUnoCrsr*>(pUnoCrsr))->GetRingContainer())
         {
-            lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+            lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
         }
-        const SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
-        if( pUnoTblCrsr )
+        const SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
+        if( pUnoTableCrsr )
         {
-            for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTblCrsr))->GetSelRing())->GetRingContainer())
+            for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTableCrsr))->GetSelRing())->GetRingContainer())
             {
-                lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+                lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
             }
         }
     }
 }
 
-void CntntIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
 {
     for (const PaMEntry& aEntry : m_aUnoCrsrEntries)
     {
-        rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nCntnt);
+        rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nContent);
     }
 }
 
-void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
     SwCrsrShell* pShell = pDoc->GetEditShell();
     if( !pShell )
@@ -416,30 +416,30 @@ void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 n
             SwPaM *_pStkCrsr = static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr();
             if( _pStkCrsr )
                 do {
-                    lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, *_pStkCrsr);
+                    lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, *_pStkCrsr);
                 } while ( (_pStkCrsr != 0 ) &&
                     ((_pStkCrsr = _pStkCrsr->GetNext()) != static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr()) );
 
             for(SwPaM& rPaM : (static_cast<SwCrsrShell*>(&rCurShell)->_GetCrsr())->GetRingContainer())
             {
-                lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, rPaM);
+                lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, rPaM);
             }
         }
     }
 }
 
-void CntntIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
 {
     for (const PaMEntry& aEntry : m_aShellCrsrEntries)
     {
-        rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nCntnt);
+        rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nContent);
     }
 }
 
 namespace sw { namespace mark {
-    std::shared_ptr<CntntIdxStore> CntntIdxStore::Create()
+    std::shared_ptr<ContentIdxStore> ContentIdxStore::Create()
     {
-       return std::make_shared<CntntIdxStoreImpl>();
+       return std::make_shared<ContentIdxStoreImpl>();
     }
 }}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index cd8d0e3352d1..a24cd7b22517 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -58,7 +58,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
 {
     if (pTable)
     {
-        OUString aName( pTable->GetFrmFmt()->GetName() );
+        OUString aName( pTable->GetFrameFormat()->GetName() );
         SwOLENode *pONd;
         SwStartNode *pStNd;
         SwNodeIndex aIdx( *m_rDoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -66,7 +66,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
         {
             ++aIdx;
             if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-                aName == pONd->GetChartTblName() /* OLE node is chart? */ &&
+                aName == pONd->GetChartTableName() /* OLE node is chart? */ &&
                 0 != (pONd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not hidden */ )
             {
                 uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 349e457de7dc..06c0c4c8ad82 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -83,13 +83,13 @@ namespace
     static bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
                         sal_uLong nInsNd )
     {
-        const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+        const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
-        for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+        for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
         {
-            SwFrmFmt const*const  pFmt = rFrmFmtTbl[n];
-            SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-            SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+            SwFrameFormat const*const  pFormat = rFrameFormatTable[n];
+            SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+            SwPosition const*const pAPos = pAnchor->GetContentAnchor();
             if (pAPos &&
                 ((FLY_AS_CHAR == pAnchor->GetAnchorId()) ||
                  (FLY_AT_CHAR == pAnchor->GetAnchorId()) ||
@@ -98,10 +98,10 @@ namespace
                 nSttNd <= pAPos->nNode.GetIndex() &&
                 pAPos->nNode.GetIndex() < nEndNd )
             {
-                const SwFmtCntnt& rCntnt = pFmt->GetCntnt();
+                const SwFormatContent& rContent = pFormat->GetContent();
                 SwStartNode* pSNd;
-                if( !rCntnt.GetCntntIdx() ||
-                    0 == ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ))
+                if( !rContent.GetContentIdx() ||
+                    0 == ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ))
                     continue;
 
                 if( pSNd->GetIndex() < nInsNd &&
@@ -169,20 +169,20 @@ namespace
         sal_uLong nNdOff = rOrigPos.nNode.GetIndex();
         nNdOff -= rOrigStt.nNode.GetIndex();
         nNdOff -= nDelCount;
-        sal_Int32 nCntntPos = rOrigPos.nContent.GetIndex();
+        sal_Int32 nContentPos = rOrigPos.nContent.GetIndex();
 
         // Always adjust <nNode> at to be changed <SwPosition> instance <rChgPos>
         rChgPos.nNode = nNdOff + rCpyStt.nNode.GetIndex();
         if( !nNdOff )
         {
             // dann nur den Content anpassen
-            if( nCntntPos > rOrigStt.nContent.GetIndex() )
-                nCntntPos -= rOrigStt.nContent.GetIndex();
+            if( nContentPos > rOrigStt.nContent.GetIndex() )
+                nContentPos -= rOrigStt.nContent.GetIndex();
             else
-                nCntntPos = 0;
-            nCntntPos += rCpyStt.nContent.GetIndex();
+                nContentPos = 0;
+            nContentPos += rCpyStt.nContent.GetIndex();
         }
-        rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetCntntNode(), nCntntPos );
+        rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetContentNode(), nContentPos );
     }
 
     // TODO: use SaveBookmark (from _DelBookmarks)
@@ -288,8 +288,8 @@ namespace
     static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
     {
         const SwDoc* pSrcDoc = rPam.GetDoc();
-        const SwRedlineTbl& rTbl = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        if( !rTbl.empty() )
+        const SwRedlineTable& rTable = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        if( !rTable.empty() )
         {
             SwDoc* pDestDoc = rCpyPam.GetDoc();
             SwPosition* pCpyStt = rCpyPam.Start(), *pCpyEnd = rCpyPam.End();
@@ -301,9 +301,9 @@ namespace
 
             sal_uInt16 n = 0;
             pSrcDoc->getIDocumentRedlineAccess().GetRedline( *pStt, &n );
-            for( ; n < rTbl.size(); ++n )
+            for( ; n < rTable.size(); ++n )
             {
-                const SwRangeRedline* pRedl = rTbl[ n ];
+                const SwRangeRedline* pRedl = rTable[ n ];
                 if( nsRedlineType_t::REDLINE_DELETE == pRedl->GetType() && pRedl->IsVisible() )
                 {
                     const SwPosition *pRStt = pRedl->Start(), *pREnd = pRedl->End();
@@ -319,7 +319,7 @@ namespace
                     case POS_COLLIDE_START:
                     case POS_BEHIND:
                         // Pos1 is after Pos2
-                        n = rTbl.size();
+                        n = rTable.size();
                         break;
 
                     default:
@@ -369,7 +369,7 @@ namespace
     static void lcl_DeleteRedlines( const SwNodeRange& rRg, SwNodeRange& rCpyRg )
     {
         SwDoc* pSrcDoc = rRg.aStart.GetNode().GetDoc();
-        if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+        if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
         {
             SwPaM aRgTmp( rRg.aStart, rRg.aEnd );
             SwPaM aCpyTmp( rCpyRg.aStart, rCpyRg.aEnd );
@@ -377,19 +377,19 @@ namespace
         }
     }
 
-    static void lcl_ChainFmts( SwFlyFrmFmt *pSrc, SwFlyFrmFmt *pDest )
+    static void lcl_ChainFormats( SwFlyFrameFormat *pSrc, SwFlyFrameFormat *pDest )
     {
-        SwFmtChain aSrc( pSrc->GetChain() );
+        SwFormatChain aSrc( pSrc->GetChain() );
         if ( !aSrc.GetNext() )
         {
             aSrc.SetNext( pDest );
-            pSrc->SetFmtAttr( aSrc );
+            pSrc->SetFormatAttr( aSrc );
         }
-        SwFmtChain aDest( pDest->GetChain() );
+        SwFormatChain aDest( pDest->GetChain() );
         if ( !aDest.GetPrev() )
         {
             aDest.SetPrev( pSrc );
-            pDest->SetFmtAttr( aDest );
+            pDest->SetFormatAttr( aDest );
         }
     }
 
@@ -398,10 +398,10 @@ namespace
     {
         bool bRet = false;
 
-        const SwTxtNode* pTxtNd = rPam.Start()->nNode.GetNode().GetTxtNode();
-        const SwTxtNode* pEndTxtNd = rPam.End()->nNode.GetNode().GetTxtNode();
-        if ( pTxtNd && pTxtNd->IsInList() &&
-             pEndTxtNd && pEndTxtNd->IsInList() )
+        const SwTextNode* pTextNd = rPam.Start()->nNode.GetNode().GetTextNode();
+        const SwTextNode* pEndTextNd = rPam.End()->nNode.GetNode().GetTextNode();
+        if ( pTextNd && pTextNd->IsInList() &&
+             pEndTextNd && pEndTextNd->IsInList() )
         {
             bRet = true;
             SwNodeIndex aIdx(rPam.Start()->nNode);
@@ -409,14 +409,14 @@ namespace
             do
             {
                 ++aIdx;
-                pTxtNd = aIdx.GetNode().GetTxtNode();
+                pTextNd = aIdx.GetNode().GetTextNode();
 
-                if ( !pTxtNd || !pTxtNd->IsInList() )
+                if ( !pTextNd || !pTextNd->IsInList() )
                 {
                     bRet = false;
                     break;
                 }
-            } while ( pTxtNd && pTxtNd != pEndTxtNd );
+            } while ( pTextNd && pTextNd != pEndTextNd );
         }
 
         return bRet;
@@ -430,8 +430,8 @@ namespace
 
         if (NULL != pStt && NULL != pEnd)
         {
-            const SwTxtNode* pSttNd = pStt->nNode.GetNode().GetTxtNode();
-            const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+            const SwTextNode* pSttNd = pStt->nNode.GetNode().GetTextNode();
+            const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
 
             if (NULL != pSttNd && NULL != pEndNd &&
                 pStt->nContent.GetIndex() == 0 &&
@@ -451,25 +451,25 @@ namespace
     static void
     lcl_CalcBreaks( ::std::vector<sal_Int32> & rBreaks, SwPaM const & rPam )
     {
-        SwTxtNode const * const pTxtNode(
-                rPam.End()->nNode.GetNode().GetTxtNode() );
-        if (!pTxtNode)
+        SwTextNode const * const pTextNode(
+                rPam.End()->nNode.GetNode().GetTextNode() );
+        if (!pTextNode)
             return; // left-overlap only possible at end of selection...
 
         const sal_Int32 nStart(rPam.Start()->nContent.GetIndex());
         const sal_Int32 nEnd  (rPam.End  ()->nContent.GetIndex());
-        if (nEnd == pTxtNode->Len())
+        if (nEnd == pTextNode->Len())
             return; // paragraph selected until the end
 
         for (sal_Int32 i = nStart; i < nEnd; ++i)
         {
-            const sal_Unicode c(pTxtNode->GetTxt()[i]);
+            const sal_Unicode c(pTextNode->GetText()[i]);
             if ((CH_TXTATR_INWORD == c) || (CH_TXTATR_BREAKWORD == c))
             {
-                SwTxtAttr const * const pAttr( pTxtNode->GetTxtAttrForCharAt(i) );
+                SwTextAttr const * const pAttr( pTextNode->GetTextAttrForCharAt(i) );
                 if (pAttr && pAttr->End() && (*pAttr->End() > nEnd))
                 {
-                    OSL_ENSURE(pAttr->HasDummyChar(), "GetTxtAttrForCharAt broken?");
+                    OSL_ENSURE(pAttr->HasDummyChar(), "GetTextAttrForCharAt broken?");
                     rBreaks.push_back(i);
                 }
             }
@@ -529,11 +529,11 @@ namespace
         if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
         {
             const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
-            const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
-            if( (0 != pEndNd) && pStt->nNode.GetNode().IsTxtNode() )
+            const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
+            if( (0 != pEndNd) && pStt->nNode.GetNode().IsTextNode() )
             {
                 const sal_uInt64 nSum = pStt->nContent.GetIndex() +
-                    pEndNd->GetTxt().getLength() - pEnd->nContent.GetIndex();
+                    pEndNd->GetText().getLength() - pEnd->nContent.GetIndex();
                 return nSum > static_cast<sal_uInt64>(SAL_MAX_INT32);
             }
         }
@@ -598,22 +598,22 @@ namespace
         void SetPos( sal_uInt32 nInsPos )
         {
             pRedl->GetPoint()->nNode = nInsPos + nStt;
-            pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt );
+            pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt );
             if( pRedl->HasMark() )
             {
                 pRedl->GetMark()->nNode = nInsPos + nEnd;
-                pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt );
+                pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt );
             }
         }
 
         void SetPos( const SwPosition& aPos )
         {
             pRedl->GetPoint()->nNode = aPos.nNode.GetIndex() + nStt;
-            pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
+            pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
             if( pRedl->HasMark() )
             {
                 pRedl->GetMark()->nNode = aPos.nNode.GetIndex() + nEnd;
-                pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt  + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
+                pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt  + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
             }
         }
     };
@@ -639,7 +639,7 @@ namespace
 
         // iterate over relevant redlines and decide for each whether it should
         // be saved, or split + saved
-        SwRedlineTbl& rRedlineTable = const_cast<SwRedlineTbl&>( pDoc->getIDocumentRedlineAccess().GetRedlineTbl() );
+        SwRedlineTable& rRedlineTable = const_cast<SwRedlineTable&>( pDoc->getIDocumentRedlineAccess().GetRedlineTable() );
         for( ; nCurrentRedline < rRedlineTable.size(); nCurrentRedline++ )
         {
             SwRangeRedline* pCurrent = rRedlineTable[ nCurrentRedline ];
@@ -706,18 +706,18 @@ namespace
         SwDoc* pDoc = rRg.aStart.GetNode().GetDoc();
         sal_uInt16 nRedlPos;
         SwPosition aSrchPos( rRg.aStart ); aSrchPos.nNode--;
-        aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetCntntNode(), 0 );
+        aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetContentNode(), 0 );
         if( pDoc->getIDocumentRedlineAccess().GetRedline( aSrchPos, &nRedlPos ) && nRedlPos )
             --nRedlPos;
-        else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
+        else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() )
             return ;
 
         RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
-        SwRedlineTbl& rRedlTbl = (SwRedlineTbl&)pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        SwRedlineTable& rRedlTable = (SwRedlineTable&)pDoc->getIDocumentRedlineAccess().GetRedlineTable();
 
         do {
-            SwRangeRedline* pTmp = rRedlTbl[ nRedlPos ];
+            SwRangeRedline* pTmp = rRedlTable[ nRedlPos ];
 
             const SwPosition* pRStt = pTmp->Start(),
                             * pREnd = pTmp->GetMark() == pRStt
@@ -733,7 +733,7 @@ namespace
                     SwPosition* pTmpPos = pNewRedl->Start();
                     pTmpPos->nNode = rRg.aStart;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
                     _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
                     rArr.push_back( pSave );
@@ -741,19 +741,19 @@ namespace
                     pTmpPos = pTmp->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                 }
                 else if( pREnd->nNode == rRg.aStart )
                 {
                     SwPosition* pTmpPos = pTmp->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                 }
             }
             else if( pRStt->nNode < rRg.aEnd )
             {
-                rRedlTbl.Remove( nRedlPos-- );
+                rRedlTable.Remove( nRedlPos-- );
                 if( pREnd->nNode < rRg.aEnd ||
                     ( pREnd->nNode == rRg.aEnd && !pREnd->nContent.GetIndex()) )
                 {
@@ -768,7 +768,7 @@ namespace
                     SwPosition* pTmpPos = pNewRedl->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
                     _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
                     rArr.push_back( pSave );
@@ -776,14 +776,14 @@ namespace
                     pTmpPos = pTmp->Start();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                     pDoc->getIDocumentRedlineAccess().AppendRedline( pTmp, true );
                 }
             }
             else
                 break;
 
-        } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() );
+        } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() );
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
 
@@ -801,110 +801,110 @@ namespace
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
 
-    static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
+    static bool lcl_SaveFootnote( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
                      const SwNodeIndex& rInsPos,
-                     SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr,
+                     SwFootnoteIdxs& rFootnoteArr, SwFootnoteIdxs& rSaveArr,
                      const SwIndex* pSttCnt = 0, const SwIndex* pEndCnt = 0 )
     {
-        bool bUpdateFtn = false;
+        bool bUpdateFootnote = false;
         const SwNodes& rNds = rInsPos.GetNodes();
-        const bool bDelFtn = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
+        const bool bDelFootnote = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
                     rSttNd.GetIndex() >= rNds.GetEndOfAutotext().GetIndex();
-        const bool bSaveFtn = !bDelFtn &&
+        const bool bSaveFootnote = !bDelFootnote &&
                         rInsPos.GetIndex() >= rNds.GetEndOfExtras().GetIndex();
-        if( !rFtnArr.empty() )
+        if( !rFootnoteArr.empty() )
         {
 
             size_t nPos = 0;
-            rFtnArr.SeekEntry( rSttNd, &nPos );
-            SwTxtFtn* pSrch;
-            const SwNode* pFtnNd;
+            rFootnoteArr.SeekEntry( rSttNd, &nPos );
+            SwTextFootnote* pSrch;
+            const SwNode* pFootnoteNd;
 
             // Delete/save all that come after it
-            while( nPos < rFtnArr.size() && ( pFtnNd =
-                &( pSrch = rFtnArr[ nPos ] )->GetTxtNode())->GetIndex()
+            while( nPos < rFootnoteArr.size() && ( pFootnoteNd =
+                &( pSrch = rFootnoteArr[ nPos ] )->GetTextNode())->GetIndex()
                         <= rEndNd.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
                 if( ( pEndCnt && pSttCnt )
-                    ? (( &rSttNd.GetNode() == pFtnNd &&
-                         pSttCnt->GetIndex() > nFtnSttIdx) ||
-                       ( &rEndNd.GetNode() == pFtnNd &&
-                        nFtnSttIdx >= pEndCnt->GetIndex() ))
-                    : ( &rEndNd.GetNode() == pFtnNd ))
+                    ? (( &rSttNd.GetNode() == pFootnoteNd &&
+                         pSttCnt->GetIndex() > nFootnoteSttIdx) ||
+                       ( &rEndNd.GetNode() == pFootnoteNd &&
+                        nFootnoteSttIdx >= pEndCnt->GetIndex() ))
+                    : ( &rEndNd.GetNode() == pFootnoteNd ))
                 {
                     ++nPos;     // continue searching
                 }
                 else
                 {
                     // delete it
-                    if( bDelFtn )
+                    if( bDelFootnote )
                     {
-                        SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
-                        SwIndex aIdx( &rTxtNd, nFtnSttIdx );
-                        rTxtNd.EraseText( aIdx, 1 );
+                        SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+                        SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+                        rTextNd.EraseText( aIdx, 1 );
                     }
                     else
                     {
                         pSrch->DelFrms(0);
-                        rFtnArr.erase( rFtnArr.begin() + nPos );
-                        if( bSaveFtn )
+                        rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+                        if( bSaveFootnote )
                             rSaveArr.insert( pSrch );
                     }
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
                 }
             }
 
-            while( nPos-- && ( pFtnNd = &( pSrch = rFtnArr[ nPos ] )->
-                    GetTxtNode())->GetIndex() >= rSttNd.GetIndex() )
+            while( nPos-- && ( pFootnoteNd = &( pSrch = rFootnoteArr[ nPos ] )->
+                    GetTextNode())->GetIndex() >= rSttNd.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
                 if( !pEndCnt || !pSttCnt ||
-                    !( (( &rSttNd.GetNode() == pFtnNd &&
-                        pSttCnt->GetIndex() > nFtnSttIdx ) ||
-                       ( &rEndNd.GetNode() == pFtnNd &&
-                        nFtnSttIdx >= pEndCnt->GetIndex() )) ))
+                    !( (( &rSttNd.GetNode() == pFootnoteNd &&
+                        pSttCnt->GetIndex() > nFootnoteSttIdx ) ||
+                       ( &rEndNd.GetNode() == pFootnoteNd &&
+                        nFootnoteSttIdx >= pEndCnt->GetIndex() )) ))
                 {
-                    if( bDelFtn )
+                    if( bDelFootnote )
                     {
                         // delete it
-                        SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
-                        SwIndex aIdx( &rTxtNd, nFtnSttIdx );
-                        rTxtNd.EraseText( aIdx, 1 );
+                        SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+                        SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+                        rTextNd.EraseText( aIdx, 1 );
                     }
                     else
                     {
                         pSrch->DelFrms(0);
-                        rFtnArr.erase( rFtnArr.begin() + nPos );
-                        if( bSaveFtn )
+                        rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+                        if( bSaveFootnote )
                             rSaveArr.insert( pSrch );
                     }
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
                 }
             }
         }
         // When moving from redline section into document content section, e.g.
         // after loading a document with (delete-)redlines, the footnote array
         // has to be adjusted... (#i70572)
-        if( bSaveFtn )
+        if( bSaveFootnote )
         {
             SwNodeIndex aIdx( rSttNd );
             while( aIdx < rEndNd ) // Check the moved section
             {
                 SwNode* pNode = &aIdx.GetNode();
-                if( pNode->IsTxtNode() ) // Looking for text nodes...
+                if( pNode->IsTextNode() ) // Looking for text nodes...
                 {
-                    SwpHints *pHints = pNode->GetTxtNode()->GetpSwpHints();
-                    if( pHints && pHints->HasFtn() ) //...with footnotes
+                    SwpHints *pHints = pNode->GetTextNode()->GetpSwpHints();
+                    if( pHints && pHints->HasFootnote() ) //...with footnotes
                     {
-                        bUpdateFtn = true; // Heureka
+                        bUpdateFootnote = true; // Heureka
                         const size_t nCount = pHints->Count();
                         for( size_t i = 0; i < nCount; ++i )
                         {
-                            SwTxtAttr *pAttr = pHints->GetTextHint( i );
+                            SwTextAttr *pAttr = pHints->GetTextHint( i );
                             if ( pAttr->Which() == RES_TXTATR_FTN )
                             {
-                                rSaveArr.insert( static_cast<SwTxtFtn*>(pAttr) );
+                                rSaveArr.insert( static_cast<SwTextFootnote*>(pAttr) );
                             }
                         }
                     }
@@ -912,17 +912,17 @@ namespace
                 ++aIdx;
             }
         }
-        return bUpdateFtn;
+        return bUpdateFootnote;
     }
 
-    static bool lcl_MayOverwrite( const SwTxtNode *pNode, const sal_Int32 nPos )
+    static bool lcl_MayOverwrite( const SwTextNode *pNode, const sal_Int32 nPos )
     {
-        sal_Unicode const cChr = pNode->GetTxt()[nPos];
+        sal_Unicode const cChr = pNode->GetText()[nPos];
         switch (cChr)
         {
             case CH_TXTATR_BREAKWORD:
             case CH_TXTATR_INWORD:
-                return !pNode->GetTxtAttrForCharAt(nPos);// how could there be none?
+                return !pNode->GetTextAttrForCharAt(nPos);// how could there be none?
             case CH_TXT_ATR_FIELDSTART:
             case CH_TXT_ATR_FIELDEND:
             case CH_TXT_ATR_FORMELEMENT:
@@ -932,7 +932,7 @@ namespace
         }
     }
 
-    static void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
+    static void lcl_SkipAttr( const SwTextNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
     {
         if( !lcl_MayOverwrite( pNode, rStart ) )
         {
@@ -940,7 +940,7 @@ namespace
             do {
                 ++rIdx;
                 rStart = rIdx.GetIndex();
-            } while (rStart < pNode->GetTxt().getLength()
+            } while (rStart < pNode->GetText().getLength()
                    && !lcl_MayOverwrite(pNode, rStart) );
         }
     }
@@ -986,7 +986,7 @@ namespace //local functions originally from docfmt.cxx
     #define DELETECHARSETS if ( bDelete ) { delete pCharSet; delete pOtherSet; }
 
     /// Insert Hints according to content types;
-    // Is used in SwDoc::Insert(..., SwFmtHint &rHt)
+    // Is used in SwDoc::Insert(..., SwFormatHint &rHt)
 
     static bool lcl_InsAttr(
         SwDoc *const pDoc,
@@ -1072,15 +1072,15 @@ namespace //local functions originally from docfmt.cxx
         SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
         bool bRet = false;
         const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
-        SwCntntNode* pNode = pStt->nNode.GetNode().GetCntntNode();
+        SwContentNode* pNode = pStt->nNode.GetNode().GetContentNode();
 
-        if( pNode && pNode->IsTxtNode() )
+        if( pNode && pNode->IsTextNode() )
         {
             // #i27615#
             if (rRg.IsInFrontOfLabel())
             {
-                SwTxtNode * pTxtNd = pNode->GetTxtNode();
-                SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                SwTextNode * pTextNd = pNode->GetTextNode();
+                SwNumRule * pNumRule = pTextNd->GetNumRule();
 
                 if ( !pNumRule )
                 {
@@ -1089,7 +1089,7 @@ namespace //local functions originally from docfmt.cxx
                     return false;
                 }
 
-                int nLevel = pTxtNd->GetActualListLevel();
+                int nLevel = pTextNd->GetActualListLevel();
 
                 if (nLevel < 0)
                     nLevel = 0;
@@ -1097,17 +1097,17 @@ namespace //local functions originally from docfmt.cxx
                 if (nLevel >= MAXLEVEL)
                     nLevel = MAXLEVEL - 1;
 
-                SwNumFmt aNumFmt = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
-                SwCharFmt * pCharFmt =
-                    pDoc->FindCharFmtByName(aNumFmt.GetCharFmtName());
+                SwNumFormat aNumFormat = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
+                SwCharFormat * pCharFormat =
+                    pDoc->FindCharFormatByName(aNumFormat.GetCharFormatName());
 
-                if (pCharFmt)
+                if (pCharFormat)
                 {
                     if (pHistory)
-                        pHistory->Add(pCharFmt->GetAttrSet(), *pCharFmt);
+                        pHistory->Add(pCharFormat->GetAttrSet(), *pCharFormat);
 
                     if ( pCharSet )
-                        pCharFmt->SetFmtAttr(*pCharSet);
+                        pCharFormat->SetFormatAttr(*pCharSet);
                 }
 
                 DELETECHARSETS
@@ -1119,17 +1119,17 @@ namespace //local functions originally from docfmt.cxx
             // Attributes without an end do not have a range
             if ( !bCharAttr && !bOtherAttr )
             {
-                SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+                SfxItemSet aTextSet( pDoc->GetAttrPool(),
                             RES_TXTATR_NOEND_BEGIN, RES_TXTATR_NOEND_END-1 );
-                aTxtSet.Put( rChgSet );
-                if( aTxtSet.Count() )
+                aTextSet.Put( rChgSet );
+                if( aTextSet.Count() )
                 {
                     SwRegHistory history( pNode, *pNode, pHistory );
                     bRet = history.InsertItems(
-                        aTxtSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
+                        aTextSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
 
                     if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
-                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
                     {
                         SwPaM aPam( pStt->nNode, pStt->nContent.GetIndex()-1,
                                     pStt->nNode, pStt->nContent.GetIndex() );
@@ -1148,43 +1148,43 @@ namespace //local functions originally from docfmt.cxx
             // TextAttributes with an end never expand their range
             if ( !bCharAttr && !bOtherAttr )
             {
-                // CharFmt and URL attributes are treated separately!
-                // TEST_TEMP ToDo: AutoFmt!
-                SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+                // CharFormat and URL attributes are treated separately!
+                // TEST_TEMP ToDo: AutoFormat!
+                SfxItemSet aTextSet( pDoc->GetAttrPool(),
                                     RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK,
                                     RES_TXTATR_META, RES_TXTATR_METAFIELD,
                                     RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
                                     RES_TXTATR_INPUTFIELD, RES_TXTATR_INPUTFIELD,
                                     0 );
 
-                aTxtSet.Put( rChgSet );
-                if( aTxtSet.Count() )
+                aTextSet.Put( rChgSet );
+                if( aTextSet.Count() )
                 {
                     const sal_Int32 nInsCnt = rSt.GetIndex();
                     const sal_Int32 nEnd = pStt->nNode == pEnd->nNode
                                     ? pEnd->nContent.GetIndex()
                                     : pNode->Len();
                     SwRegHistory history( pNode, *pNode, pHistory );
-                    bRet = history.InsertItems( aTxtSet, nInsCnt, nEnd, nFlags )
+                    bRet = history.InsertItems( aTextSet, nInsCnt, nEnd, nFlags )
                            || bRet;
 
                     if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
-                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
                     {
                         // Was text content inserted? (RefMark/TOXMarks without an end)
-                        bool bTxtIns = nInsCnt != rSt.GetIndex();
+                        bool bTextIns = nInsCnt != rSt.GetIndex();
                         // Was content inserted or set over the selection?
-                        SwPaM aPam( pStt->nNode, bTxtIns ? nInsCnt + 1 : nEnd,
+                        SwPaM aPam( pStt->nNode, bTextIns ? nInsCnt + 1 : nEnd,
                                     pStt->nNode, nInsCnt );
                         if( pUndo )
-                            pUndo->SaveRedlineData( aPam, bTxtIns );
+                            pUndo->SaveRedlineData( aPam, bTextIns );
 
                         if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
                             pDoc->getIDocumentRedlineAccess().AppendRedline(
                                 new SwRangeRedline(
-                                    bTxtIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
+                                    bTextIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
                                     true);
-                        else if( bTxtIns )
+                        else if( bTextIns )
                             pDoc->getIDocumentRedlineAccess().SplitRedline( aPam );
                     }
                 }
@@ -1194,28 +1194,28 @@ namespace //local functions originally from docfmt.cxx
         // We always have to set the auto flag for PageDescs that are set at the Node!
         if( pOtherSet && pOtherSet->Count() )
         {
-            SwTableNode* pTblNd;
-            const SwFmtPageDesc* pDesc;
+            SwTableNode* pTableNd;
+            const SwFormatPageDesc* pDesc;
             if( SfxItemState::SET == pOtherSet->GetItemState( RES_PAGEDESC,
                             false, reinterpret_cast<const SfxPoolItem**>(&pDesc) ))
             {
                 if( pNode )
                 {
                     // Set auto flag. Only in the template it's without auto!
-                    SwFmtPageDesc aNew( *pDesc );
+                    SwFormatPageDesc aNew( *pDesc );
 
                     // Tables now also know line breaks
                     if( !(nFlags & SetAttrMode::APICALL) &&
-                        0 != ( pTblNd = pNode->FindTableNode() ) )
+                        0 != ( pTableNd = pNode->FindTableNode() ) )
                     {
-                        SwTableNode* pCurTblNd = pTblNd;
-                        while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
-                            pTblNd = pCurTblNd;
+                        SwTableNode* pCurTableNd = pTableNd;
+                        while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+                            pTableNd = pCurTableNd;
 
                         // set the table format
-                        SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
-                        SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
-                        pFmt->SetFmtAttr( aNew );
+                        SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+                        SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+                        pFormat->SetFormatAttr( aNew );
                         bRet = true;
                     }
                     else
@@ -1240,20 +1240,20 @@ namespace //local functions originally from docfmt.cxx
             }
 
             // Tables now also know line breaks
-            const SvxFmtBreakItem* pBreak;
+            const SvxFormatBreakItem* pBreak;
             if( pNode && !(nFlags & SetAttrMode::APICALL) &&
-                0 != (pTblNd = pNode->FindTableNode() ) &&
+                0 != (pTableNd = pNode->FindTableNode() ) &&
                 SfxItemState::SET == pOtherSet->GetItemState( RES_BREAK,
                             false, reinterpret_cast<const SfxPoolItem**>(&pBreak) ) )
             {
-                SwTableNode* pCurTblNd = pTblNd;
-                while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
-                    pTblNd = pCurTblNd;
+                SwTableNode* pCurTableNd = pTableNd;
+                while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+                    pTableNd = pCurTableNd;
 
                  // set the table format
-                SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
-                SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
-                pFmt->SetFmtAttr( *pBreak );
+                SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+                SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+                pFormat->SetFormatAttr( *pBreak );
                 bRet = true;
 
                 // bOtherAttr = true means that pOtherSet == rChgSet. In this case
@@ -1291,17 +1291,17 @@ namespace //local functions originally from docfmt.cxx
                 return bRet;
             }
 
-            if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+            if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
             {
-                SwTxtNode* pTxtNd = pNode->GetTxtNode();
+                SwTextNode* pTextNd = pNode->GetTextNode();
                 const SwIndex& rSt = pStt->nContent;
                 sal_Int32 nMkPos, nPtPos = rSt.GetIndex();
-                const OUString& rStr = pTxtNd->GetTxt();
+                const OUString& rStr = pTextNd->GetText();
 
                 // Special case: if the Crsr is located within a URL attribute, we take over it's area
-                SwTxtAttr const*const pURLAttr(
-                    pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
-                if (pURLAttr && !pURLAttr->GetINetFmt().GetValue().isEmpty())
+                SwTextAttr const*const pURLAttr(
+                    pTextNd->GetTextAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
+                if (pURLAttr && !pURLAttr->GetINetFormat().GetValue().isEmpty())
                 {
                     nMkPos = pURLAttr->GetStart();
                     nPtPos = *pURLAttr->End();
@@ -1311,8 +1311,8 @@ namespace //local functions originally from docfmt.cxx
                     Boundary aBndry;
                     if( g_pBreakIt->GetBreakIter().is() )
                         aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                    pTxtNd->GetTxt(), nPtPos,
-                                    g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                    pTextNd->GetText(), nPtPos,
+                                    g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                     WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                                     true );
 
@@ -1330,23 +1330,23 @@ namespace //local functions originally from docfmt.cxx
                 // These attributes are inserted as FormatAttributes and
                 // never override the TextAttributes!
                 if( !(nFlags & SetAttrMode::DONTREPLACE ) &&
-                    pTxtNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
+                    pTextNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
                 {
-                    SwIndex aSt( pTxtNd );
+                    SwIndex aSt( pTextNd );
                     if( pHistory )
                     {
                         // Save all attributes for the Undo.
-                        SwRegHistory aRHst( *pTxtNd, pHistory );
-                        pTxtNd->GetpSwpHints()->Register( &aRHst );
-                        pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
-                        if( pTxtNd->GetpSwpHints() )
-                            pTxtNd->GetpSwpHints()->DeRegister();
+                        SwRegHistory aRHst( *pTextNd, pHistory );
+                        pTextNd->GetpSwpHints()->Register( &aRHst );
+                        pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
+                        if( pTextNd->GetpSwpHints() )
+                            pTextNd->GetpSwpHints()->DeRegister();
                     }
                     else
-                        pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
+                        pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
                 }
 
-                // the SwRegHistory inserts the attribute into the TxtNode!
+                // the SwRegHistory inserts the attribute into the TextNode!
                 SwRegHistory history( pNode, *pNode, pHistory );
                 bRet = history.InsertItems( *pCharSet, nMkPos, nPtPos, nFlags )
                     || bRet;
@@ -1399,8 +1399,8 @@ namespace //local functions originally from docfmt.cxx
 
             if( pStt->nContent.GetIndex() != 0 || aCntEnd.GetIndex() != nLen )
             {
-                // the SwRegHistory inserts the attribute into the TxtNode!
-                if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+                // the SwRegHistory inserts the attribute into the TextNode!
+                if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
                 {
                     SwRegHistory history( pNode, *pNode, pHistory );
                     bRet = history.InsertItems(*pCharSet,
@@ -1427,7 +1427,7 @@ namespace //local functions originally from docfmt.cxx
 
                     if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
                     {
-                        SwTxtNode* pCurrentNd = pStt->nNode.GetNode().GetTxtNode();
+                        SwTextNode* pCurrentNd = pStt->nNode.GetNode().GetTextNode();
 
                         if (pCurrentNd)
                         {
@@ -1455,13 +1455,13 @@ namespace //local functions originally from docfmt.cxx
          */
         if( pStt->nNode < pEnd->nNode )
         {
-            pNode = pEnd->nNode.GetNode().GetCntntNode();
+            pNode = pEnd->nNode.GetNode().GetContentNode();
             if(pNode)
             {
                 if( aCntEnd.GetIndex() != pNode->Len() )
                 {
-                    // the SwRegHistory inserts the attribute into the TxtNode!
-                    if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+                    // the SwRegHistory inserts the attribute into the TextNode!
+                    if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
                     {
                         SwRegHistory history( pNode, *pNode, pHistory );
                         (void)history.InsertItems(*pCharSet,
@@ -1492,8 +1492,8 @@ namespace //local functions originally from docfmt.cxx
         // Reset all attributes from the set!
         if( pCharSet && pCharSet->Count() && !( SetAttrMode::DONTREPLACE & nFlags ) )
         {
-            ::sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHistory, 0, pCharSet );
-            pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+            ::sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHistory, 0, pCharSet );
+            pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
         }
 
         bool bCreateSwpHints = pCharSet && (
@@ -1502,11 +1502,11 @@ namespace //local functions originally from docfmt.cxx
 
         for(; aSt < aEnd; ++aSt )
         {
-            pNode = aSt.GetNode().GetCntntNode();
+            pNode = aSt.GetNode().GetContentNode();
             if( !pNode )
                 continue;
 
-            SwTxtNode* pTNd = pNode->GetTxtNode();
+            SwTextNode* pTNd = pNode->GetTextNode();
             if( pHistory )
             {
                 SwRegHistory aRegH( pNode, *pNode, pHistory );
@@ -1518,7 +1518,7 @@ namespace //local functions originally from docfmt.cxx
                     if( pSwpHints )
                         pSwpHints->Register( &aRegH );
 
-                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
                     if( pSwpHints )
                         pSwpHints->DeRegister();
                 }
@@ -1528,7 +1528,7 @@ namespace //local functions originally from docfmt.cxx
             else
             {
                 if( pTNd && pCharSet && pCharSet->Count() )
-                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
                 if( pOtherSet && pOtherSet->Count() )
                     pNode->SetAttr( *pOtherSet );
             }
@@ -1547,7 +1547,7 @@ namespace //local functions originally from docfmt.cxx
             SwPosition aStartPos (*rRg.Start());
             SwPosition aEndPos (*rRg.End());
 
-            if (aEndPos.nNode.GetNode().GetTxtNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTxtNode()->Len())
+            if (aEndPos.nNode.GetNode().GetTextNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTextNode()->Len())
                 aEndPos.nNode--;
 
             sal_uLong nStart = aStartPos.nNode.GetIndex();
@@ -1555,9 +1555,9 @@ namespace //local functions originally from docfmt.cxx
             for(; nStart <= nEnd; ++nStart)
             {
                 SwNode* pNd = pDoc->GetNodes()[ nStart ];
-                if (!pNd || !pNd->IsTxtNode())
+                if (!pNd || !pNd->IsTextNode())
                     continue;
-                SwTxtNode *pCurrentNd = pNd->GetTxtNode();
+                SwTextNode *pCurrentNd = pNd->GetTextNode();
                 pCurrentNd->TryCharSetExpandToNum(*pCharSet);
             }
         }
@@ -1595,10 +1595,10 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
                 nEnd = pEnd->nNode.GetIndex(),
                 nDiff = nEnd - nStt +1;
         SwNode* pNd = m_rDoc.GetNodes()[ nStt ];
-        if( pNd->IsCntntNode() && pStt->nContent.GetIndex() )
+        if( pNd->IsContentNode() && pStt->nContent.GetIndex() )
             ++nStt, --nDiff;
-        if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsCntntNode() &&
-            static_cast<SwCntntNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
+        if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsContentNode() &&
+            static_cast<SwContentNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
             --nEnd, --nDiff;
         if( nDiff &&
             lcl_ChkFlyFly( pDoc, nStt, nEnd, rPos.nNode.GetIndex() ) )
@@ -1609,7 +1609,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
     SwPaM* pRedlineRange = 0;
     if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ||
-        (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() ) )
+        (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) )
         pRedlineRange = new SwPaM( rPos );
 
     RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
@@ -1622,7 +1622,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
     }
     else if( ! ( *pStt <= rPos && rPos < *pEnd &&
             ( pStt->nNode != pEnd->nNode ||
-              !pStt->nNode.GetNode().IsTxtNode() )) )
+              !pStt->nNode.GetNode().IsTextNode() )) )
     {
         // Copy to a position outside of the area, or copy a single TextNode
         // Do an ordinary copy
@@ -1661,7 +1661,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
             aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
             aPam.SetMark();
-            SwCntntNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
+            SwContentNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
             pNode->MakeEndIndex( &aPam.GetMark()->nContent );
 
             aPam.GetPoint()->nNode = *aPam.GetNode().StartOfSectionNode();
@@ -1670,7 +1670,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
             // move to desired position
             pDoc->getIDocumentContentOperations().MoveRange( aPam, rPos, SwMoveFlags::DEFAULT );
 
-            pNode = aPam.GetCntntNode();
+            pNode = aPam.GetContentNode();
             *aPam.GetPoint() = rPos;      // Move the cursor for Undo
             aPam.SetMark();               // also move the Mark
             aPam.DeleteMark();            // But don't mark any area
@@ -1757,26 +1757,26 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
 
     /* #i9185# This whould lead to a segmentation fault if not caught above. */
     sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
-    SwTableNode *const pTblNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
+    SwTableNode *const pTableNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
 
-    if( pTblNd && pNd->IsCntntNode() )
+    if( pTableNd && pNd->IsContentNode() )
     {
-        SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+        SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
 
         {
             const SfxPoolItem *pItem;
-            const SfxItemSet* pSet = static_cast<const SwCntntNode*>(pNd)->GetpSwAttrSet();
+            const SfxItemSet* pSet = static_cast<const SwContentNode*>(pNd)->GetpSwAttrSet();
             if( pSet && SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC,
                 false, &pItem ) )
             {
-                pTableFmt->SetFmtAttr( *pItem );
+                pTableFormat->SetFormatAttr( *pItem );
                 bSavePageDesc = true;
             }
 
             if( pSet && SfxItemState::SET == pSet->GetItemState( RES_BREAK,
                 false, &pItem ) )
             {
-                pTableFmt->SetFmtAttr( *pItem );
+                pTableFormat->SetFormatAttr( *pItem );
                 bSavePageBreak = true;
             }
         }
@@ -1791,10 +1791,10 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
             rPam.Exchange();
         rPam.GetPoint()->nNode++;
 
-        SwCntntNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetContentNode();
         rPam.GetPoint()->nContent.Assign( pTmpNode, 0 );
         bool bGoNext = (0 == pTmpNode);
-        pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode();
+        pTmpNode = rPam.GetMark()->nNode.GetNode().GetContentNode();
         rPam.GetMark()->nContent.Assign( pTmpNode, 0 );
 
         m_rDoc.GetIDocumentUndoRedo().ClearRedo();
@@ -1846,25 +1846,25 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
             // What's with Flys?
         {
             // If there are FlyFrames left, delete these too
-            for( size_t n = 0; n < m_rDoc.GetSpzFrmFmts()->size(); ++n )
+            for( size_t n = 0; n < m_rDoc.GetSpzFrameFormats()->size(); ++n )
             {
-                SwFrmFmt* pFly = (*m_rDoc.GetSpzFrmFmts())[n];
-                const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
-                SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+                SwFrameFormat* pFly = (*m_rDoc.GetSpzFrameFormats())[n];
+                const SwFormatAnchor* pAnchor = &pFly->GetAnchor();
+                SwPosition const*const pAPos = pAnchor->GetContentAnchor();
                 if (pAPos &&
                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                     aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd )
                 {
-                    m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                    m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat( pFly );
                     --n;
                 }
             }
         }
 
-        SwCntntNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetCntntNode();
+        SwContentNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetContentNode();
         rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 );
-        pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetCntntNode();
+        pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetContentNode();
         rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 );
         m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 );
     }
@@ -1903,7 +1903,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
 
     // save redlines (if DOC_MOVEREDLINES is used)
     _SaveRedlines aSaveRedl;
-    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         lcl_SaveRedlines( rPaM, aSaveRedl );
 
@@ -1920,8 +1920,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
             &pEnd->nContent);
     }
 
-    bool bUpdateFtn = false;
-    SwFtnIdxs aTmpFntIdx;
+    bool bUpdateFootnote = false;
+    SwFootnoteIdxs aTmpFntIdx;
 
     SwUndoMove * pUndoMove = 0;
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -1932,8 +1932,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     }
     else
     {
-        bUpdateFtn = lcl_SaveFtn( pStt->nNode, pEnd->nNode, rPos.nNode,
-                                    m_rDoc.GetFtnIdxs(), aTmpFntIdx,
+        bUpdateFootnote = lcl_SaveFootnote( pStt->nNode, pEnd->nNode, rPos.nNode,
+                                    m_rDoc.GetFootnoteIdxs(), aTmpFntIdx,
                                     &pStt->nContent, &pEnd->nContent );
     }
 
@@ -1945,32 +1945,32 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         rPaM.Exchange();
 
     // If there is a TextNode before and after the Move, create a JoinNext in the EditShell.
-    SwTxtNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTextNode();
     bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
 
     // If one ore more TextNodes are moved, SwNodes::Move will do a SplitNode.
     // However, this does not update the cursor. So we create a TextNode to keep
     // updating the indices. After the Move the Node is optionally deleted.
-    SwTxtNode * pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * pTNd = rPos.nNode.GetNode().GetTextNode();
     if( pTNd && rPaM.GetPoint()->nNode != rPaM.GetMark()->nNode &&
         ( rPos.nContent.GetIndex() || ( pTNd->Len() && bCorrSavePam  )) )
     {
         bSplit = true;
-        const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex();
+        const sal_Int32 nMkContent = rPaM.GetMark()->nContent.GetIndex();
 
-        const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+        const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
 
-        pTNd = pTNd->SplitCntntNode( rPos )->GetTxtNode();
+        pTNd = pTNd->SplitContentNode( rPos )->GetTextNode();
 
-        if( !pCntntStore->Empty() )
-            pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+        if( !pContentStore->Empty() )
+            pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
 
         // correct the PaM!
         if( rPos.nNode == rPaM.GetMark()->nNode )
         {
             rPaM.GetMark()->nNode = rPos.nNode.GetIndex()-1;
-            rPaM.GetMark()->nContent.Assign( pTNd, nMkCntnt );
+            rPaM.GetMark()->nContent.Assign( pTNd, nMkContent );
         }
     }
 
@@ -1978,8 +1978,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     // the manipulated range.
     // If there's no content anymore, set it to the StartNode (that's
     // always there).
-    const bool bNullCntnt = !aSavePam.Move( fnMoveBackward, fnGoCntnt );
-    if( bNullCntnt )
+    const bool bNullContent = !aSavePam.Move( fnMoveBackward, fnGoContent );
+    if( bNullContent )
     {
         aSavePam.GetPoint()->nNode--;
     }
@@ -2012,16 +2012,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         rPaM.DeleteMark();
 
     OSL_ENSURE( *aSavePam.GetMark() == rPos ||
-            ( aSavePam.GetMark()->nNode.GetNode().GetCntntNode() == NULL ),
+            ( aSavePam.GetMark()->nNode.GetNode().GetContentNode() == NULL ),
             "PaM was not moved. Aren't there ContentNodes at the beginning/end?" );
     *aSavePam.GetMark() = rPos;
 
     rPaM.SetMark();         // create a Sel. around the new range
-    pTNd = aSavePam.GetNode().GetTxtNode();
+    pTNd = aSavePam.GetNode().GetTextNode();
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
         // correct the SavePam's Content first
-        if( bNullCntnt )
+        if( bNullContent )
         {
             aSavePam.GetPoint()->nContent = 0;
         }
@@ -2030,16 +2030,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         // where the rPaM is located.
         // If the Content was moved to the back and the SavePam's SPoint is
         // in the next Node, we have to deal with this when saving the Undo object!
-        SwTxtNode * pPamTxtNd = nullptr;
+        SwTextNode * pPamTextNd = nullptr;
 
         // Is passed to SwUndoMove, which happens when subsequently calling Undo JoinNext.
         // If it's not possible to call Undo JoinNext here.
         bool bJoin = bSplit && pTNd;
         if( bCorrSavePam )
         {
-            pPamTxtNd = rPaM.GetNode().GetTxtNode();
-            bCorrSavePam = (pPamTxtNd != nullptr)
-                            && pPamTxtNd->CanJoinNext()
+            pPamTextNd = rPaM.GetNode().GetTextNode();
+            bCorrSavePam = (pPamTextNd != nullptr)
+                            && pPamTextNd->CanJoinNext()
                             && (*rPaM.GetPoint() <= *aSavePam.GetPoint());
         }
 
@@ -2052,11 +2052,11 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
             if( bCorrSavePam && rPaM.GetPoint()->nNode.GetIndex()+1 ==
                                 aSavePam.GetPoint()->nNode.GetIndex() )
             {
-                aSavePam.GetPoint()->nContent += pPamTxtNd->Len();
+                aSavePam.GetPoint()->nContent += pPamTextNd->Len();
             }
             bJoin = false;
         }
-        else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
+        else if ( !aSavePam.Move( fnMoveForward, fnGoContent ) )
         {
             aSavePam.GetPoint()->nNode++;
         }
@@ -2080,14 +2080,14 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
                 bRemove = false;
             }
         }
-        if( bNullCntnt )
+        if( bNullContent )
         {
             aSavePam.GetPoint()->nNode++;
-            aSavePam.GetPoint()->nContent.Assign( aSavePam.GetCntntNode(), 0 );
+            aSavePam.GetPoint()->nContent.Assign( aSavePam.GetContentNode(), 0 );
         }
         else if( bRemove ) // No move forward after joining with next paragraph
         {
-            aSavePam.Move( fnMoveForward, fnGoCntnt );
+            aSavePam.Move( fnMoveForward, fnGoContent );
         }
     }
 
@@ -2112,15 +2112,15 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         lcl_RestoreRedlines( &m_rDoc, *aSavePam.Start(), aSaveRedl );
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
         if( !aTmpFntIdx.empty() )
         {
-            m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+            m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
             aTmpFntIdx.clear();
         }
 
-        m_rDoc.GetFtnIdxs().UpdateAllFtn();
+        m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
     }
 
     m_rDoc.getIDocumentState().SetModified();
@@ -2137,9 +2137,9 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // Or else delete the Frames for all footnotes that are being moved
     // and have it rebuild after the Move (footnotes can change pages).
-    // Additionally we have to correct the FtnIdx array's sorting.
-    bool bUpdateFtn = false;
-    SwFtnIdxs aTmpFntIdx;
+    // Additionally we have to correct the FootnoteIdx array's sorting.
+    bool bUpdateFootnote = false;
+    SwFootnoteIdxs aTmpFntIdx;
 
     SwUndoMove* pUndo = 0;
     if ((SwMoveFlags::CREATEUNDOOBJ & eMvFlags ) && m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2148,13 +2148,13 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
     }
     else
     {
-        bUpdateFtn = lcl_SaveFtn( rRange.aStart, rRange.aEnd, rPos,
-                                    m_rDoc.GetFtnIdxs(), aTmpFntIdx );
+        bUpdateFootnote = lcl_SaveFootnote( rRange.aStart, rRange.aEnd, rPos,
+                                    m_rDoc.GetFootnoteIdxs(), aTmpFntIdx );
     }
 
     _SaveRedlines aSaveRedl;
     std::vector<SwRangeRedline*> aSavRedlInsPosArr;
-    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         lcl_SaveRedlines( rRange, aSaveRedl );
 
@@ -2165,14 +2165,14 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
         {
             const SwPosition *pRStt, *pREnd;
             do {
-                SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+                SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
                 pRStt = pTmp->Start();
                 pREnd = pTmp->End();
                 if( pREnd->nNode == rPos && pRStt->nNode < rPos )
                 {
                     aSavRedlInsPosArr.push_back( pTmp );
                 }
-            } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size());
+            } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size());
         }
     }
 
@@ -2184,7 +2184,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // Save the paragraph-bound Flys, so that they can be moved.
     _SaveFlyArr aSaveFlyArr;
-    if( !m_rDoc.GetSpzFrmFmts()->empty() )
+    if( !m_rDoc.GetSpzFrameFormats()->empty() )
         _SaveFlyInRange( rRange, aSaveFlyArr );
 
     // Set it to before the Position, so that it cannot be moved further.
@@ -2225,11 +2225,11 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
         for( size_t n = 0; n < aSavRedlInsPosArr.size(); ++n )
         {
             SwRangeRedline* pTmp = aSavRedlInsPosArr[ n ];
-            if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) )
+            if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().Contains( pTmp ) )
             {
                 SwPosition* pEnd = pTmp->End();
                 pEnd->nNode = aIdx;
-                pEnd->nContent.Assign( pNewNd->GetCntntNode(), 0 );
+                pEnd->nContent.Assign( pNewNd->GetContentNode(), 0 );
             }
         }
     }
@@ -2245,15 +2245,15 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     delete pSaveInsPos;
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
         if( !aTmpFntIdx.empty() )
         {
-            m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+            m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
             aTmpFntIdx.clear();
         }
 
-        m_rDoc.GetFtnIdxs().UpdateAllFtn();
+        m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
     }
 
     m_rDoc.getIDocumentState().SetModified();
@@ -2263,24 +2263,24 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
 {
     SwNodeIndex aIdx( rPaM.Start()->nNode );
-    bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+    bool bJoinText = aIdx.GetNode().IsTextNode();
     bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
     aIdx--;             // in front of the move area!
 
     bool bRet = MoveRange( rPaM, rPos, eMvFlags );
     if( bRet && !bOneNode )
     {
-        if( bJoinTxt )
+        if( bJoinText )
             ++aIdx;
-        SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
         SwNodeIndex aNxtIdx( aIdx );
-        if( pTxtNd && pTxtNd->CanJoinNext( &aNxtIdx ) )
+        if( pTextNd && pTextNd->CanJoinNext( &aNxtIdx ) )
         {
             {   // Block so SwIndex into node is deleted before Join
-                m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd,
-                            pTxtNd->GetTxt().getLength()) ), 0, true );
+                m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTextNd,
+                            pTextNd->GetText().getLength()) ), 0, true );
             }
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
     }
     return bRet;
@@ -2296,7 +2296,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
         m_rDoc.DeleteAutoCorrExceptWord();
     }
 
-    SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = rPt.nNode.GetNode().GetTextNode();
     if (!pNode || rStr.getLength() > pNode->GetSpaceLeft()) // worst case: no erase
     {
         return false;
@@ -2320,7 +2320,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
     {
         // start behind the characters (to fix the attributes!)
         nStart = rIdx.GetIndex();
-        if  (nStart < pNode->GetTxt().getLength())
+        if  (nStart < pNode->GetText().getLength())
         {
             lcl_SkipAttr( pNode, rIdx, nStart );
         }
@@ -2348,7 +2348,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
         else
         {
             // start behind the characters (to fix the attributes!)
-            if (nStart < pNode->GetTxt().getLength())
+            if (nStart < pNode->GetText().getLength())
                 ++rIdx;
             pNode->InsertText( OUString(c), rIdx, SwInsertFlags::EMPTYEXPAND );
             if( nStart+1 < rIdx.GetIndex() )
@@ -2370,7 +2370,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
     }
 
     if (!m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
-        !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty())
+        !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
     {
         SwPaM aPam( rPt.nNode, nStart, rPt.nNode, rPt.nContent.GetIndex() );
         m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aPam, true, USHRT_MAX );
@@ -2406,7 +2406,7 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
         m_rDoc.DeleteAutoCorrExceptWord();
     }
 
-    SwTxtNode *const pNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *const pNode = rPos.nNode.GetNode().GetTextNode();
     if(!pNode)
         return false;
 
@@ -2463,10 +2463,10 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
         }
     }
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
-        SwPaM aPam( rPos.nNode, aTmp.GetCntnt(),
+        SwPaM aPam( rPos.nNode, aTmp.GetContent(),
                     rPos.nNode, rPos.nContent.GetIndex());
         if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
         {
@@ -2498,7 +2498,7 @@ void DocumentContentOperationsManager::TransliterateText(
     sal_Int32 nSttCnt = pStt->nContent.GetIndex();
     sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
-    SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     if( pStt == pEnd && pTNd )  // no selection?
     {
         // set current word as 'area of effect'
@@ -2506,7 +2506,7 @@ void DocumentContentOperationsManager::TransliterateText(
         Boundary aBndry;
         if( g_pBreakIt->GetBreakIter().is() )
             aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                        pTNd->GetTxt(), nSttCnt,
+                        pTNd->GetText(), nSttCnt,
                         g_pBreakIt->GetLocale( pTNd->GetLang( nSttCnt ) ),
                         WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                         true );
@@ -2529,20 +2529,20 @@ void DocumentContentOperationsManager::TransliterateText(
             ++aIdx;
             if( pTNd )
                 pTNd->TransliterateText(
-                        rTrans, nSttCnt, pTNd->GetTxt().getLength(), pUndo);
+                        rTrans, nSttCnt, pTNd->GetText().getLength(), pUndo);
         }
 
         for( ; aIdx.GetIndex() < nEndNd; ++aIdx )
         {
-            pTNd = aIdx.GetNode().GetTxtNode();
+            pTNd = aIdx.GetNode().GetTextNode();
             if (pTNd)
             {
                 pTNd->TransliterateText(
-                        rTrans, 0, pTNd->GetTxt().getLength(), pUndo);
+                        rTrans, 0, pTNd->GetText().getLength(), pUndo);
             }
         }
 
-        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() ))
+        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() ))
             pTNd->TransliterateText( rTrans, 0, nEndCnt, pUndo );
     }
     else if( pTNd && nSttCnt < nEndCnt )
@@ -2560,80 +2560,80 @@ void DocumentContentOperationsManager::TransliterateText(
     m_rDoc.getIDocumentState().SetModified();
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
                             const OUString& rGrfName,
                             const OUString& rFltName,
                             const Graphic* pGraphic,
                             const SfxItemSet* pFlyAttrSet,
                             const SfxItemSet* pGrfAttrSet,
-                            SwFrmFmt* pFrmFmt )
+                            SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
     SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfName, rFltName, pGraphic,
-                            m_rDoc.GetDfltGrfFmtColl() );
-    SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
-                            pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-    return pSwFlyFrmFmt;
+                            m_rDoc.GetDfltGrfFormatColl() );
+    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+                            pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+    return pSwFlyFrameFormat;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
                             const SfxItemSet* pFlyAttrSet,
                             const SfxItemSet* pGrfAttrSet,
-                            SwFrmFmt* pFrmFmt )
+                            SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
     SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
-                            rGrfObj, m_rDoc.GetDfltGrfFmtColl() );
-    SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
-                            pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-    return pSwFlyFrmFmt;
+                            rGrfObj, m_rDoc.GetDfltGrfFormatColl() );
+    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+                            pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+    return pSwFlyFrameFormat;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
+    if( !pFrameFormat )
     {
         sal_uInt16 nId = RES_POOLFRM_OLE;
         SvGlobalName aClassName( xObj->getClassID() );
         if (SotExchange::IsMath(aClassName))
             nId = RES_POOLFRM_FORMEL;
 
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( nId );
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
     }
-    return _InsNoTxtNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
+    return _InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             xObj,
-                            m_rDoc.GetDfltGrfFmtColl() ),
+                            m_rDoc.GetDfltGrfFormatColl() ),
                             pFlyAttrSet, pGrfAttrSet,
-                            pFrmFmt );
+                            pFrameFormat );
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
+SwFlyFrameFormat* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
                         sal_Int64 nAspect,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_OLE );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_OLE );
 
-    return _InsNoTxtNode( *rRg.GetPoint(),
+    return _InsNoTextNode( *rRg.GetPoint(),
                             m_rDoc.GetNodes().MakeOLENode(
                                 SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                                 rObjName,
                                 nAspect,
-                                m_rDoc.GetDfltGrfFmtColl(),
+                                m_rDoc.GetDfltGrfFormatColl(),
                                 0 ),
                             pFlyAttrSet, pGrfAttrSet,
-                            pFrmFmt );
+                            pFrameFormat );
 }
 
 void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrfName,
@@ -2661,31 +2661,31 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf
 }
 
 // Insert drawing object, which has to be already inserted in the DrawModel
-SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
+SwDrawFrameFormat* DocumentContentOperationsManager::InsertDrawObj(
     const SwPaM &rRg,
     SdrObject& rDrawObj,
     const SfxItemSet& rFlyAttrSet )
 {
-    SwDrawFrmFmt* pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+    SwDrawFrameFormat* pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
 
-    const SwFmtAnchor* pAnchor = 0;
+    const SwFormatAnchor* pAnchor = 0;
     rFlyAttrSet.GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchor) );
-    pFmt->SetFmtAttr( rFlyAttrSet );
+    pFormat->SetFormatAttr( rFlyAttrSet );
 
     // Didn't set the Anchor yet?
     // DrawObjecte must never end up in the Header/Footer!
-    RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFmt->GetAnchor().GetAnchorId();
-    const bool bIsAtCntnt = (FLY_AT_PAGE != eAnchorId);
+    RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFormat->GetAnchor().GetAnchorId();
+    const bool bIsAtContent = (FLY_AT_PAGE != eAnchorId);
 
     const SwNodeIndex* pChkIdx = 0;
     if ( pAnchor == NULL )
     {
         pChkIdx = &rRg.GetPoint()->nNode;
     }
-    else if ( bIsAtCntnt )
+    else if ( bIsAtContent )
     {
         pChkIdx =
-            pAnchor->GetCntntAnchor() ? &pAnchor->GetCntntAnchor()->nNode : &rRg.GetPoint()->nNode;
+            pAnchor->GetContentAnchor() ? &pAnchor->GetContentAnchor()->nNode : &rRg.GetPoint()->nNode;
     }
 
     // allow drawing objects in header/footer, but control objects aren't allowed in header/footer.
@@ -2695,14 +2695,14 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
     {
         // apply at-page anchor format
         eAnchorId = FLY_AT_PAGE;
-        pFmt->SetFmtAttr( SwFmtAnchor( eAnchorId ) );
+        pFormat->SetFormatAttr( SwFormatAnchor( eAnchorId ) );
     }
     else if( pAnchor == NULL
-             || ( bIsAtCntnt
-                  && pAnchor->GetCntntAnchor() == NULL ) )
+             || ( bIsAtContent
+                  && pAnchor->GetContentAnchor() == NULL ) )
     {
         // apply anchor format
-        SwFmtAnchor aAnch( pAnchor != NULL ? *pAnchor : pFmt->GetAnchor() );
+        SwFormatAnchor aAnch( pAnchor != NULL ? *pAnchor : pFormat->GetAnchor() );
         eAnchorId = aAnch.GetAnchorId();
         if ( eAnchorId == FLY_AT_FLY )
         {
@@ -2718,23 +2718,23 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
                 aAnch.SetType( eAnchorId );
             }
         }
-        pFmt->SetFmtAttr( aAnch );
+        pFormat->SetFormatAttr( aAnch );
     }
 
     // insert text attribute for as-character anchored drawing object
     if ( eAnchorId == FLY_AS_CHAR )
     {
         bool bAnchorAtPageAsFallback = true;
-        const SwFmtAnchor& rDrawObjAnchorFmt = pFmt->GetAnchor();
-        if ( rDrawObjAnchorFmt.GetCntntAnchor() != NULL )
+        const SwFormatAnchor& rDrawObjAnchorFormat = pFormat->GetAnchor();
+        if ( rDrawObjAnchorFormat.GetContentAnchor() != NULL )
         {
-            SwTxtNode* pAnchorTxtNode =
-                    rDrawObjAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-            if ( pAnchorTxtNode != NULL )
+            SwTextNode* pAnchorTextNode =
+                    rDrawObjAnchorFormat.GetContentAnchor()->nNode.GetNode().GetTextNode();
+            if ( pAnchorTextNode != NULL )
             {
-                const sal_Int32 nStt = rDrawObjAnchorFmt.GetCntntAnchor()->nContent.GetIndex();
-                SwFmtFlyCnt aFmt( pFmt );
-                pAnchorTxtNode->InsertItem( aFmt, nStt, nStt );
+                const sal_Int32 nStt = rDrawObjAnchorFormat.GetContentAnchor()->nContent.GetIndex();
+                SwFormatFlyCnt aFormat( pFormat );
+                pAnchorTextNode->InsertItem( aFormat, nStt, nStt );
                 bAnchorAtPageAsFallback = false;
             }
         }
@@ -2742,17 +2742,17 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
         if ( bAnchorAtPageAsFallback )
         {
             OSL_ENSURE( false, "DocumentContentOperationsManager::InsertDrawObj(..) - missing content anchor for as-character anchored drawing object --> anchor at-page" );
-            pFmt->SetFmtAttr( SwFmtAnchor( FLY_AT_PAGE ) );
+            pFormat->SetFormatAttr( SwFormatAnchor( FLY_AT_PAGE ) );
         }
     }
 
-    SwDrawContact* pContact = new SwDrawContact( pFmt, &rDrawObj );
+    SwDrawContact* pContact = new SwDrawContact( pFormat, &rDrawObj );
 
     // Create Frames if necessary
     if( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // create layout representation
-        pFmt->MakeFrms();
+        pFormat->MakeFrms();
         // #i42319# - follow-up of #i35635#
         // move object to visible layer
         // #i79391#
@@ -2764,16 +2764,16 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
 
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
-        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0) );
+        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFormat(pFormat, 0, 0) );
     }
 
     m_rDoc.getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
 bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool bChkTableStart )
 {
-    SwCntntNode *pNode = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNode = rPos.nNode.GetNode().GetContentNode();
     if(0 == pNode)
         return false;
 
@@ -2788,7 +2788,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
     {
         m_rDoc.GetIDocumentUndoRedo().ClearRedo();
         // insert the Undo object (currently only for TextNode)
-        if( pNode->IsTxtNode() )
+        if( pNode->IsTextNode() )
         {
             pUndo = new SwUndoSplitNode( &m_rDoc, rPos, bChkTableStart );
             m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
@@ -2797,30 +2797,30 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
 
     // Update the rsid of the old and the new node unless
     // the old node is split at the beginning or at the end
-    SwTxtNode *pTxtNode =  rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *pTextNode =  rPos.nNode.GetNode().GetTextNode();
     const sal_Int32 nPos = rPos.nContent.GetIndex();
-    if( pTxtNode && nPos && nPos != pTxtNode->Len() )
+    if( pTextNode && nPos && nPos != pTextNode->Len() )
     {
-        m_rDoc.UpdateParRsid( pTxtNode );
+        m_rDoc.UpdateParRsid( pTextNode );
     }
 
     //JP 28.01.97: Special case for SplitNode at table start:
     //             If it is at the beginning of a Doc/Fly/Footer/... or right at after a table
     //             then insert a paragraph before it.
-    if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTxtNode() )
+    if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTextNode() )
     {
         sal_uLong nPrevPos = rPos.nNode.GetIndex() - 1;
-        const SwTableNode* pTblNd;
+        const SwTableNode* pTableNd;
         const SwNode* pNd = m_rDoc.GetNodes()[ nPrevPos ];
         if( pNd->IsStartNode() &&
             SwTableBoxStartNode == static_cast<const SwStartNode*>(pNd)->GetStartNodeType() &&
-            0 != ( pTblNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
+            0 != ( pTableNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
             ((( pNd = m_rDoc.GetNodes()[ --nPrevPos ])->IsStartNode() &&
                SwTableBoxStartNode != static_cast<const SwStartNode*>(pNd)->GetStartNodeType() )
                || ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsTableNode() )
-               || pNd->IsCntntNode() ))
+               || pNd->IsContentNode() ))
         {
-            if( pNd->IsCntntNode() )
+            if( pNd->IsContentNode() )
             {
                 //JP 30.04.99 Bug 65660:
                 // There are no page breaks outside of the normal body area,
@@ -2830,44 +2830,44 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
                 else
                 {
                     // Only if the table has page breaks!
-                    const SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
-                    if( SfxItemState::SET != pFrmFmt->GetItemState(RES_PAGEDESC, false) &&
-                        SfxItemState::SET != pFrmFmt->GetItemState( RES_BREAK, false ) )
+                    const SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
+                    if( SfxItemState::SET != pFrameFormat->GetItemState(RES_PAGEDESC, false) &&
+                        SfxItemState::SET != pFrameFormat->GetItemState( RES_BREAK, false ) )
                         pNd = 0;
                 }
             }
 
             if( pNd )
             {
-                SwTxtNode* pTxtNd = m_rDoc.GetNodes().MakeTxtNode(
-                                        SwNodeIndex( *pTblNd ),
-                                        m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
-                if( pTxtNd )
+                SwTextNode* pTextNd = m_rDoc.GetNodes().MakeTextNode(
+                                        SwNodeIndex( *pTableNd ),
+                                        m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ));
+                if( pTextNd )
                 {
-                    const_cast<SwPosition&>(rPos).nNode = pTblNd->GetIndex()-1;
-                    const_cast<SwPosition&>(rPos).nContent.Assign( pTxtNd, 0 );
+                    const_cast<SwPosition&>(rPos).nNode = pTableNd->GetIndex()-1;
+                    const_cast<SwPosition&>(rPos).nContent.Assign( pTextNd, 0 );
 
                     // only add page breaks/styles to the body area
                     if( nPrevPos > m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
-                        SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
+                        SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
                         const SfxPoolItem *pItem;
-                        if( SfxItemState::SET == pFrmFmt->GetItemState( RES_PAGEDESC,
+                        if( SfxItemState::SET == pFrameFormat->GetItemState( RES_PAGEDESC,
                             false, &pItem ) )
                         {
-                            pTxtNd->SetAttr( *pItem );
-                            pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
+                            pTextNd->SetAttr( *pItem );
+                            pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
                         }
-                        if( SfxItemState::SET == pFrmFmt->GetItemState( RES_BREAK,
+                        if( SfxItemState::SET == pFrameFormat->GetItemState( RES_BREAK,
                             false, &pItem ) )
                         {
-                            pTxtNd->SetAttr( *pItem );
-                            pFrmFmt->ResetFmtAttr( RES_BREAK );
+                            pTextNd->SetAttr( *pItem );
+                            pFrameFormat->ResetFormatAttr( RES_BREAK );
                         }
                     }
 
                     if( pUndo )
-                        pUndo->SetTblFlag();
+                        pUndo->SetTableFlag();
                     m_rDoc.getIDocumentState().SetModified();
                     return true;
                 }
@@ -2875,19 +2875,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
         }
     }
 
-    const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-    pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
-    // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
-    OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?");
-    pNode = pNode->SplitCntntNode( rPos );
+    const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+    pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+    // FIXME: only SwTextNode has a valid implementation of SplitContentNode!
+    OSL_ENSURE(pNode->IsTextNode(), "splitting non-text node?");
+    pNode = pNode->SplitContentNode( rPos );
     if (pNode)
     {
         // move all bookmarks, TOXMarks, FlyAtCnt
-        if( !pCntntStore->Empty() )
-            pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+        if( !pContentStore->Empty() )
+            pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
 
-        // To-Do - add 'SwExtraRedlineTbl' also ?
-        if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+        // To-Do - add 'SwExtraRedlineTable' also ?
+        if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
         {
             SwPaM aPam( rPos );
             aPam.SetMark();
@@ -2903,19 +2903,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
     return true;
 }
 
-bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
+bool DocumentContentOperationsManager::AppendTextNode( SwPosition& rPos )
 {
     // create new node before EndOfContent
-    SwTxtNode * pCurNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * pCurNode = rPos.nNode.GetNode().GetTextNode();
     if( !pCurNode )
     {
         // so then one can be created!
         SwNodeIndex aIdx( rPos.nNode, 1 );
-        pCurNode = m_rDoc.GetNodes().MakeTxtNode( aIdx,
-                        m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+        pCurNode = m_rDoc.GetNodes().MakeTextNode( aIdx,
+                        m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
     }
     else
-        pCurNode = pCurNode->AppendNode( rPos )->GetTxtNode();
+        pCurNode = pCurNode->AppendNode( rPos )->GetTextNode();
 
     rPos.nNode++;
     rPos.nContent.Assign( pCurNode, 0 );
@@ -2925,8 +2925,8 @@ bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) );
     }
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         SwPaM aPam( rPos );
         aPam.SetMark();
@@ -3073,14 +3073,14 @@ bool DocumentContentOperationsManager::InsertItemSet ( const SwPaM &rRg, const S
 
 void DocumentContentOperationsManager::RemoveLeadingWhiteSpace(const SwPosition & rPos )
 {
-    const SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     if ( pTNd )
     {
-        const OUString& rTxt = pTNd->GetTxt();
+        const OUString& rText = pTNd->GetText();
         sal_Int32 nIdx = 0;
-        while (nIdx < rTxt.getLength())
+        while (nIdx < rText.getLength())
         {
-            sal_Unicode const cCh = rTxt[nIdx];
+            sal_Unicode const cCh = rText[nIdx];
             if (('\t' != cCh) && (' ' != cCh))
             {
                 break;
@@ -3184,18 +3184,18 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
     // managed in the DrawModel).
     SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
     ::std::set< _ZSortFly > aSet;
-    const size_t nArrLen = m_rDoc.GetSpzFrmFmts()->size();
+    const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size();
 
     SwTextBoxHelper::SavedLink aOldTextBoxes;
-    SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrmFmts(), aOldTextBoxes);
+    SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrameFormats(), aOldTextBoxes);
     SwTextBoxHelper::SavedContent aOldContent;
 
     for ( size_t n = 0; n < nArrLen; ++n )
     {
-        SwFrmFmt* pFmt = (*m_rDoc.GetSpzFrmFmts())[n];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
-        bool bAtCntnt = (pAnchor->GetAnchorId() == FLY_AT_PARA);
+        SwFrameFormat* pFormat = (*m_rDoc.GetSpzFrameFormats())[n];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
+        bool bAtContent = (pAnchor->GetAnchorId() == FLY_AT_PARA);
         if ( !pAPos )
             continue;
         switch ( pAnchor->GetAnchorId() )
@@ -3231,10 +3231,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             bool bLastNode = false;
             // is the node empty?
             const SwNodes& rNodes = pAPos->nNode.GetNodes();
-            SwTxtNode* pTxtNode;
-            if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+            SwTextNode* pTextNode;
+            if( 0 != ( pTextNode = pAPos->nNode.GetNode().GetTextNode() ))
             {
-                bEmptyNode = pTxtNode->GetTxt().isEmpty();
+                bEmptyNode = pTextNode->GetText().isEmpty();
                 if( bEmptyNode )
                 {
                     //last node information is only necessary to know for the last TextNode
@@ -3254,7 +3254,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             bAdd = bLastNode && bEmptyNode;
             if( !bAdd )
             {
-                if( bAtCntnt )
+                if( bAtContent )
                     bAdd = nEndContentIndex > 0;
                 else
                     bAdd = pAPos->nContent <= nEndContentIndex;
@@ -3264,24 +3264,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // Make sure draw formats don't refer to content, so that such
             // content can be removed without problems.
-            SwTextBoxHelper::resetLink(pFmt, aOldContent);
-            aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size() ));
+            SwTextBoxHelper::resetLink(pFormat, aOldContent);
+            aSet.insert( _ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
         }
     }
 
     // Store all copied (and also the newly created) frames in another array.
     // They are stored as matching the originals, so that we will be later
     // able to build the chains accordingly.
-    ::std::vector< SwFrmFmt* > aVecSwFrmFmt;
+    ::std::vector< SwFrameFormat* > aVecSwFrameFormat;
     ::std::set< _ZSortFly >::const_iterator it=aSet.begin();
 
     while (it != aSet.end())
     {
         // #i59964#
         // correct determination of new anchor position
-        SwFmtAnchor aAnchor( *(*it).GetAnchor() );
-        assert( aAnchor.GetCntntAnchor() != NULL );
-        SwPosition newPos = *aAnchor.GetCntntAnchor();
+        SwFormatAnchor aAnchor( *(*it).GetAnchor() );
+        assert( aAnchor.GetContentAnchor() != NULL );
+        SwPosition newPos = *aAnchor.GetContentAnchor();
         // for at-paragraph and at-character anchored objects the new anchor
         // position can *not* be determined by the difference of the current
         // anchor position to the start of the copied range, because not
@@ -3294,28 +3294,28 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // First, determine number of anchor text node in the copied range.
             // Note: The anchor text node *have* to be inside the copied range.
-            sal_uLong nAnchorTxtNdNumInRange( 0L );
-            bool bAnchorTxtNdFound( false );
+            sal_uLong nAnchorTextNdNumInRange( 0L );
+            bool bAnchorTextNdFound( false );
             SwNodeIndex aIdx( rRg.aStart );
-            while ( !bAnchorTxtNdFound && aIdx <= rRg.aEnd )
+            while ( !bAnchorTextNdFound && aIdx <= rRg.aEnd )
             {
-                if ( aIdx.GetNode().IsTxtNode() )
+                if ( aIdx.GetNode().IsTextNode() )
                 {
-                    ++nAnchorTxtNdNumInRange;
-                    bAnchorTxtNdFound = aAnchor.GetCntntAnchor()->nNode == aIdx;
+                    ++nAnchorTextNdNumInRange;
+                    bAnchorTextNdFound = aAnchor.GetContentAnchor()->nNode == aIdx;
                 }
 
                 ++aIdx;
             }
             if ( bMergedFirstNode )
-                nAnchorTxtNdNumInRange--;
+                nAnchorTextNdNumInRange--;
 
-            if ( !bAnchorTxtNdFound )
+            if ( !bAnchorTextNdFound )
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
                 OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
-                nAnchorTxtNdNumInRange = 1;
+                nAnchorTextNdNumInRange = 1;
             }
             // Second, search corresponding text node in destination document
             // by counting forward from start insert position <rStartIdx> the
@@ -3324,24 +3324,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             SwNodeIndex aAnchorNdIdx( rStartIdx );
             const SwNode& aEndOfContentNd =
                                     aIdx.GetNode().GetNodes().GetEndOfContent();
-            while ( nAnchorTxtNdNumInRange > 0 &&
+            while ( nAnchorTextNdNumInRange > 0 &&
                     &(aIdx.GetNode()) != &aEndOfContentNd )
             {
-                if ( aIdx.GetNode().IsTxtNode() )
+                if ( aIdx.GetNode().IsTextNode() )
                 {
-                    --nAnchorTxtNdNumInRange;
+                    --nAnchorTextNdNumInRange;
                     aAnchorNdIdx = aIdx;
                 }
 
                 ++aIdx;
             }
-            if ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+            if ( !aAnchorNdIdx.GetNode().IsTextNode() )
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
                 OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
                 aAnchorNdIdx = rStartIdx;
-                while ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+                while ( !aAnchorNdIdx.GetNode().IsTextNode() )
                 {
                     ++aAnchorNdIdx;
                 }
@@ -3357,9 +3357,9 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         }
         // Set the character bound Flys back at the original character
         if ((FLY_AT_CHAR == aAnchor.GetAnchorId()) &&
-             newPos.nNode.GetNode().IsTxtNode() )
+             newPos.nNode.GetNode().IsTextNode() )
         {
-            newPos.nContent.Assign( newPos.nNode.GetNode().GetTxtNode(), newPos.nContent.GetIndex() );
+            newPos.nContent.Assign( newPos.nNode.GetNode().GetTextNode(), newPos.nContent.GetIndex() );
         }
         else
         {
@@ -3370,10 +3370,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         // Check recursion: copy content in its own frame, then don't copy it.
         if( pDest == &m_rDoc )
         {
-            const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
+            const SwFormatContent& rContent = (*it).GetFormat()->GetContent();
             const SwStartNode* pSNd;
-            if( rCntnt.GetCntntIdx() &&
-                0 != ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ) &&
+            if( rContent.GetContentIdx() &&
+                0 != ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ) &&
                 pSNd->GetIndex() < rStartIdx.GetIndex() &&
                 rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
             {
@@ -3383,36 +3383,36 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         }
 
         // Copy the format and set the new anchor
-        aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
+        aVecSwFrameFormat.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFormat( *(*it).GetFormat(),
                 aAnchor, false, true ) );
         ++it;
     }
 
     // Rebuild as much as possible of all chains that are available in the original,
-    OSL_ENSURE( aSet.size() == aVecSwFrmFmt.size(), "Missing new Flys" );
-    if ( aSet.size() == aVecSwFrmFmt.size() )
+    OSL_ENSURE( aSet.size() == aVecSwFrameFormat.size(), "Missing new Flys" );
+    if ( aSet.size() == aVecSwFrameFormat.size() )
     {
         size_t n = 0;
         for (::std::set< _ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n )
         {
-            const SwFrmFmt *pFmtN = (*nIt).GetFmt();
-            const SwFmtChain &rChain = pFmtN->GetChain();
+            const SwFrameFormat *pFormatN = (*nIt).GetFormat();
+            const SwFormatChain &rChain = pFormatN->GetChain();
             int nCnt = int(0 != rChain.GetPrev());
             nCnt += rChain.GetNext() ? 1: 0;
             size_t k = 0;
             for (::std::set< _ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k )
             {
-                const SwFrmFmt *pFmtK = (*kIt).GetFmt();
-                if ( rChain.GetPrev() == pFmtK )
+                const SwFrameFormat *pFormatK = (*kIt).GetFormat();
+                if ( rChain.GetPrev() == pFormatK )
                 {
-                    ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]),
-                                     static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]) );
+                    ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]),
+                                     static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]) );
                     --nCnt;
                 }
-                else if ( rChain.GetNext() == pFmtK )
+                else if ( rChain.GetNext() == pFormatK )
                 {
-                    ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]),
-                                     static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]) );
+                    ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]),
+                                     static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]) );
                     --nCnt;
                 }
             }
@@ -3420,27 +3420,27 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
 
         // Re-create content property of draw formats, knowing how old shapes
         // were paired with old fly formats (aOldTextBoxes) and that aSet is
-        // parallel with aVecSwFrmFmt.
-        SwTextBoxHelper::restoreLinks(aSet, aVecSwFrmFmt, aOldTextBoxes, aOldContent);
+        // parallel with aVecSwFrameFormat.
+        SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes, aOldContent);
     }
 }
 
 /*
  * Reset the text's hard formatting
  */
-/** @params pArgs contains the document's ChrFmtTable
+/** @params pArgs contains the document's ChrFormatTable
  *                Is need for selections at the beginning/end and with no SSelection.
  */
-bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
+bool DocumentContentOperationsManager::lcl_RstTextAttr( const SwNodePtr& rpNd, void* pArgs )
 {
-    ParaRstFmt* pPara = static_cast<ParaRstFmt*>(pArgs);
-    SwTxtNode * pTxtNode = rpNd->GetTxtNode();
-    if( pTxtNode && pTxtNode->GetpSwpHints() )
+    ParaRstFormat* pPara = static_cast<ParaRstFormat*>(pArgs);
+    SwTextNode * pTextNode = rpNd->GetTextNode();
+    if( pTextNode && pTextNode->GetpSwpHints() )
     {
-        SwIndex aSt( pTxtNode, 0 );
-        sal_Int32 nEnd = pTxtNode->Len();
+        SwIndex aSt( pTextNode, 0 );
+        sal_Int32 nEnd = pTextNode->Len();
 
-        if( &pPara->pSttNd->nNode.GetNode() == pTxtNode &&
+        if( &pPara->pSttNd->nNode.GetNode() == pTextNode &&
             pPara->pSttNd->nContent.GetIndex() )
             aSt = pPara->pSttNd->nContent.GetIndex();
 
@@ -3450,15 +3450,15 @@ bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, vo
         if( pPara->pHistory )
         {
             // Save all attributes for the Undo.
-            SwRegHistory aRHst( *pTxtNode, pPara->pHistory );
-            pTxtNode->GetpSwpHints()->Register( &aRHst );
-            pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+            SwRegHistory aRHst( *pTextNode, pPara->pHistory );
+            pTextNode->GetpSwpHints()->Register( &aRHst );
+            pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
                                   pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
-            if( pTxtNode->GetpSwpHints() )
-                pTxtNode->GetpSwpHints()->DeRegister();
+            if( pTextNode->GetpSwpHints() )
+                pTextNode->GetpSwpHints()->DeRegister();
         }
         else
-            pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+            pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
                                   pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
     }
     return true;
@@ -3528,8 +3528,8 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
 bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
                                const bool bForceJoinNext )
 {
-    bool bJoinTxt, bJoinPrev;
-    ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+    bool bJoinText, bJoinPrev;
+    ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
     // #i100466#
     if ( bForceJoinNext )
     {
@@ -3542,7 +3542,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
             return false;
     }
 
-    if( bJoinTxt )
+    if( bJoinText )
     {
         ::sw_JoinText( rPam, bJoinPrev );
     }
@@ -3584,22 +3584,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
     {
         // Delete all empty TextHints at the Mark's position
-        SwTxtNode* pTxtNd = rPam.GetMark()->nNode.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = rPam.GetMark()->nNode.GetNode().GetTextNode();
         SwpHints* pHts;
-        if( pTxtNd &&  0 != ( pHts = pTxtNd->GetpSwpHints()) && pHts->Count() )
+        if( pTextNd &&  0 != ( pHts = pTextNd->GetpSwpHints()) && pHts->Count() )
         {
             const sal_Int32 *pEndIdx;
             const sal_Int32 nMkCntPos = rPam.GetMark()->nContent.GetIndex();
             for( size_t n = pHts->Count(); n; )
             {
-                const SwTxtAttr* pAttr = (*pHts)[ --n ];
+                const SwTextAttr* pAttr = (*pHts)[ --n ];
                 if( nMkCntPos > pAttr->GetStart() )
                     break;
 
                 if( nMkCntPos == pAttr->GetStart() &&
                     0 != (pEndIdx = pAttr->End()) &&
                     *pEndIdx == pAttr->GetStart() )
-                    pTxtNd->DestroyAttr( pHts->Cut( n ) );
+                    pTextNd->DestroyAttr( pHts->Cut( n ) );
             }
         }
     }
@@ -3636,7 +3636,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
         return true;
     }
 
-    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
         m_rDoc.getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX );
 
     // Delete and move all "Flys at the paragraph", which are within the Selection
@@ -3649,13 +3649,13 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
         &pEnd->nContent);
 
     SwNodeIndex aSttIdx( pStt->nNode );
-    SwCntntNode * pCNd = aSttIdx.GetNode().GetCntntNode();
+    SwContentNode * pCNd = aSttIdx.GetNode().GetContentNode();
 
     do {        // middle checked loop!
         if( pCNd )
         {
-            SwTxtNode * pStartTxtNode( pCNd->GetTxtNode() );
-            if ( pStartTxtNode )
+            SwTextNode * pStartTextNode( pCNd->GetTextNode() );
+            if ( pStartTextNode )
             {
                 // now move the Content to the new Node
                 bool bOneNd = pStt->nNode == pEnd->nNode;
@@ -3666,12 +3666,12 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
                 // Don't call again, if already empty
                 if( nLen )
                 {
-                    pStartTxtNode->EraseText( pStt->nContent, nLen );
+                    pStartTextNode->EraseText( pStt->nContent, nLen );
 
-                    if( !pStartTxtNode->Len() )
+                    if( !pStartTextNode->Len() )
                     {
                 // METADATA: remove reference if empty (consider node deleted)
-                        pStartTxtNode->RemoveMetadataReference();
+                        pStartTextNode->RemoveMetadataReference();
                     }
                 }
 
@@ -3688,22 +3688,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
             }
         }
 
-        pCNd = pEnd->nNode.GetNode().GetCntntNode();
+        pCNd = pEnd->nNode.GetNode().GetContentNode();
         if( pCNd )
         {
-            SwTxtNode * pEndTxtNode( pCNd->GetTxtNode() );
-            if( pEndTxtNode )
+            SwTextNode * pEndTextNode( pCNd->GetTextNode() );
+            if( pEndTextNode )
             {
                 // if already empty, don't call again
                 if( pEnd->nContent.GetIndex() )
                 {
                     SwIndex aIdx( pCNd, 0 );
-                    pEndTxtNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
+                    pEndTextNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
 
-                    if( !pEndTxtNode->Len() )
+                    if( !pEndTextNode->Len() )
                     {
                         // METADATA: remove reference if empty (consider node deleted)
-                        pEndTxtNode->RemoveMetadataReference();
+                        pEndTextNode->RemoveMetadataReference();
                     }
                 }
             }
@@ -3728,7 +3728,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
         // If the Node that contained the Cursor has been deleted,
         // the Content has to be assigned to the current Content.
-        pStt->nContent.Assign( pStt->nNode.GetNode().GetCntntNode(),
+        pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
                                 pStt->nContent.GetIndex() );
 
         // If we deleted across Node boundaries we have to correct the PaM,
@@ -3739,7 +3739,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
     } while( false );
 
-    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
         m_rDoc.getIDocumentRedlineAccess().CompressRedlines();
     m_rDoc.getIDocumentState().SetModified();
 
@@ -3754,8 +3754,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
         return false;
 
-    bool bJoinTxt, bJoinPrev;
-    ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+    bool bJoinText, bJoinPrev;
+    ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
 
     {
         // Create a copy of the Cursor in order to move all Pams from
@@ -3774,7 +3774,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
         // Own Undo?
         OUString sRepl( rStr );
-        SwTxtNode* pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = pStt->nNode.GetNode().GetTextNode();
         sal_Int32 nStt = pStt->nContent.GetIndex();
         sal_Int32 nEnd;
 
@@ -3800,7 +3800,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                     *aDelPam.GetMark() = pBkmk->GetOtherMarkPos();
                 m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
                 pStt = aDelPam.Start();
-                pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+                pTextNd = pStt->nNode.GetNode().GetTextNode();
                 nStt = pStt->nContent.GetIndex();
             }
 
@@ -3811,7 +3811,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                             RES_CHRATR_BEGIN,     RES_TXTATR_WITHEND_END - 1,
                             RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                             0 );
-                pTxtNd->GetAttr( aSet, nStt+1, nStt+1 );
+                pTextNd->GetAttr( aSet, nStt+1, nStt+1 );
 
                 aSet.ClearItem( RES_TXTATR_REFMARK );
                 aSet.ClearItem( RES_TXTATR_TOXMARK );
@@ -3842,7 +3842,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                         ++aMkNd;
                         aDelPam.GetMark()->nNode = aMkNd;
                         aDelPam.GetMark()->nContent.Assign(
-                                    aMkNd.GetNode().GetCntntNode(), nMkCnt );
+                                    aMkNd.GetNode().GetContentNode(), nMkCnt );
                         bFirst = false;
                     }
                     else
@@ -3858,11 +3858,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
                 ++aPtNd;
                 aDelPam.GetPoint()->nNode = aPtNd;
-                aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+                aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
                                                     nPtCnt);
                 *aTmpRange.GetMark() = *aDelPam.GetPoint();
 
-                m_rDoc.RstTxtAttrs( aTmpRange );
+                m_rDoc.RstTextAttrs( aTmpRange );
                 InsertItemSet( aTmpRange, aSet );
             }
 
@@ -3897,11 +3897,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                     *rPam.GetMark() = pBkmk->GetOtherMarkPos();
                 m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
             }
-            bJoinTxt = false;
+            bJoinText = false;
         }
         else
         {
-            if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() )
+            if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() )
                 m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aDelPam, true, USHRT_MAX );
 
             SwUndoReplace* pUndoRpl = 0;
@@ -3922,19 +3922,19 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
             // Set the values again, if Frames or footnotes on the Text have been removed.
             nStt = nPtCnt;
             nEnd = bOneNode ? pEnd->nContent.GetIndex()
-                            : pTxtNd->GetTxt().getLength();
+                            : pTextNd->GetText().getLength();
 
             bool bFirst = true;
             OUString sIns;
             while ( lcl_GetTokenToParaBreak( sRepl, sIns, bRegExReplace ) )
             {
-                if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+                if (!bFirst || nStt == pTextNd->GetText().getLength())
                 {
                     InsertString( aDelPam, sIns );
                 }
                 else if( nStt < nEnd || !sIns.isEmpty() )
                 {
-                    pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+                    pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
                 }
                 SplitNode( *pStt, false);
                 bFirst = false;
@@ -3942,23 +3942,23 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
             if( bFirst || !sIns.isEmpty() )
             {
-                if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+                if (!bFirst || nStt == pTextNd->GetText().getLength())
                 {
                     InsertString( aDelPam, sIns );
                 }
                 else if( nStt < nEnd || !sIns.isEmpty() )
                 {
-                    pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+                    pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
                 }
             }
 
             *rPam.GetPoint() = *aDelPam.GetMark();
             ++aPtNd;
             rPam.GetMark()->nNode = aPtNd;
-            rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+            rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
                                                 nPtCnt );
 
-            if (bJoinTxt)
+            if (bJoinText)
             {
                 assert(rPam.GetPoint() == rPam.End());
                 // move so that SetEnd remembers position after sw_JoinText
@@ -3978,7 +3978,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     }
 
     bool bRet(true);
-    if (bJoinTxt)
+    if (bJoinText)
     {
         bRet = ::sw_JoinText(rPam, bJoinPrev);
     }
@@ -3987,20 +3987,20 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     return bRet;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition& rPos, SwNoTxtNode* pNode,
+SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode,
                                     const SfxItemSet* pFlyAttrSet,
                                     const SfxItemSet* pGrfAttrSet,
-                                    SwFrmFmt* pFrmFmt)
+                                    SwFrameFormat* pFrameFormat)
 {
-    SwFlyFrmFmt *pFmt = 0;
+    SwFlyFrameFormat *pFormat = 0;
     if( pNode )
     {
-        pFmt = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
-                                pFlyAttrSet, pFrmFmt );
+        pFormat = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
+                                pFlyAttrSet, pFrameFormat );
         if( pGrfAttrSet )
             pNode->SetAttr( *pGrfAttrSet );
     }
-    return pFmt;
+    return pFormat;
 }
 
 #define NUMRULE_STATE \
@@ -4010,18 +4010,18 @@ SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition&
      SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() ); \
 
 #define PUSH_NUMRULE_STATE \
-     lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd );
+     lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd );
 
 #define POP_NUMRULE_STATE \
-     lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd, rPam );
+     lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd, rPam );
 
 static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aNumRuleItem,
                                   SfxItemState &aListIdState, SfxStringItem &aListIdItem,
-                                  const SwTxtNode *pDestTxtNd )
+                                  const SwTextNode *pDestTextNd )
 {
     // Safe numrule item at destination.
     // #i86492# - Safe also <ListId> item of destination.
-    const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
+    const SfxItemSet * pAttrSet = pDestTextNd->GetpSwAttrSet();
     if (pAttrSet != NULL)
     {
         const SfxPoolItem * pItem = NULL;
@@ -4040,7 +4040,7 @@ static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aN
 
 static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem &aNumRuleItem,
                                  SfxItemState aListIdState, const SfxStringItem &aListIdItem,
-                                 SwTxtNode *pDestTxtNd, const SwPaM& rPam )
+                                 SwTextNode *pDestTextNd, const SwPaM& rPam )
 {
     /* If only a part of one paragraph is copied
        restore the numrule at the destination. */
@@ -4049,19 +4049,19 @@ static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem
     {
         if (SfxItemState::SET == aNumRuleState)
         {
-            pDestTxtNd->SetAttr(aNumRuleItem);
+            pDestTextNd->SetAttr(aNumRuleItem);
         }
         else
         {
-            pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+            pDestTextNd->ResetAttr(RES_PARATR_NUMRULE);
         }
         if (SfxItemState::SET == aListIdState)
         {
-            pDestTxtNd->SetAttr(aListIdItem);
+            pDestTextNd->SetAttr(aListIdItem);
         }
         else
         {
-            pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+            pDestTextNd->ResetAttr(RES_PARATR_LIST_ID);
         }
     }
 }
@@ -4093,7 +4093,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // removing the redlines so use cursor that is corrected by PaMCorrAbs
     std::unique_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos));
 
-    SwTblNumFmtMerge aTNFM( m_rDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( m_rDoc, *pDoc );
 
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
@@ -4107,7 +4107,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // Move the PaM one node back from the insert position, so that
     // the position doesn't get moved
     pCopyPam->SetMark();
-    bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoCntnt);
+    bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoContent);
     // If the position was shifted from more than one node, an end node has been skipped
     bool bAfterTable = false;
     if ((rPos.nNode.GetIndex() - pCopyPam->GetPoint()->nNode.GetIndex()) > 1)
@@ -4125,14 +4125,14 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     SwNodeRange aRg( pStt->nNode, pEnd->nNode );
     SwNodeIndex aInsPos( rPos.nNode );
     const bool bOneNode = pStt->nNode == pEnd->nNode;
-    SwTxtNode* pSttTxtNd = pStt->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pDestTxtNd = aInsPos.GetNode().GetTxtNode();
-    bool bCopyCollFmt = !pDoc->IsInsOnlyTextGlossary() &&
-                        ( (pDestTxtNd && !pDestTxtNd->GetTxt().getLength()) ||
+    SwTextNode* pSttTextNd = pStt->nNode.GetNode().GetTextNode();
+    SwTextNode* pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
+    SwTextNode* pDestTextNd = aInsPos.GetNode().GetTextNode();
+    bool bCopyCollFormat = !pDoc->IsInsOnlyTextGlossary() &&
+                        ( (pDestTextNd && !pDestTextNd->GetText().getLength()) ||
                           ( !bOneNode && !rPos.nContent.GetIndex() ) );
     bool bCopyBookmarks = true;
-    bool bStartIsTxtNode = 0 != pSttTxtNd;
+    bool bStartIsTextNode = 0 != pSttTextNd;
 
     // #i104585# copy outline num rule to clipboard (for ASCII filter)
     if (pDoc->IsClipBoard() && m_rDoc.GetOutlineNumRule())
@@ -4158,8 +4158,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // - destination is an empty paragraph which is not in a list and
     // - source contains at least one paragraph which is not in a list
     if ( pNumRuleToPropagate &&
-         pDestTxtNd && !pDestTxtNd->GetTxt().getLength() &&
-         !pDestTxtNd->IsInList() &&
+         pDestTextNd && !pDestTextNd->GetText().getLength() &&
+         !pDestTextNd->IsInList() &&
          !lcl_ContainsOnlyParagraphsInList( rPam ) )
     {
         pNumRuleToPropagate = 0;
@@ -4169,31 +4169,31 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
 
     // This do/while block is only there so that we can break out of it!
     do {
-        if( pSttTxtNd )
+        if( pSttTextNd )
         {
             // Don't copy the beginning completely?
-            if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
+            if( !bCopyCollFormat || bColumnSel || pStt->nContent.GetIndex() )
             {
                 bHandledStartNode = true;
 
                 SwIndex aDestIdx( rPos.nContent );
                 bool bCopyOk = false;
-                if( !pDestTxtNd )
+                if( !pDestTextNd )
                 {
                     if( pStt->nContent.GetIndex() || bOneNode )
-                        pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
-                            pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
+                        pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+                            pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
                     else
                     {
-                        pDestTxtNd = pSttTxtNd->MakeCopy( pDoc, aInsPos )->GetTxtNode();
+                        pDestTextNd = pSttTextNd->MakeCopy( pDoc, aInsPos )->GetTextNode();
                         bCopyOk = true;
                     }
-                    aDestIdx.Assign( pDestTxtNd, 0 );
-                    bCopyCollFmt = true;
+                    aDestIdx.Assign( pDestTextNd, 0 );
+                    bCopyCollFormat = true;
                 }
                 else if( !bOneNode || bColumnSel )
                 {
-                    const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+                    const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
                     {
                         ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                         pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4202,13 +4202,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                     if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
                     {
                         // after the SplitNode, span the CpyPam correctly again
-                        pCopyPam->Move( fnMoveBackward, fnGoCntnt );
-                        pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+                        pCopyPam->Move( fnMoveBackward, fnGoContent );
+                        pCopyPam->Move( fnMoveBackward, fnGoContent );
                     }
 
-                    pDestTxtNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTxtNode();
+                    pDestTextNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTextNode();
                     aDestIdx.Assign(
-                            pDestTxtNd, pDestTxtNd->GetTxt().getLength());
+                            pDestTextNd, pDestTextNd->GetText().getLength());
 
                     // Correct the area again
                     if( bEndEqualIns )
@@ -4216,25 +4216,25 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                         bool bChg = pEnd != rPam.GetPoint();
                         if( bChg )
                             rPam.Exchange();
-                        rPam.Move( fnMoveBackward, fnGoCntnt );
+                        rPam.Move( fnMoveBackward, fnGoContent );
                         if( bChg )
                             rPam.Exchange();
 
                         aRg.aEnd = pEnd->nNode;
-                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
                     }
                     else if( rPos == *pEnd )
                     {
                         // The end was also moved
                         pEnd->nNode--;
-                        pEnd->nContent.Assign( pDestTxtNd, nCntntEnd );
+                        pEnd->nContent.Assign( pDestTextNd, nContentEnd );
                         aRg.aEnd = pEnd->nNode;
-                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
                     }
                 }
 
                 NUMRULE_STATE
-                if( bCopyCollFmt && bOneNode )
+                if( bCopyCollFormat && bOneNode )
                 {
                     PUSH_NUMRULE_STATE
                 }
@@ -4243,37 +4243,37 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 {
                     const sal_Int32 nCpyLen = ( (bOneNode)
                                            ? pEnd->nContent.GetIndex()
-                                           : pSttTxtNd->GetTxt().getLength())
+                                           : pSttTextNd->GetText().getLength())
                                          - pStt->nContent.GetIndex();
-                    pSttTxtNd->CopyText( pDestTxtNd, aDestIdx,
+                    pSttTextNd->CopyText( pDestTextNd, aDestIdx,
                                             pStt->nContent, nCpyLen );
                     if( bEndEqualIns )
                         pEnd->nContent -= nCpyLen;
                 }
 
-                if( bCopyCollFmt && bOneNode )
+                if( bCopyCollFormat && bOneNode )
                 {
-                    pSttTxtNd->CopyCollFmt( *pDestTxtNd );
+                    pSttTextNd->CopyCollFormat( *pDestTextNd );
                     POP_NUMRULE_STATE
                 }
             }
         }
-        else if( pDestTxtNd )
+        else if( pDestTextNd )
         {
             // Problems with insertion of table selections into "normal" text solved.
             // We have to set the correct PaM for Undo, if this PaM starts in a textnode,
             // the undo operation will try to merge this node after removing the table.
             // If we didn't split a textnode, the PaM should start at the inserted table node
-            if( rPos.nContent.GetIndex() == pDestTxtNd->Len() )
+            if( rPos.nContent.GetIndex() == pDestTextNd->Len() )
             {    // Insertion at the last position of a textnode (empty or not)
                 ++aInsPos; // The table will be inserted behind the text node
             }
             else if( rPos.nContent.GetIndex() )
             {   // Insertion in the middle of a text node, it has to be split
                 // (and joined from undo)
-                bStartIsTxtNode = true;
+                bStartIsTextNode = true;
 
-                const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+                const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
                 {
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4282,8 +4282,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
                 {
                     // after the SplitNode, span the CpyPam correctly again
-                    pCopyPam->Move( fnMoveBackward, fnGoCntnt );
-                    pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+                    pCopyPam->Move( fnMoveBackward, fnGoContent );
+                    pCopyPam->Move( fnMoveBackward, fnGoContent );
                 }
 
                 // Correct the area again
@@ -4293,8 +4293,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 else if( rPos == *pEnd )
                 {
                     rPos.nNode-=2;
-                    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
-                                            nCntntEnd );
+                    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+                                            nContentEnd );
                     rPos.nNode++;
                     aRg.aEnd--;
                 }
@@ -4311,41 +4311,41 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             }
         }
 
-        pDestTxtNd = aInsPos.GetNode().GetTxtNode();
-        if( pEndTxtNd && (!bOneNode || !bHandledStartNode) )
+        pDestTextNd = aInsPos.GetNode().GetTextNode();
+        if( pEndTextNd && (!bOneNode || !bHandledStartNode) )
         {
             SwIndex aDestIdx( rPos.nContent );
-            if( !pDestTxtNd )
+            if( !pDestTextNd )
             {
-                pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
-                            pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
-                aDestIdx.Assign( pDestTxtNd, 0  );
+                pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+                            pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
+                aDestIdx.Assign( pDestTextNd, 0  );
                 aInsPos--;
 
                 // if we have to insert an extra text node
                 // at the destination, this node will be our new destination
-                // (text) node, and thus we set bStartisTxtNode to true. This
+                // (text) node, and thus we set bStartisTextNode to true. This
                 // will ensure that this node will be deleted during Undo
                 // using JoinNext.
-                OSL_ENSURE( !bStartIsTxtNode, "Oops, undo may be instable now." );
-                bStartIsTxtNode = true;
+                OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable now." );
+                bStartIsTextNode = true;
             }
 
-            const bool bEmptyDestNd = pDestTxtNd->GetTxt().isEmpty();
+            const bool bEmptyDestNd = pDestTextNd->GetText().isEmpty();
 
             NUMRULE_STATE
-            if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+            if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
             {
                 PUSH_NUMRULE_STATE
             }
 
-            pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
+            pEndTextNd->CopyText( pDestTextNd, aDestIdx, SwIndex( pEndTextNd ),
                             pEnd->nContent.GetIndex() );
 
             // Also copy all format templates
-            if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+            if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
             {
-                pEndTxtNd->CopyCollFmt( *pDestTxtNd );
+                pEndTextNd->CopyCollFormat( *pDestTextNd );
                 if ( bOneNode )
                 {
                     POP_NUMRULE_STATE
@@ -4356,13 +4356,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
         if( bCopyAll || aRg.aStart != aRg.aEnd )
         {
             SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
-            if( !bOneNode && pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
+            if( !bOneNode && pSttTextNd && bCopyCollFormat && pDestTextNd->HasSwAttrSet() )
             {
-                aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() );
+                aBrkSet.Put( *pDestTextNd->GetpSwAttrSet() );
                 if( SfxItemState::SET == aBrkSet.GetItemState( RES_BREAK, false ) )
-                    pDestTxtNd->ResetAttr( RES_BREAK );
+                    pDestTextNd->ResetAttr( RES_BREAK );
                 if( SfxItemState::SET == aBrkSet.GetItemState( RES_PAGEDESC, false ) )
-                    pDestTxtNd->ResetAttr( RES_PAGEDESC );
+                    pDestTextNd->ResetAttr( RES_PAGEDESC );
             }
 
             if( aInsPos == pEnd->nNode )
@@ -4372,7 +4372,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                                   false, false, bHandledStartNode );
                 ++aSaveIdx;
                 pEnd->nNode = aSaveIdx;
-                pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
+                pEnd->nContent.Assign( aSaveIdx.GetNode().GetTextNode(), 0 );
             }
             else
                 CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam,
@@ -4381,29 +4381,29 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             bCopyBookmarks = false;
 
             // Put the breaks back into the first node
-            if( aBrkSet.Count() && 0 != ( pDestTxtNd = pDoc->GetNodes()[
-                    pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTxtNode()))
+            if( aBrkSet.Count() && 0 != ( pDestTextNd = pDoc->GetNodes()[
+                    pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTextNode()))
             {
-                pDestTxtNd->SetAttr( aBrkSet );
+                pDestTextNd->SetAttr( aBrkSet );
             }
         }
     } while( false );
 
     // Adjust position (in case it was moved / in another node)
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
                             rPos.nContent.GetIndex() );
 
     if( rPos.nNode != aInsPos )
     {
         pCopyPam->GetMark()->nNode = aInsPos;
-        pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetCntntNode(false), 0);
+        pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetContentNode(false), 0);
         rPos = *pCopyPam->GetMark();
     }
     else
         *pCopyPam->GetMark() = rPos;
 
     if ( !bAfterTable )
-        pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoCntnt : fnGoNode );
+        pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoContent : fnGoNode );
     else
     {
         // Reset the offset to 0 as it was before the insertion
@@ -4434,7 +4434,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // If Undo is enabled, store the inserted area
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo->SetInsertRange( *pCopyPam, true, bStartIsTxtNode );
+        pUndo->SetInsertRange( *pCopyPam, true, bStartIsTextNode );
     }
 
     if( pCpyRange )
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 6dd362a19b82..fc1f86b79c09 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -340,7 +340,7 @@ void DocumentDeviceManager::PrtDataChanged()
             pFntCache->Flush();
 
             std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
 
             for(SwViewShell& rShell : pSh->GetRingContainer())
                 rShell.InitPrt(getPrinter(false));
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index bed970f0d55e..50a3ab13af53 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -226,8 +226,8 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel()
         // Broadcast, so that the FormShell can be connected to the DrawView
         if( m_rDoc.GetDocShell() )
         {
-            SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED );
-            m_rDoc.GetDocShell()->Broadcast( aHnt );
+            SfxSimpleHint aHint( SW_BROADCAST_DRAWVIEWS_CREATED );
+            m_rDoc.GetDocShell()->Broadcast( aHint );
         }
     }
     return mpDrawModel;
@@ -372,19 +372,19 @@ SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrL
 
 bool DocumentDrawModelManager::Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem)
 {
-    SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFmts(&rPaM, /*bDrawAlso=*/true);
+    SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFormats(&rPaM, /*bDrawAlso=*/true);
 
     for (const SwPosFlyFrmPtr& pPosFlyFrm : aFrames)
     {
         // Filter for at-paragraph anchored draw frames.
-        const SwFrmFmt& rFrmFmt = pPosFlyFrm->GetFmt();
-        const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
-        if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrmFmt.Which() != RES_DRAWFRMFMT)
+        const SwFrameFormat& rFrameFormat = pPosFlyFrm->GetFormat();
+        const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
+        if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrameFormat.Which() != RES_DRAWFRMFMT)
             continue;
 
         // Does the shape have matching text?
         SdrOutliner& rOutliner = GetDrawModel()->GetDrawOutliner();
-        SdrObject* pObject = const_cast<SdrObject*>(rFrmFmt.FindSdrObject());
+        SdrObject* pObject = const_cast<SdrObject*>(rFrameFormat.FindSdrObject());
         SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject);
         if (!pTextObj)
             continue;
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index a3fe65064e19..dc6122b0a181 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -57,9 +57,9 @@ namespace
 {
     #if HAVE_FEATURE_DBCONNECTIVITY
 
-    static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
+    static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBField )
     {
-        SwDBData aDBData( rDBFld.GetDBData( &rDoc ));
+        SwDBData aDBData( rDBField.GetDBData( &rDoc ));
         OUString sDBNumNm;
         SwDBData aDocData = rDoc.GetDBData();
 
@@ -77,56 +77,56 @@ namespace
 
     #endif
 
-    static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
+    static void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpField& rSGEField,
                             SwDBManager* pMgr )
     {
-        const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
-        if( !pTxtFld )
+        const SwTextField* pTextField = rSGEField.GetTextField();
+        if( !pTextField )
             return ;
 
-        const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-        const sal_uInt16 nFldWhich = pFld->GetTyp()->Which();
+        const SwField* pField = pTextField->GetFormatField().GetField();
+        const sal_uInt16 nFieldWhich = pField->GetTyp()->Which();
 
-        if( RES_SETEXPFLD == nFldWhich )
+        if( RES_SETEXPFLD == nFieldWhich )
         {
             SwSbxValue aValue;
-            if( nsSwGetSetExpType::GSE_EXPR & pFld->GetSubType() )
-                aValue.PutDouble( static_cast<const SwSetExpField*>(pFld)->GetValue() );
+            if( nsSwGetSetExpType::GSE_EXPR & pField->GetSubType() )
+                aValue.PutDouble( static_cast<const SwSetExpField*>(pField)->GetValue() );
             else
                 // Extension to calculate with Strings
-                aValue.PutString( static_cast<const SwSetExpField*>(pFld)->GetExpStr() );
+                aValue.PutString( static_cast<const SwSetExpField*>(pField)->GetExpStr() );
 
             // set the new value in Calculator
-            rCalc.VarChange( pFld->GetTyp()->GetName(), aValue );
+            rCalc.VarChange( pField->GetTyp()->GetName(), aValue );
         }
         else if( pMgr )
         {
     #if !HAVE_FEATURE_DBCONNECTIVITY
             (void) rDoc;
     #else
-            switch( nFldWhich )
+            switch( nFieldWhich )
             {
             case RES_DBNUMSETFLD:
                 {
-                    SwDBNumSetField* pDBFld = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pFld));
+                    SwDBNumSetField* pDBField = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pField));
 
-                    SwDBData aDBData(pDBFld->GetDBData(&rDoc));
+                    SwDBData aDBData(pDBField->GetDBData(&rDoc));
 
-                    if( pDBFld->IsCondValid() &&
+                    if( pDBField->IsCondValid() &&
                         pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
-                        rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBFld),
-                                        pDBFld->GetFormat() );
+                        rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBField),
+                                        pDBField->GetFormat() );
                 }
                 break;
             case RES_DBNEXTSETFLD:
                 {
-                    SwDBNextSetField* pDBFld = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pFld));
-                    SwDBData aDBData(pDBFld->GetDBData(&rDoc));
-                    if( !pDBFld->IsCondValid() ||
+                    SwDBNextSetField* pDBField = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pField));
+                    SwDBData aDBData(pDBField->GetDBData(&rDoc));
+                    if( !pDBField->IsCondValid() ||
                         !pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
                         break;
 
-                    OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBFld));
+                    OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBField));
                     SwCalcExp* pExp = rCalc.VarLook( sDBNumNm );
                     if( pExp )
                         rCalc.VarChange( sDBNumNm, pExp->nValue.GetLong() + 1 );
@@ -143,38 +143,38 @@ namespace sw
 {
 
 DocumentFieldsManager::DocumentFieldsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
-                                                                  mbNewFldLst(true),
-                                                                  mpUpdtFlds( new SwDocUpdtFld( &m_rDoc ) ),
-                                                                  mpFldTypes( new SwFldTypes() ),
-                                                                  mnLockExpFld( 0 )
+                                                                  mbNewFieldLst(true),
+                                                                  mpUpdateFields( new SwDocUpdateField( &m_rDoc ) ),
+                                                                  mpFieldTypes( new SwFieldTypes() ),
+                                                                  mnLockExpField( 0 )
 {
 }
 
-const SwFldTypes* DocumentFieldsManager::GetFldTypes() const
+const SwFieldTypes* DocumentFieldsManager::GetFieldTypes() const
 {
-    return mpFldTypes;
+    return mpFieldTypes;
 }
 
 /** Insert field types
  *
- * @param rFldTyp ???
+ * @param rFieldTyp ???
  * @return Always returns a pointer to the type, if it's new or already added.
  */
-SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
+SwFieldType* DocumentFieldsManager::InsertFieldType(const SwFieldType &rFieldTyp)
 {
-    sal_uInt16 nSize = mpFldTypes->size(),
-            nFldWhich = rFldTyp.Which();
+    sal_uInt16 nSize = mpFieldTypes->size(),
+            nFieldWhich = rFieldTyp.Which();
 
     sal_uInt16 i = INIT_FLDTYPES;
 
-    switch( nFldWhich )
+    switch( nFieldWhich )
     {
     case RES_SETEXPFLD:
             //JP 29.01.96: SequenceFields start at INIT_FLDTYPES - 3!!
             //             Or we get doubble number circles!!
             //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rDoc, when
             //constructing string pools and when reading SetExp fields
-            if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFldTyp).GetType() )
+            if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFieldTyp).GetType() )
                 i -= INIT_SEQ_FLDTYPES;
         // no break;
     case RES_DBFLD:
@@ -182,28 +182,28 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
     case RES_DDEFLD:
         {
             const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
-            OUString sFldNm( rFldTyp.GetName() );
+            OUString sFieldNm( rFieldTyp.GetName() );
             for( ; i < nSize; ++i )
-                if( nFldWhich == (*mpFldTypes)[i]->Which() &&
-                    rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
-                        return (*mpFldTypes)[i];
+                if( nFieldWhich == (*mpFieldTypes)[i]->Which() &&
+                    rSCmp.isEqual( sFieldNm, (*mpFieldTypes)[i]->GetName() ))
+                        return (*mpFieldTypes)[i];
         }
         break;
 
     case RES_AUTHORITY:
         for( ; i < nSize; ++i )
-            if( nFldWhich == (*mpFldTypes)[i]->Which() )
-                return (*mpFldTypes)[i];
+            if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+                return (*mpFieldTypes)[i];
         break;
 
     default:
         for( i = 0; i < nSize; ++i )
-            if( nFldWhich == (*mpFldTypes)[i]->Which() )
-                return (*mpFldTypes)[i];
+            if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+                return (*mpFieldTypes)[i];
     }
 
-    SwFieldType* pNew = rFldTyp.Copy();
-    switch( nFldWhich )
+    SwFieldType* pNew = rFieldTyp.Copy();
+    switch( nFieldWhich )
     {
     case RES_DDEFLD:
         static_cast<SwDDEFieldType*>(pNew)->SetDoc( &m_rDoc );
@@ -220,36 +220,36 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
     case RES_SETEXPFLD:
         static_cast<SwValueFieldType*>(pNew)->SetDoc( &m_rDoc );
         // JP 29.07.96: Optionally prepare FieldList for Calculator:
-        mpUpdtFlds->InsertFldType( *pNew );
+        mpUpdateFields->InsertFieldType( *pNew );
         break;
     case RES_AUTHORITY :
         static_cast<SwAuthorityFieldType*>(pNew)->SetDoc( &m_rDoc );
         break;
     }
 
-    mpFldTypes->insert( mpFldTypes->begin() + nSize, pNew );
+    mpFieldTypes->insert( mpFieldTypes->begin() + nSize, pNew );
     m_rDoc.getIDocumentState().SetModified();
 
-    return (*mpFldTypes)[ nSize ];
+    return (*mpFieldTypes)[ nSize ];
 }
 
 /// @returns the field type of the Doc
-SwFieldType *DocumentFieldsManager::GetSysFldType( const sal_uInt16 eWhich ) const
+SwFieldType *DocumentFieldsManager::GetSysFieldType( const sal_uInt16 eWhich ) const
 {
     for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-        if( eWhich == (*mpFldTypes)[i]->Which() )
-            return (*mpFldTypes)[i];
+        if( eWhich == (*mpFieldTypes)[i]->Which() )
+            return (*mpFieldTypes)[i];
     return 0;
 }
 
 /// Find first type with ResId and name
-SwFieldType* DocumentFieldsManager::GetFldType(
+SwFieldType* DocumentFieldsManager::GetFieldType(
     sal_uInt16 nResId,
     const OUString& rName,
     bool bDbFieldMatching // used in some UNO calls for RES_DBFLD to use different string matching code #i51815#
     ) const
 {
-    sal_uInt16 nSize = mpFldTypes->size(), i = 0;
+    sal_uInt16 nSize = mpFieldTypes->size(), i = 0;
     const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
 
     switch( nResId )
@@ -273,16 +273,16 @@ SwFieldType* DocumentFieldsManager::GetFldType(
     SwFieldType* pRet = 0;
     for( ; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (*mpFldTypes)[i];
+        SwFieldType* pFieldType = (*mpFieldTypes)[i];
 
-        OUString aFldName( pFldType->GetName() );
+        OUString aFieldName( pFieldType->GetName() );
         if (bDbFieldMatching && nResId == RES_DBFLD)    // #i51815#
-            aFldName = aFldName.replace(DB_DELIM, '.');
+            aFieldName = aFieldName.replace(DB_DELIM, '.');
 
-        if( nResId == pFldType->Which() &&
-            rSCmp.isEqual( rName, aFldName ))
+        if( nResId == pFieldType->Which() &&
+            rSCmp.isEqual( rName, aFieldName ))
         {
-            pRet = pFldType;
+            pRet = pFieldType;
             break;
         }
     }
@@ -290,24 +290,24 @@ SwFieldType* DocumentFieldsManager::GetFldType(
 }
 
 /// Remove field type
-void DocumentFieldsManager::RemoveFldType(size_t nFld)
+void DocumentFieldsManager::RemoveFieldType(size_t nField)
 {
-    OSL_ENSURE( INIT_FLDTYPES <= nFld,  "don't remove InitFlds" );
+    OSL_ENSURE( INIT_FLDTYPES <= nField,  "don't remove InitFields" );
     /*
      * Dependent fields present -> ErrRaise
      */
-    size_t nSize = mpFldTypes->size();
-    if(nFld < nSize)
+    size_t nSize = mpFieldTypes->size();
+    if(nField < nSize)
     {
-        SwFieldType* pTmp = (*mpFldTypes)[nFld];
+        SwFieldType* pTmp = (*mpFieldTypes)[nField];
 
-        // JP 29.07.96: Optionally prepare FldLst for Calculator
+        // JP 29.07.96: Optionally prepare FieldLst for Calculator
         sal_uInt16 nWhich = pTmp->Which();
         switch( nWhich )
         {
         case RES_SETEXPFLD:
         case RES_USERFLD:
-            mpUpdtFlds->RemoveFldType( *pTmp );
+            mpUpdateFields->RemoveFieldType( *pTmp );
             // no break;
         case RES_DDEFLD:
             if( pTmp->HasWriterListeners() && !m_rDoc.IsUsed( *pTmp ) )
@@ -329,20 +329,20 @@ void DocumentFieldsManager::RemoveFldType(size_t nFld)
             // delete field type
             delete pTmp;
         }
-        mpFldTypes->erase( mpFldTypes->begin() + nFld );
+        mpFieldTypes->erase( mpFieldTypes->begin() + nField );
         m_rDoc.getIDocumentState().SetModified();
     }
 }
 
 // All have to be re-evaluated.
-void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
+void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB )
 {
     // Call Modify() for every field type,
-    // dependent SwTxtFld get notified ...
+    // dependent SwTextField get notified ...
 
-    for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
+    for( sal_uInt16 i=0; i < mpFieldTypes->size(); ++i)
     {
-        switch( (*mpFldTypes)[i]->Which() )
+        switch( (*mpFieldTypes)[i]->Which() )
         {
             // Update table fields second to last
             // Update references last
@@ -358,10 +358,10 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
             if( !pNewHt )
             {
                 SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
-                (*mpFldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
+                (*mpFieldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
             }
             else
-                (*mpFldTypes)[i]->ModifyNotification( 0, pNewHt );
+                (*mpFieldTypes)[i]->ModifyNotification( 0, pNewHt );
             break;
         }
         case RES_GETEXPFLD:
@@ -372,18 +372,18 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
             if( !pNewHt )
                 break;
         default:
-            (*mpFldTypes)[i]->ModifyNotification ( 0, pNewHt );
+            (*mpFieldTypes)[i]->ModifyNotification ( 0, pNewHt );
         }
     }
 
-    if( !IsExpFldsLocked() )
-        UpdateExpFlds( 0, false );      // update expression fields
+    if( !IsExpFieldsLocked() )
+        UpdateExpFields( 0, false );      // update expression fields
 
     // Tables
-    UpdateTblFlds(pNewHt);
+    UpdateTableFields(pNewHt);
 
     // References
-    UpdateRefFlds(pNewHt);
+    UpdateRefFields(pNewHt);
     if( bCloseDB )
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -394,40 +394,40 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
     m_rDoc.getIDocumentState().SetModified();
 }
 
-void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
+void DocumentFieldsManager::InsDeletedFieldType( SwFieldType& rFieldTyp )
 {
-    // The FldType was marked as deleted and removed from the array.
+    // The FieldType was marked as deleted and removed from the array.
     // One has to look &m_rDoc up again, now.
     // - If it's not present, it can be re-inserted.
     // - If the same type is found, the deleted one has to be renamed.
 
-    sal_uInt16 nSize = mpFldTypes->size(), nFldWhich = rFldTyp.Which();
+    sal_uInt16 nSize = mpFieldTypes->size(), nFieldWhich = rFieldTyp.Which();
     sal_uInt16 i = INIT_FLDTYPES;
 
-    OSL_ENSURE( RES_SETEXPFLD == nFldWhich ||
-            RES_USERFLD == nFldWhich ||
-            RES_DDEFLD == nFldWhich, "Wrong FldType" );
+    OSL_ENSURE( RES_SETEXPFLD == nFieldWhich ||
+            RES_USERFLD == nFieldWhich ||
+            RES_DDEFLD == nFieldWhich, "Wrong FieldType" );
 
     const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
-    const OUString& rFldNm = rFldTyp.GetName();
+    const OUString& rFieldNm = rFieldTyp.GetName();
     SwFieldType* pFnd;
 
     for( ; i < nSize; ++i )
-        if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
-            rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
+        if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
+            rSCmp.isEqual( rFieldNm, pFnd->GetName() ) )
         {
             // find new name
             sal_uInt16 nNum = 1;
             do {
-                OUString sSrch = rFldNm + OUString::number( nNum );
+                OUString sSrch = rFieldNm + OUString::number( nNum );
                 for( i = INIT_FLDTYPES; i < nSize; ++i )
-                    if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+                    if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
                         rSCmp.isEqual( sSrch, pFnd->GetName() ) )
                         break;
 
                 if( i >= nSize )        // not found
                 {
-                    const_cast<OUString&>(rFldNm) = sSrch;
+                    const_cast<OUString&>(rFieldNm) = sSrch;
                     break;      // exit while loop
                 }
                 ++nNum;
@@ -436,17 +436,17 @@ void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
         }
 
     // not found, so insert and delete flag
-    mpFldTypes->insert( mpFldTypes->begin() + nSize, &rFldTyp );
-    switch( nFldWhich )
+    mpFieldTypes->insert( mpFieldTypes->begin() + nSize, &rFieldTyp );
+    switch( nFieldWhich )
     {
     case RES_SETEXPFLD:
-        static_cast<SwSetExpFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwSetExpFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     case RES_USERFLD:
-        static_cast<SwUserFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwUserFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     case RES_DDEFLD:
-        static_cast<SwDDEFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwDDEFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     }
 }
@@ -467,74 +467,74 @@ bool DocumentFieldsManager::PutValueToField(const SwPosition & rPos,
     return pField->PutValue(rVal, nWhich);
 }
 
-bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
-                      SwMsgPoolItem * pMsgHnt,
-                      bool bUpdateFlds)
+bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & rSrcField,
+                      SwMsgPoolItem * pMsgHint,
+                      bool bUpdateFields)
 {
-    OSL_ENSURE(pDstTxtFld, "no field to update!");
+    OSL_ENSURE(pDstTextField, "no field to update!");
 
-    bool bTblSelBreak = false;
+    bool bTableSelBreak = false;
 
-    SwFmtFld * pDstFmtFld = const_cast<SwFmtFld*>(&pDstTxtFld->GetFmtFld());
-    SwField * pDstFld = pDstFmtFld->GetField();
-    sal_uInt16 nFldWhich = rSrcFld.GetTyp()->Which();
-    SwNodeIndex aTblNdIdx(pDstTxtFld->GetTxtNode());
+    SwFormatField * pDstFormatField = const_cast<SwFormatField*>(&pDstTextField->GetFormatField());
+    SwField * pDstField = pDstFormatField->GetField();
+    sal_uInt16 nFieldWhich = rSrcField.GetTyp()->Which();
+    SwNodeIndex aTableNdIdx(pDstTextField->GetTextNode());
 
-    if (pDstFld->GetTyp()->Which() ==
-        rSrcFld.GetTyp()->Which())
+    if (pDstField->GetTyp()->Which() ==
+        rSrcField.GetTyp()->Which())
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            SwPosition aPosition( pDstTxtFld->GetTxtNode() );
-            aPosition.nContent = pDstTxtFld->GetStart();
+            SwPosition aPosition( pDstTextField->GetTextNode() );
+            aPosition.nContent = pDstTextField->GetStart();
 
-            SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstFld, rSrcFld, pMsgHnt, bUpdateFlds) );
+            SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstField, rSrcField, pMsgHint, bUpdateFields) );
             m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwField * pNewFld = rSrcFld.CopyField();
-        pDstFmtFld->SetField(pNewFld);
+        SwField * pNewField = rSrcField.CopyField();
+        pDstFormatField->SetField(pNewField);
 
-        switch( nFldWhich )
+        switch( nFieldWhich )
         {
         case RES_SETEXPFLD:
         case RES_GETEXPFLD:
         case RES_HIDDENTXTFLD:
         case RES_HIDDENPARAFLD:
-            UpdateExpFlds( pDstTxtFld, true );
+            UpdateExpFields( pDstTextField, true );
             break;
 
         case RES_TABLEFLD:
             {
-                const SwTableNode* pTblNd =
-                    m_rDoc.IsIdxInTbl(aTblNdIdx);
-                if( pTblNd )
+                const SwTableNode* pTableNd =
+                    m_rDoc.IsIdxInTable(aTableNdIdx);
+                if( pTableNd )
                 {
-                    SwTableFmlUpdate aTblUpdate( &pTblNd->
+                    SwTableFormulaUpdate aTableUpdate( &pTableNd->
                                                  GetTable() );
-                    if (bUpdateFlds)
-                        UpdateTblFlds( &aTblUpdate );
+                    if (bUpdateFields)
+                        UpdateTableFields( &aTableUpdate );
                     else
-                        pNewFld->GetTyp()->ModifyNotification(0, &aTblUpdate);
+                        pNewField->GetTyp()->ModifyNotification(0, &aTableUpdate);
 
-                    if (! bUpdateFlds)
-                        bTblSelBreak = true;
+                    if (! bUpdateFields)
+                        bTableSelBreak = true;
                 }
             }
             break;
 
         case RES_MACROFLD:
-            if( bUpdateFlds && pDstTxtFld->GetpTxtNode() )
-                (pDstTxtFld->GetpTxtNode())->
-                    ModifyNotification( 0, pDstFmtFld );
+            if( bUpdateFields && pDstTextField->GetpTextNode() )
+                (pDstTextField->GetpTextNode())->
+                    ModifyNotification( 0, pDstFormatField );
             break;
 
         case RES_DBNAMEFLD:
         case RES_DBNEXTSETFLD:
         case RES_DBNUMSETFLD:
         case RES_DBSETNUMBERFLD:
-            m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewFld)->GetRealDBData());
-            pNewFld->GetTyp()->UpdateFlds();
+            m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewField)->GetRealDBData());
+            pNewField->GetTyp()->UpdateFields();
 
             break;
 
@@ -543,97 +543,97 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
             {
                 // JP 10.02.96: call ChgValue, so that the style change sets the
                 // ContentString correctly
-                SwDBField* pDBFld = static_cast<SwDBField*>(pNewFld);
-                if (pDBFld->IsInitialized())
-                    pDBFld->ChgValue( pDBFld->GetValue(), true );
+                SwDBField* pDBField = static_cast<SwDBField*>(pNewField);
+                if (pDBField->IsInitialized())
+                    pDBField->ChgValue( pDBField->GetValue(), true );
 
-                pDBFld->ClearInitialized();
-                pDBFld->InitContent();
+                pDBField->ClearInitialized();
+                pDBField->InitContent();
             }
 #endif
             // no break;
 
         default:
-            pDstFmtFld->ModifyNotification( 0, pMsgHnt );
+            pDstFormatField->ModifyNotification( 0, pMsgHint );
         }
 
         // The fields we can calculate here are being triggered for an update
         // here explicitly.
-        if( nFldWhich == RES_USERFLD )
-            UpdateUsrFlds();
+        if( nFieldWhich == RES_USERFLD )
+            UpdateUsrFields();
     }
 
-    return bTblSelBreak;
+    return bTableSelBreak;
 }
 
 /// Update reference and table fields
-void DocumentFieldsManager::UpdateRefFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateRefFields( SfxPoolItem* pHt )
 {
-    SwFieldType* pFldType;
-    for( sal_uInt16 i = 0; i < mpFldTypes->size(); ++i )
-        if( RES_GETREFFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
-            pFldType->ModifyNotification( 0, pHt );
+    SwFieldType* pFieldType;
+    for( sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i )
+        if( RES_GETREFFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
+            pFieldType->ModifyNotification( 0, pHt );
 }
 
-void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
 {
     OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE  == pHt->Which(),
             "What MessageItem is &m_rDoc?" );
 
-    SwFieldType* pFldType(0);
+    SwFieldType* pFieldType(0);
 
-    for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+    for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
     {
-        if( RES_TABLEFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+        if( RES_TABLEFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
         {
-            SwTableFmlUpdate* pUpdtFld = 0;
+            SwTableFormulaUpdate* pUpdateField = 0;
             if( pHt && RES_TABLEFML_UPDATE == pHt->Which() )
-                pUpdtFld = static_cast<SwTableFmlUpdate*>(pHt);
+                pUpdateField = static_cast<SwTableFormulaUpdate*>(pHt);
 
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                if( pFmtFld->GetTxtFld() )
+                if( pFormatField->GetTextField() )
                 {
-                    SwTblField* pFld = static_cast<SwTblField*>(pFmtFld->GetField());
+                    SwTableField* pField = static_cast<SwTableField*>(pFormatField->GetField());
 
-                    if( pUpdtFld )
+                    if( pUpdateField )
                     {
                         // table where &m_rDoc field is located
-                        const SwTableNode* pTblNd;
-                        const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
-                        if( !rTxtNd.GetNodes().IsDocNodes() ||
-                            0 == ( pTblNd = rTxtNd.FindTableNode() ) )
+                        const SwTableNode* pTableNd;
+                        const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+                        if( !rTextNd.GetNodes().IsDocNodes() ||
+                            0 == ( pTableNd = rTextNd.FindTableNode() ) )
                             continue;
 
-                        switch( pUpdtFld->eFlags )
+                        switch( pUpdateField->eFlags )
                         {
                         case TBL_CALC:
                             // re-set the value flag
                             // JP 17.06.96: internal representation of all formulas
                             //              (reference to other table!!!)
-                            if( nsSwExtendedSubType::SUB_CMD & pFld->GetSubType() )
-                                pFld->PtrToBoxNm( pUpdtFld->pTbl );
+                            if( nsSwExtendedSubType::SUB_CMD & pField->GetSubType() )
+                                pField->PtrToBoxNm( pUpdateField->pTable );
                             else
-                                pFld->ChgValid( false );
+                                pField->ChgValid( false );
                             break;
                         case TBL_BOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+                            if( &pTableNd->GetTable() == pUpdateField->pTable )
                                 // to the external representation
-                                pFld->PtrToBoxNm( pUpdtFld->pTbl );
+                                pField->PtrToBoxNm( pUpdateField->pTable );
                             break;
                         case TBL_BOXPTR:
                             // to the internal representation
                             // JP 17.06.96: internal representation on all formulas
                             //              (reference to other table!!!)
-                            pFld->BoxNmToPtr( pUpdtFld->pTbl );
+                            pField->BoxNmToPtr( pUpdateField->pTable );
                             break;
                         case TBL_RELBOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+                            if( &pTableNd->GetTable() == pUpdateField->pTable )
                                 // to the relative representation
-                                pFld->ToRelBoxNm( pUpdtFld->pTbl );
+                                pField->ToRelBoxNm( pUpdateField->pTable );
                             break;
                         default:
                             break;
@@ -641,13 +641,13 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     }
                     else
                         // reset the value flag for all
-                        pFld->ChgValid( false );
+                        pField->ChgValid( false );
                 }
             }
 
             break;
         }
-        pFldType = 0;
+        pFieldType = 0;
     }
 
     // process all table box formulas
@@ -656,47 +656,47 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     for (sal_uInt32 i = 0; i < nMaxItems; ++i)
     {
         if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
-            static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() )
+            static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() )
         {
-            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChangeState( pHt );
+            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChangeState( pHt );
         }
     }
 
     // all fields/boxes are now invalid, so we can start to calculate
     if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
-                TBL_CALC != static_cast<SwTableFmlUpdate*>(pHt)->eFlags ))
+                TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->eFlags ))
         return ;
 
     SwCalc* pCalc = 0;
 
-    if( pFldType )
+    if( pFieldType )
     {
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFmtFld = aIter.Last(); pFmtFld; pFmtFld = aIter.Previous() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pFormatField = aIter.Last(); pFormatField; pFormatField = aIter.Previous() )
         {
                 // start calculation at the end
                 // new fields are inserted at the beginning of the modify chain
                 // that gives faster calculation on import
                 // mba: do we really need &m_rDoc "optimization"? Is it still valid?
-                SwTblField* pFld;
-                if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD &
-                    (pFld = static_cast<SwTblField*>(pFmtFld->GetField()))->GetSubType() ))
+                SwTableField* pField;
+                if( !pFormatField->GetTextField() || (nsSwExtendedSubType::SUB_CMD &
+                    (pField = static_cast<SwTableField*>(pFormatField->GetField()))->GetSubType() ))
                     continue;
 
                 // needs to be recalculated
-                if( !pFld->IsValid() )
+                if( !pField->IsValid() )
                 {
                     // table where &m_rDoc field is located
-                    const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
-                    if( !rTxtNd.GetNodes().IsDocNodes() )
+                    const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+                    if( !rTextNd.GetNodes().IsDocNodes() )
                         continue;
-                    const SwTableNode* pTblNd = rTxtNd.FindTableNode();
-                    if( !pTblNd )
+                    const SwTableNode* pTableNd = rTextNd.FindTableNode();
+                    if( !pTableNd )
                         continue;
 
                     // if &m_rDoc field is not in the to-be-updated table, skip it
-                    if( pHt && &pTblNd->GetTable() !=
-                                            static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+                    if( pHt && &pTableNd->GetTable() !=
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
                         continue;
 
                     if( !pCalc )
@@ -705,17 +705,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     // get the values of all SetExpression fields that are valid
                     // until the table
                     SwFrm* pFrm = 0;
-                    if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+                    if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
                         // is in the special section, that's expensive!
                         Point aPt;      // return the first frame of the layout - Tab.Headline!!
-                        pFrm = rTxtNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
+                        pFrm = rTextNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
                         if( pFrm )
                         {
-                            SwPosition aPos( *pTblNd );
-                            if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
-                                FldsToCalc( *pCalc, _SetGetExpFld(
-                                    aPos.nNode, pFmtFld->GetTxtFld(),
+                            SwPosition aPos( *pTableNd );
+                            if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+                                FieldsToCalc( *pCalc, _SetGetExpField(
+                                    aPos.nNode, pFormatField->GetTextField(),
                                     &aPos.nContent ));
                             else
                                 pFrm = 0;
@@ -724,26 +724,26 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     if( !pFrm )
                     {
                         // create index to determine the TextNode
-                        SwNodeIndex aIdx( rTxtNd );
-                        FldsToCalc( *pCalc,
-                            _SetGetExpFld( aIdx, pFmtFld->GetTxtFld() ));
+                        SwNodeIndex aIdx( rTextNd );
+                        FieldsToCalc( *pCalc,
+                            _SetGetExpField( aIdx, pFormatField->GetTextField() ));
                     }
 
-                    SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
-                    pFld->CalcField( aPara );
+                    SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+                    pField->CalcField( aPara );
                     if( aPara.IsStackOverflow() )
                     {
                         bool const bResult = aPara.CalcWithStackOverflow();
                         if (bResult)
                         {
-                            pFld->CalcField( aPara );
+                            pField->CalcField( aPara );
                         }
                         OSL_ENSURE(bResult,
                                 "the chained formula could no be calculated");
                     }
                     pCalc->SetCalcError( CALC_NOERR );
                 }
-                pFmtFld->ModifyNotification( 0, pHt );
+                pFormatField->ModifyNotification( 0, pHt );
         }
     }
 
@@ -751,17 +751,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     for (sal_uInt32 i = 0; i < nMaxItems; ++i )
     {
         if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
-            static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() &&
-            !static_cast<const SwTblBoxFormula*>(pItem)->IsValid() )
+            static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() &&
+            !static_cast<const SwTableBoxFormula*>(pItem)->IsValid() )
         {
-            SwTblBoxFormula* pFml = const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem));
-            SwTableBox* pBox = pFml->GetTableBox();
+            SwTableBoxFormula* pFormula = const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem));
+            SwTableBox* pBox = pFormula->GetTableBox();
             if( pBox && pBox->GetSttNd() &&
                 pBox->GetSttNd()->GetNodes().IsDocNodes() )
             {
-                const SwTableNode* pTblNd = pBox->GetSttNd()->FindTableNode();
-                if( !pHt || &pTblNd->GetTable() ==
-                                            static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+                const SwTableNode* pTableNd = pBox->GetSttNd()->FindTableNode();
+                if( !pHt || &pTableNd->GetTable() ==
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
                 {
                     double nValue;
                     if( !pCalc )
@@ -770,20 +770,20 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     // get the values of all SetExpression fields that are valid
                     // until the table
                     SwFrm* pFrm = 0;
-                    if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+                    if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
                         // is in the special section, that's expensive!
                         Point aPt;      // return the first frame of the layout - Tab.Headline!!
-                        SwNodeIndex aCNdIdx( *pTblNd, +2 );
-                        SwCntntNode* pCNd = aCNdIdx.GetNode().GetCntntNode();
+                        SwNodeIndex aCNdIdx( *pTableNd, +2 );
+                        SwContentNode* pCNd = aCNdIdx.GetNode().GetContentNode();
                         if( !pCNd )
                             pCNd = m_rDoc.GetNodes().GoNext( &aCNdIdx );
 
                         if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt )) )
                         {
                             SwPosition aPos( *pCNd );
-                            if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
-                                FldsToCalc( *pCalc, _SetGetExpFld( aPos.nNode ));
+                            if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+                                FieldsToCalc( *pCalc, _SetGetExpField( aPos.nNode ));
                             else
                                 pFrm = 0;
                         }
@@ -791,34 +791,34 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     if( !pFrm )
                     {
                         // create index to determine the TextNode
-                        SwNodeIndex aIdx( *pTblNd );
-                        FldsToCalc( *pCalc, _SetGetExpFld( aIdx ));
+                        SwNodeIndex aIdx( *pTableNd );
+                        FieldsToCalc( *pCalc, _SetGetExpField( aIdx ));
                     }
 
-                    SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
-                    pFml->Calc( aPara, nValue );
+                    SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+                    pFormula->Calc( aPara, nValue );
 
                     if( aPara.IsStackOverflow() )
                     {
                         bool const bResult = aPara.CalcWithStackOverflow();
                         if (bResult)
                         {
-                            pFml->Calc( aPara, nValue );
+                            pFormula->Calc( aPara, nValue );
                         }
                         OSL_ENSURE(bResult,
                                 "the chained formula could no be calculated");
                     }
 
-                    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+                    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
                     SfxItemSet aTmp( m_rDoc.GetAttrPool(),
                                     RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
 
                     if( pCalc->IsCalcError() )
                         nValue = DBL_MAX;
-                    aTmp.Put( SwTblBoxValue( nValue ));
-                    if( SfxItemState::SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
-                        aTmp.Put( SwTblBoxNumFormat( 0 ));
-                    pFmt->SetFmtAttr( aTmp );
+                    aTmp.Put( SwTableBoxValue( nValue ));
+                    if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT ))
+                        aTmp.Put( SwTableBoxNumFormat( 0 ));
+                    pFormat->SetFormatAttr( aTmp );
 
                     pCalc->SetCalcError( CALC_NOERR );
                 }
@@ -829,24 +829,24 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     delete pCalc;
 }
 
-void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
+void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUpdRefFields )
 {
-    if( IsExpFldsLocked() || m_rDoc.IsInReading() )
+    if( IsExpFieldsLocked() || m_rDoc.IsInReading() )
         return;
 
-    bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds();
-    mpUpdtFlds->SetInUpdateFlds( true );
+    bool bOldInUpdateFields = mpUpdateFields->IsInUpdateFields();
+    mpUpdateFields->SetInUpdateFields( true );
 
-    mpUpdtFlds->MakeFldList( m_rDoc, true, GETFLD_ALL );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, true, GETFLD_ALL );
+    mbNewFieldLst = false;
 
-    if( mpUpdtFlds->GetSortLst()->empty() )
+    if( mpUpdateFields->GetSortLst()->empty() )
     {
-        if( bUpdRefFlds )
-            UpdateRefFlds(NULL);
+        if( bUpdRefFields )
+            UpdateRefFields(NULL);
 
-        mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
-        mpUpdtFlds->SetFieldsDirty( false );
+        mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+        mpUpdateFields->SetFieldsDirty( false );
         return ;
     }
 
@@ -854,34 +854,34 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
 
     // Hash table for all string replacements is filled on-the-fly.
     // Try to fabricate an uneven number.
-    sal_uInt16 nStrFmtCnt = (( mpFldTypes->size() / 7 ) + 1 ) * 7;
-    SwHash** pHashStrTbl = new SwHash*[ nStrFmtCnt ];
-    memset( pHashStrTbl, 0, sizeof( _HashStr* ) * nStrFmtCnt );
+    sal_uInt16 nStrFormatCnt = (( mpFieldTypes->size() / 7 ) + 1 ) * 7;
+    SwHash** pHashStrTable = new SwHash*[ nStrFormatCnt ];
+    memset( pHashStrTable, 0, sizeof( _HashStr* ) * nStrFormatCnt );
 
     {
-        const SwFieldType* pFldType;
+        const SwFieldType* pFieldType;
         // process separately:
-        for( n = mpFldTypes->size(); n; )
-            switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() )
+        for( n = mpFieldTypes->size(); n; )
+            switch( ( pFieldType = (*mpFieldTypes)[ --n ] )->Which() )
             {
             case RES_USERFLD:
                 {
                     // Entry present?
                     sal_uInt16 nPos;
-                    const OUString& rNm = pFldType->GetName();
-                    OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
-                    SwHash* pFnd = Find( rNm, pHashStrTbl, nStrFmtCnt, &nPos );
+                    const OUString& rNm = pFieldType->GetName();
+                    OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
+                    SwHash* pFnd = Find( rNm, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // modify entry in the hash table
                         static_cast<_HashStr*>(pFnd)->aSetStr = sExpand;
                     else
                         // insert the new entry
-                        *(pHashStrTbl + nPos ) = new _HashStr( rNm, sExpand,
-                                                static_cast<_HashStr*>(*(pHashStrTbl + nPos)) );
+                        *(pHashStrTable + nPos ) = new _HashStr( rNm, sExpand,
+                                                static_cast<_HashStr*>(*(pHashStrTable + nPos)) );
                 }
                 break;
             case RES_SETEXPFLD:
-                const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFldType))->SetOutlineChgNd( 0 );
+                const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFieldType))->SetOutlineChgNd( 0 );
                 break;
             }
     }
@@ -904,7 +904,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
 
     // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
     int nShownSections = 0;
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->GetSortLst()->end(); ++it )
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
     {
         SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
         if ( pSect && !pSect->IsCondHidden())
@@ -912,7 +912,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
     }
 
     OUString aNew;
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->GetSortLst()->end(); ++it )
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
     {
         SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
         if( pSect )
@@ -947,45 +947,45 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             continue;
         }
 
-        SwTxtFld* pTxtFld = const_cast<SwTxtFld*>((*it)->GetTxtFld());
-        if( !pTxtFld )
+        SwTextField* pTextField = const_cast<SwTextField*>((*it)->GetTextField());
+        if( !pTextField )
         {
             OSL_ENSURE( false, "what's wrong now'" );
             continue;
         }
 
-        SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
-        const SwField* pFld = pFmtFld->GetField();
+        SwFormatField* pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+        const SwField* pField = pFormatField->GetField();
 
-        switch( nWhich = pFld->GetTyp()->Which() )
+        switch( nWhich = pField->GetTyp()->Which() )
         {
         case RES_HIDDENTXTFLD:
         {
-            SwHiddenTxtField* pHFld = const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld));
-            SwSbxValue aValue = aCalc.Calculate( pHFld->GetPar1() );
+            SwHiddenTextField* pHField = const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField));
+            SwSbxValue aValue = aCalc.Calculate( pHField->GetPar1() );
             bool bValue = !aValue.GetBool();
             if(!aValue.IsVoidValue())
             {
-                pHFld->SetValue( bValue );
+                pHField->SetValue( bValue );
                 // evaluate field
-                pHFld->Evaluate(&m_rDoc);
+                pHField->Evaluate(&m_rDoc);
             }
         }
         break;
         case RES_HIDDENPARAFLD:
         {
-            SwHiddenParaField* pHPFld = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld));
-            SwSbxValue aValue = aCalc.Calculate( pHPFld->GetPar1() );
+            SwHiddenParaField* pHPField = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField));
+            SwSbxValue aValue = aCalc.Calculate( pHPField->GetPar1() );
             bool bValue = aValue.GetBool();
             if(!aValue.IsVoidValue())
-                pHPFld->SetHidden( bValue );
+                pHPField->SetHidden( bValue );
         }
         break;
         case RES_DBSETNUMBERFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pFld))->Evaluate(&m_rDoc);
-            aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pFld)->GetSetNumber());
+            const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pField))->Evaluate(&m_rDoc);
+            aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pField)->GetSetNumber());
         }
 #endif
         break;
@@ -993,7 +993,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         case RES_DBNUMSETFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            UpdateDBNumFlds( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pFld)), aCalc );
+            UpdateDBNumFields( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pField)), aCalc );
             if( bCanFill )
                 bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc );
         }
@@ -1003,20 +1003,20 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         {
 #if HAVE_FEATURE_DBCONNECTIVITY
             // evaluate field
-            const_cast<SwDBField*>(static_cast<const SwDBField*>(pFld))->Evaluate();
+            const_cast<SwDBField*>(static_cast<const SwDBField*>(pField))->Evaluate();
 
-            SwDBData aTmpDBData(static_cast<const SwDBField*>(pFld)->GetDBData());
+            SwDBData aTmpDBData(static_cast<const SwDBField*>(pField)->GetDBData());
 
             if( pMgr->IsDataSourceOpen(aTmpDBData.sDataSource, aTmpDBData.sCommand, false))
                 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType));
 
-            const OUString& rName = pFld->GetTyp()->GetName();
+            const OUString& rName = pField->GetTyp()->GetName();
 
             // Add entry to hash table
             // Entry present?
             sal_uInt16 nPos;
-            SwHash* pFnd = Find( rName, pHashStrTbl, nStrFmtCnt, &nPos );
-            OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+            SwHash* pFnd = Find( rName, pHashStrTable, nStrFormatCnt, &nPos );
+            OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
             if( pFnd )
             {
                 // Modify entry in the hash table
@@ -1025,8 +1025,8 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             else
             {
                 // insert new entry
-                *(pHashStrTbl + nPos ) = new _HashStr( rName,
-                    value, static_cast<_HashStr *>(*(pHashStrTbl + nPos)));
+                *(pHashStrTable + nPos ) = new _HashStr( rName,
+                    value, static_cast<_HashStr *>(*(pHashStrTable + nPos)));
             }
 #endif
         }
@@ -1034,47 +1034,47 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         case RES_GETEXPFLD:
         case RES_SETEXPFLD:
         {
-            if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() )        // replace String
+            if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() )        // replace String
             {
                 if( RES_GETEXPFLD == nWhich )
                 {
-                    SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+                    SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
 
-                    if( (!pUpdtFld || pUpdtFld == pTxtFld )
-                        && pGFld->IsInBodyTxt() )
+                    if( (!pUpdateField || pUpdateField == pTextField )
+                        && pGField->IsInBodyText() )
                     {
-                        aNew = LookString( pHashStrTbl, nStrFmtCnt,
-                                    pGFld->GetFormula() );
-                        pGFld->ChgExpStr( aNew );
+                        aNew = LookString( pHashStrTable, nStrFormatCnt,
+                                    pGField->GetFormula() );
+                        pGField->ChgExpStr( aNew );
                     }
                 }
                 else
                 {
-                    SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
+                    SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
                     // is the "formula" a field?
-                    aNew = LookString( pHashStrTbl, nStrFmtCnt,
-                                pSFld->GetFormula() );
+                    aNew = LookString( pHashStrTable, nStrFormatCnt,
+                                pSField->GetFormula() );
 
                     if( aNew.isEmpty() )               // nothing found then the formula is the new value
-                        aNew = pSFld->GetFormula();
+                        aNew = pSField->GetFormula();
 
                     // only update one field
-                    if( !pUpdtFld || pUpdtFld == pTxtFld )
-                        pSFld->ChgExpStr( aNew );
+                    if( !pUpdateField || pUpdateField == pTextField )
+                        pSField->ChgExpStr( aNew );
 
                     // lookup the field's name
-                    aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+                    aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
                     // Entry present?
                     sal_uInt16 nPos;
-                    SwHash* pFnd = Find( aNew, pHashStrTbl, nStrFmtCnt, &nPos );
+                    SwHash* pFnd = Find( aNew, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // Modify entry in the hash table
-                        static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+                        static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                     else
                         // insert new entry
-                        *(pHashStrTbl + nPos ) = pFnd = new _HashStr( aNew,
-                                        pSFld->GetExpStr(),
-                                        static_cast<_HashStr*>(*(pHashStrTbl + nPos) ));
+                        *(pHashStrTable + nPos ) = pFnd = new _HashStr( aNew,
+                                        pSField->GetExpStr(),
+                                        static_cast<_HashStr*>(*(pHashStrTable + nPos) ));
 
                     // Extension for calculation with Strings
                     SwSbxValue aValue;
@@ -1086,70 +1086,70 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             {
                 if( RES_GETEXPFLD == nWhich )
                 {
-                    SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+                    SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
 
-                    if( (!pUpdtFld || pUpdtFld == pTxtFld )
-                        && pGFld->IsInBodyTxt() )
+                    if( (!pUpdateField || pUpdateField == pTextField )
+                        && pGField->IsInBodyText() )
                     {
                         SwSbxValue aValue = aCalc.Calculate(
-                                        pGFld->GetFormula());
+                                        pGField->GetFormula());
                         if(!aValue.IsVoidValue())
-                            pGFld->SetValue(aValue.GetDouble() );
+                            pGField->SetValue(aValue.GetDouble() );
                     }
                 }
                 else
                 {
-                    SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
-                    SwSetExpFieldType* pSFldTyp = static_cast<SwSetExpFieldType*>(pFld->GetTyp());
-                    aNew = pSFldTyp->GetName();
+                    SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+                    SwSetExpFieldType* pSFieldTyp = static_cast<SwSetExpFieldType*>(pField->GetTyp());
+                    aNew = pSFieldTyp->GetName();
 
                     SwNode* pSeqNd = 0;
 
-                    if( pSFld->IsSequenceFld() )
+                    if( pSField->IsSequenceField() )
                     {
-                        const sal_uInt8 nLvl = pSFldTyp->GetOutlineLvl();
+                        const sal_uInt8 nLvl = pSFieldTyp->GetOutlineLvl();
                         if( MAXLEVEL > nLvl )
                         {
                             // test if the Number needs to be updated
                             pSeqNd = m_rDoc.GetNodes()[ (*it)->GetNode() ];
 
-                            const SwTxtNode* pOutlNd = pSeqNd->
+                            const SwTextNode* pOutlNd = pSeqNd->
                                     FindOutlineNodeOfLevel( nLvl );
-                            if( pSFldTyp->GetOutlineChgNd() != pOutlNd )
+                            if( pSFieldTyp->GetOutlineChgNd() != pOutlNd )
                             {
-                                pSFldTyp->SetOutlineChgNd( pOutlNd );
+                                pSFieldTyp->SetOutlineChgNd( pOutlNd );
                                 aCalc.VarChange( aNew, 0 );
                             }
                         }
                     }
 
                     aNew += "=";
-                    aNew += pSFld->GetFormula();
+                    aNew += pSField->GetFormula();
 
                     SwSbxValue aValue = aCalc.Calculate( aNew );
                     double nErg = aValue.GetDouble();
                     // only update one field
-                    if( !aValue.IsVoidValue() && (!pUpdtFld || pUpdtFld == pTxtFld) )
+                    if( !aValue.IsVoidValue() && (!pUpdateField || pUpdateField == pTextField) )
                     {
-                        pSFld->SetValue( nErg );
+                        pSField->SetValue( nErg );
 
                         if( pSeqNd )
-                            pSFldTyp->SetChapter( *pSFld, *pSeqNd );
+                            pSFieldTyp->SetChapter( *pSField, *pSeqNd );
                     }
                 }
             }
         }
         } // switch
 
-        pFmtFld->ModifyNotification( 0, 0 );        // trigger formatting
+        pFormatField->ModifyNotification( 0, 0 );        // trigger formatting
 
-        if( pUpdtFld == pTxtFld )       // if only &m_rDoc one is updated
+        if( pUpdateField == pTextField )       // if only &m_rDoc one is updated
         {
             if( RES_GETEXPFLD == nWhich ||      // only GetField or
-                RES_HIDDENTXTFLD == nWhich ||   // HiddenTxt?
-                RES_HIDDENPARAFLD == nWhich)    // HiddenParaFld?
+                RES_HIDDENTXTFLD == nWhich ||   // HiddenText?
+                RES_HIDDENPARAFLD == nWhich)    // HiddenParaField?
                 break;                          // quit
-            pUpdtFld = 0;                       // update all from here on
+            pUpdateField = 0;                       // update all from here on
         }
     }
 
@@ -1157,27 +1157,27 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
     pMgr->CloseAll(false);
 #endif
     // delete hash table
-    ::DeleteHashTable( pHashStrTbl, nStrFmtCnt );
+    ::DeleteHashTable( pHashStrTable, nStrFormatCnt );
 
     // update reference fields
-    if( bUpdRefFlds )
-        UpdateRefFlds(NULL);
+    if( bUpdRefFields )
+        UpdateRefFields(NULL);
 
-    mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
-    mpUpdtFlds->SetFieldsDirty( false );
+    mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+    mpUpdateFields->SetFieldsDirty( false );
 }
 
 /// Insert field type that was marked as deleted
-void DocumentFieldsManager::UpdateUsrFlds()
+void DocumentFieldsManager::UpdateUsrFields()
 {
     SwCalc* pCalc = 0;
-    const SwFieldType* pFldType;
-    for( sal_uInt16 i = INIT_FLDTYPES; i < mpFldTypes->size(); ++i )
-        if( RES_USERFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+    const SwFieldType* pFieldType;
+    for( sal_uInt16 i = INIT_FLDTYPES; i < mpFieldTypes->size(); ++i )
+        if( RES_USERFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
         {
             if( !pCalc )
                 pCalc = new SwCalc( m_rDoc );
-            const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->GetValue( *pCalc );
+            const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->GetValue( *pCalc );
         }
 
     if( pCalc )
@@ -1187,53 +1187,53 @@ void DocumentFieldsManager::UpdateUsrFlds()
     }
 }
 
-void DocumentFieldsManager::UpdatePageFlds( SfxPoolItem* pMsgHnt )
+void DocumentFieldsManager::UpdatePageFields( SfxPoolItem* pMsgHint )
 {
-    SwFieldType* pFldType;
+    SwFieldType* pFieldType;
     for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-        switch( ( pFldType = (*mpFldTypes)[ i ] )->Which() )
+        switch( ( pFieldType = (*mpFieldTypes)[ i ] )->Which() )
         {
         case RES_PAGENUMBERFLD:
         case RES_CHAPTERFLD:
         case RES_GETEXPFLD:
         case RES_REFPAGEGETFLD:
-            pFldType->ModifyNotification( 0, pMsgHnt );
+            pFieldType->ModifyNotification( 0, pMsgHint );
             break;
         case RES_DOCSTATFLD:
-            pFldType->ModifyNotification( 0, 0 );
+            pFieldType->ModifyNotification( 0, 0 );
             break;
         }
-    SetNewFldLst(true);
+    SetNewFieldLst(true);
 }
 
-void DocumentFieldsManager::LockExpFlds()
+void DocumentFieldsManager::LockExpFields()
 {
-    ++mnLockExpFld;
+    ++mnLockExpField;
 }
 
-void DocumentFieldsManager::UnlockExpFlds()
+void DocumentFieldsManager::UnlockExpFields()
 {
-    assert(mnLockExpFld != 0);
-    if( mnLockExpFld )
-        --mnLockExpFld;
+    assert(mnLockExpField != 0);
+    if( mnLockExpField )
+        --mnLockExpField;
 }
 
-bool DocumentFieldsManager::IsExpFldsLocked() const
+bool DocumentFieldsManager::IsExpFieldsLocked() const
 {
-    return 0 != mnLockExpFld;
+    return 0 != mnLockExpField;
 }
 
-SwDocUpdtFld& DocumentFieldsManager::GetUpdtFlds() const
+SwDocUpdateField& DocumentFieldsManager::GetUpdateFields() const
 {
-    return *mpUpdtFlds;
+    return *mpUpdateFields;
 }
 
 bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
 {
     // See if the supplied nodes actually contain fields.
     // If they don't, the flag doesn't need to be changed.
-    bool bFldsFnd = false;
-    if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !m_rDoc.IsInDtor()
+    bool bFieldsFnd = false;
+    if( b && pChk && !GetUpdateFields().IsFieldsDirty() && !m_rDoc.IsInDtor()
         // ?? what's up with Undo, this is also wanted there!
         /*&& &pChk->GetNodes() == &GetNodes()*/ )
     {
@@ -1244,7 +1244,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
         const SwNodes& rNds = pChk->GetNodes();
         while( nLen-- )
         {
-            const SwTxtNode* pTNd = rNds[ nStt++ ]->GetTxtNode();
+            const SwTextNode* pTNd = rNds[ nStt++ ]->GetTextNode();
             if( pTNd )
             {
                 if( pTNd->GetAttrOutlineLevel() != 0 )
@@ -1255,7 +1255,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
                     const size_t nEnd = pTNd->GetSwpHints().Count();
                     for( size_t n = 0 ; n < nEnd; ++n )
                     {
-                        const SwTxtAttr* pAttr = pTNd->GetSwpHints()[ n ];
+                        const SwTextAttr* pAttr = pTNd->GetSwpHints()[ n ];
                         if ( pAttr->Which() == RES_TXTATR_FIELD )
                         {
                             b = true;
@@ -1268,10 +1268,10 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
                     break;
             }
         }
-        bFldsFnd = b;
+        bFieldsFnd = b;
     }
-    GetUpdtFlds().SetFieldsDirty( b );
-    return bFldsFnd;
+    GetUpdateFields().SetFieldsDirty( b );
+    return bFieldsFnd;
 }
 
 void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
@@ -1302,74 +1302,74 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
 
     for( ; nStt < 5; ++nStt )
     {
-        SwFieldType* pFldType = GetSysFldType( aTypes[ nStt ] );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        SwFieldType* pFieldType = GetSysFieldType( aTypes[ nStt ] );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
-            if( pFmtFld && pFmtFld->GetTxtFld() )
+            if( pFormatField && pFormatField->GetTextField() )
             {
                 bool bChgd = false;
                 switch( aTypes[ nStt ] )
                 {
                 case RES_DOCINFOFLD:
-                    if( static_cast<SwDocInfoField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwDocInfoField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwDocInfoField* pDocInfFld = static_cast<SwDocInfoField*>(pFmtFld->GetField());
-                        pDocInfFld->SetExpansion( static_cast<SwDocInfoFieldType*>(
-                                    pDocInfFld->GetTyp())->Expand(
-                                        pDocInfFld->GetSubType(),
-                                        pDocInfFld->GetFormat(),
-                                        pDocInfFld->GetLanguage(),
-                                        pDocInfFld->GetName() ) );
+                        SwDocInfoField* pDocInfField = static_cast<SwDocInfoField*>(pFormatField->GetField());
+                        pDocInfField->SetExpansion( static_cast<SwDocInfoFieldType*>(
+                                    pDocInfField->GetTyp())->Expand(
+                                        pDocInfField->GetSubType(),
+                                        pDocInfField->GetFormat(),
+                                        pDocInfField->GetLanguage(),
+                                        pDocInfField->GetName() ) );
                     }
                     break;
 
                 case RES_AUTHORFLD:
-                    if( static_cast<SwAuthorField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwAuthorField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFmtFld->GetField());
-                        pAuthorFld->SetExpansion( SwAuthorFieldType::Expand( pAuthorFld->GetFormat() ) );
+                        SwAuthorField* pAuthorField = static_cast<SwAuthorField*>(pFormatField->GetField());
+                        pAuthorField->SetExpansion( SwAuthorFieldType::Expand( pAuthorField->GetFormat() ) );
                     }
                     break;
 
                 case RES_EXTUSERFLD:
-                    if( static_cast<SwExtUserField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwExtUserField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFmtFld->GetField());
-                        pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
-                                            pExtUserFld->GetSubType(),
-                                            pExtUserFld->GetFormat()));
+                        SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pFormatField->GetField());
+                        pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
+                                            pExtUserField->GetSubType(),
+                                            pExtUserField->GetFormat()));
                     }
                     break;
 
                 case RES_DATETIMEFLD:
-                    if( static_cast<SwDateTimeField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwDateTimeField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        static_cast<SwDateTimeField*>(pFmtFld->GetField())->SetDateTime(
+                        static_cast<SwDateTimeField*>(pFormatField->GetField())->SetDateTime(
                                                     DateTime(Date(nDate), tools::Time(nTime)) );
                     }
                     break;
 
                 case RES_FILENAMEFLD:
-                    if( static_cast<SwFileNameField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwFileNameField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwFileNameField* pFileNameFld =
-                            static_cast<SwFileNameField*>(pFmtFld->GetField());
-                        pFileNameFld->SetExpansion( static_cast<SwFileNameFieldType*>(
-                                    pFileNameFld->GetTyp())->Expand(
-                                            pFileNameFld->GetFormat() ) );
+                        SwFileNameField* pFileNameField =
+                            static_cast<SwFileNameField*>(pFormatField->GetField());
+                        pFileNameField->SetExpansion( static_cast<SwFileNameFieldType*>(
+                                    pFileNameField->GetTyp())->Expand(
+                                            pFileNameField->GetFormat() ) );
                     }
                     break;
                 }
 
                 // Trigger formatting
                 if( bChgd )
-                    pFmtFld->ModifyNotification( 0, 0 );
+                    pFormatField->ModifyNotification( 0, 0 );
             }
         }
     }
@@ -1378,11 +1378,11 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
         m_rDoc.getIDocumentState().ResetModified();
 }
 
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+    mbNewFieldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
     SwDBManager* pMgr = NULL;
@@ -1391,24 +1391,24 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToT
     pMgr->CloseAll(false);
 #endif
 
-    if( !mpUpdtFlds->GetSortLst()->empty() )
+    if( !mpUpdateFields->GetSortLst()->empty() )
     {
-        _SetGetExpFlds::const_iterator const itLast =
-            mpUpdtFlds->GetSortLst()->upper_bound(
-                const_cast<_SetGetExpFld*>(&rToThisFld));
-        for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
-            lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+        _SetGetExpFields::const_iterator const itLast =
+            mpUpdateFields->GetSortLst()->upper_bound(
+                const_cast<_SetGetExpField*>(&rToThisField));
+        for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
+            lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
     pMgr->CloseAll(false);
 #endif
 }
 
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+    mbNewFieldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
     SwDBManager* pMgr = NULL;
@@ -1417,14 +1417,14 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
     pMgr->CloseAll(false);
 #endif
 
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
-        it != mpUpdtFlds->GetSortLst()->end() &&
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin();
+        it != mpUpdateFields->GetSortLst()->end() &&
         ( (*it)->GetNode() < nLastNd ||
-          ( (*it)->GetNode() == nLastNd && (*it)->GetCntnt() <= nLastCnt )
+          ( (*it)->GetNode() == nLastNd && (*it)->GetContent() <= nLastCnt )
         );
         ++it )
     {
-        lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+        lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
     }
 
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -1432,70 +1432,70 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
 #endif
 }
 
-void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
-                            const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& rTableSize,
+                            const _SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_EXPAND );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND );
+    mbNewFieldLst = false;
 
     // Hash table for all string replacements is filled on-the-fly.
     // Try to fabricate an uneven number.
-    rTblSize = (( mpUpdtFlds->GetSortLst()->size() / 7 ) + 1 ) * 7;
-    ppHashTbl = new SwHash*[ rTblSize ];
-    memset( ppHashTbl, 0, sizeof( _HashStr* ) * rTblSize );
+    rTableSize = (( mpUpdateFields->GetSortLst()->size() / 7 ) + 1 ) * 7;
+    ppHashTable = new SwHash*[ rTableSize ];
+    memset( ppHashTable, 0, sizeof( _HashStr* ) * rTableSize );
 
-    _SetGetExpFlds::const_iterator const itLast =
-        mpUpdtFlds->GetSortLst()->upper_bound(
-            const_cast<_SetGetExpFld*>(&rToThisFld));
+    _SetGetExpFields::const_iterator const itLast =
+        mpUpdateFields->GetSortLst()->upper_bound(
+            const_cast<_SetGetExpField*>(&rToThisField));
 
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
     {
-        const SwTxtFld* pTxtFld = (*it)->GetTxtFld();
-        if( !pTxtFld )
+        const SwTextField* pTextField = (*it)->GetTextField();
+        if( !pTextField )
             continue;
 
-        const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-        switch( pFld->GetTyp()->Which() )
+        const SwField* pField = pTextField->GetFormatField().GetField();
+        switch( pField->GetTyp()->Which() )
         {
         case RES_SETEXPFLD:
-            if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() )
+            if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() )
             {
                 // set the new value in the hash table
                 // is the formula a field?
-                SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
-                OUString aNew = LookString( ppHashTbl, rTblSize, pSFld->GetFormula() );
+                SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+                OUString aNew = LookString( ppHashTable, rTableSize, pSField->GetFormula() );
 
                 if( aNew.isEmpty() )               // nothing found, then the formula is
-                    aNew = pSFld->GetFormula(); // the new value
+                    aNew = pSField->GetFormula(); // the new value
 
                 // #i3141# - update expression of field as in method
-                // <SwDoc::UpdateExpFlds(..)> for string/text fields
-                pSFld->ChgExpStr( aNew );
+                // <SwDoc::UpdateExpFields(..)> for string/text fields
+                pSField->ChgExpStr( aNew );
 
                 // look up the field's name
-                aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+                aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
                 // Entry present?
                 sal_uInt16 nPos;
-                SwHash* pFnd = Find( aNew, ppHashTbl, rTblSize, &nPos );
+                SwHash* pFnd = Find( aNew, ppHashTable, rTableSize, &nPos );
                 if( pFnd )
                     // modify entry in the hash table
-                    static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+                    static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                 else
                     // insert the new entry
-                    *(ppHashTbl + nPos ) = new _HashStr( aNew,
-                            pSFld->GetExpStr(), static_cast<_HashStr*>(*(ppHashTbl + nPos)) );
+                    *(ppHashTable + nPos ) = new _HashStr( aNew,
+                            pSField->GetExpStr(), static_cast<_HashStr*>(*(ppHashTable + nPos)) );
             }
             break;
         case RES_DBFLD:
             {
-                const OUString& rName = pFld->GetTyp()->GetName();
+                const OUString& rName = pField->GetTyp()->GetName();
 
                 // Insert entry in the hash table
                 // Entry present?
                 sal_uInt16 nPos;
-                SwHash* pFnd = Find( rName, ppHashTbl, rTblSize, &nPos );
-                OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+                SwHash* pFnd = Find( rName, ppHashTable, rTableSize, &nPos );
+                OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
                 if( pFnd )
                 {
                     // modify entry in the hash table
@@ -1504,8 +1504,8 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
                 else
                 {
                     // insert the new entry
-                    *(ppHashTbl + nPos ) = new _HashStr( rName,
-                        value, static_cast<_HashStr *>(*(ppHashTbl + nPos)));
+                    *(ppHashTable + nPos ) = new _HashStr( rName,
+                        value, static_cast<_HashStr *>(*(ppHashTable + nPos)));
                 }
             }
             break;
@@ -1514,35 +1514,35 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
 }
 
 
-bool DocumentFieldsManager::IsNewFldLst() const
+bool DocumentFieldsManager::IsNewFieldLst() const
 {
-    return mbNewFldLst;
+    return mbNewFieldLst;
 }
 
-void DocumentFieldsManager::SetNewFldLst(bool bFlag)
+void DocumentFieldsManager::SetNewFieldLst(bool bFlag)
 {
-    mbNewFldLst = bFlag;
+    mbNewFieldLst = bFlag;
 }
 
-void DocumentFieldsManager::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
+void DocumentFieldsManager::InsDelFieldInFieldLst( bool bIns, const SwTextField& rField )
 {
-    if( !mbNewFldLst || !m_rDoc.IsInDtor() )
-        mpUpdtFlds->InsDelFldInFldLst( bIns, rFld );
+    if( !mbNewFieldLst || !m_rDoc.IsInDtor() )
+        mpUpdateFields->InsDelFieldInFieldLst( bIns, rField );
 }
 
 SwField * DocumentFieldsManager::GetFieldAtPos(const SwPosition & rPos)
 {
-    SwTxtFld * const pAttr = GetTxtFldAtPos(rPos);
+    SwTextField * const pAttr = GetTextFieldAtPos(rPos);
 
-    return (pAttr) ? const_cast<SwField *>( pAttr->GetFmtFld().GetField() ) : 0;
+    return (pAttr) ? const_cast<SwField *>( pAttr->GetFormatField().GetField() ) : 0;
 }
 
-SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
+SwTextField * DocumentFieldsManager::GetTextFieldAtPos(const SwPosition & rPos)
 {
-    SwTxtNode * const pNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * const pNode = rPos.nNode.GetNode().GetTextNode();
 
     return (pNode != NULL)
-        ? pNode->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true )
+        ? pNode->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true )
         : 0;
 }
 
@@ -1550,10 +1550,10 @@ SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
 ///       optimization currently only available when no fields exist.
 bool DocumentFieldsManager::containsUpdatableFields()
 {
-    for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+    for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
     {
-        SwFieldType* pFldType = (*mpFldTypes)[i];
-        SwIterator<SwFmtFld,SwFieldType> aIter(*pFldType);
+        SwFieldType* pFieldType = (*mpFieldTypes)[i];
+        SwIterator<SwFormatField,SwFieldType> aIter(*pFieldType);
         if (aIter.First())
             return true;
     }
@@ -1563,96 +1563,96 @@ bool DocumentFieldsManager::containsUpdatableFields()
 /// Remove all unreferenced field types of a document
 void DocumentFieldsManager::GCFieldTypes()
 {
-    for( sal_uInt16 n = mpFldTypes->size(); n > INIT_FLDTYPES; )
-        if( !(*mpFldTypes)[ --n ]->HasWriterListeners() )
-            RemoveFldType( n );
+    for( sal_uInt16 n = mpFieldTypes->size(); n > INIT_FLDTYPES; )
+        if( !(*mpFieldTypes)[ --n ]->HasWriterListeners() )
+            RemoveFieldType( n );
 }
 
 void DocumentFieldsManager::_InitFieldTypes()       // is being called by the CTOR
 {
     // Field types
-    mpFldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwChapterFieldType );
-    mpFldTypes->push_back( new SwPageNumberFieldType );
-    mpFldTypes->push_back( new SwAuthorFieldType );
-    mpFldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwHiddenTxtFieldType );
-    mpFldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwTblFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwHiddenParaFieldType );
-    mpFldTypes->push_back( new SwDBNextSetFieldType );
-    mpFldTypes->push_back( new SwDBNumSetFieldType );
-    mpFldTypes->push_back( new SwDBSetNumberFieldType );
-    mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwExtUserFieldType );
-    mpFldTypes->push_back( new SwRefPageSetFieldType );
-    mpFldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwCombinedCharFieldType );
-    mpFldTypes->push_back( new SwDropDownFieldType );
+    mpFieldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwChapterFieldType );
+    mpFieldTypes->push_back( new SwPageNumberFieldType );
+    mpFieldTypes->push_back( new SwAuthorFieldType );
+    mpFieldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwHiddenTextFieldType );
+    mpFieldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwTableFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwHiddenParaFieldType );
+    mpFieldTypes->push_back( new SwDBNextSetFieldType );
+    mpFieldTypes->push_back( new SwDBNumSetFieldType );
+    mpFieldTypes->push_back( new SwDBSetNumberFieldType );
+    mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwExtUserFieldType );
+    mpFieldTypes->push_back( new SwRefPageSetFieldType );
+    mpFieldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwCombinedCharFieldType );
+    mpFieldTypes->push_back( new SwDropDownFieldType );
 
     // Types have to be at the end!
-    // We expect &m_rDoc in the InsertFldType!
+    // We expect &m_rDoc in the InsertFieldType!
     // MIB 14.04.95: In Sw3StringPool::Setup (sw3imp.cxx) and
     //               lcl_sw3io_InSetExpField (sw3field.cxx) now also
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) );
 
-    assert( mpFldTypes->size() == INIT_FLDTYPES );
+    assert( mpFieldTypes->size() == INIT_FLDTYPES );
 }
 
 void DocumentFieldsManager::ClearFieldTypes()
 {
-    for(SwFldTypes::const_iterator it = mpFldTypes->begin() + INIT_FLDTYPES;
-        it != mpFldTypes->end(); ++it)
+    for(SwFieldTypes::const_iterator it = mpFieldTypes->begin() + INIT_FLDTYPES;
+        it != mpFieldTypes->end(); ++it)
         delete *it;
-    mpFldTypes->erase( mpFldTypes->begin() + INIT_FLDTYPES, mpFldTypes->end() );
+    mpFieldTypes->erase( mpFieldTypes->begin() + INIT_FLDTYPES, mpFieldTypes->end() );
 }
 
-void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
+void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCalc& rCalc )
 {
 #if !HAVE_FEATURE_DBCONNECTIVITY
-    (void) rDBFld;
+    (void) rDBField;
     (void) rCalc;
 #else
     SwDBManager* pMgr = m_rDoc.GetDBManager();
 
-    sal_uInt16 nFldType = rDBFld.Which();
+    sal_uInt16 nFieldType = rDBField.Which();
 
-    bool bPar1 = rCalc.Calculate( rDBFld.GetPar1() ).GetBool();
+    bool bPar1 = rCalc.Calculate( rDBField.GetPar1() ).GetBool();
 
-    if( RES_DBNEXTSETFLD == nFldType )
-        static_cast<SwDBNextSetField&>(rDBFld).SetCondValid( bPar1 );
+    if( RES_DBNEXTSETFLD == nFieldType )
+        static_cast<SwDBNextSetField&>(rDBField).SetCondValid( bPar1 );
     else
-        static_cast<SwDBNumSetField&>(rDBFld).SetCondValid( bPar1 );
+        static_cast<SwDBNumSetField&>(rDBField).SetCondValid( bPar1 );
 
-    if( !rDBFld.GetRealDBData().sDataSource.isEmpty() )
+    if( !rDBField.GetRealDBData().sDataSource.isEmpty() )
     {
         // Edit a certain database
-        if( RES_DBNEXTSETFLD == nFldType )
-            static_cast<SwDBNextSetField&>(rDBFld).Evaluate(&m_rDoc);
+        if( RES_DBNEXTSETFLD == nFieldType )
+            static_cast<SwDBNextSetField&>(rDBField).Evaluate(&m_rDoc);
         else
-            static_cast<SwDBNumSetField&>(rDBFld).Evaluate(&m_rDoc);
+            static_cast<SwDBNumSetField&>(rDBField).Evaluate(&m_rDoc);
 
-        SwDBData aTmpDBData( rDBFld.GetDBData(&m_rDoc) );
+        SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) );
 
         if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false ))
-            rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBFld),
+            rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBField),
                         pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) );
     }
     else
@@ -1664,8 +1664,8 @@ void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& r
 
 DocumentFieldsManager::~DocumentFieldsManager()
 {
-    delete mpUpdtFlds;
-    delete mpFldTypes;
+    delete mpUpdateFields;
+    delete mpFieldTypes;
 }
 
 }
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index ad23762a0c85..14dc9ab54ced 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -107,9 +107,9 @@ void DocumentLayoutManager::SetLayouter( SwLayouter* pNew )
 
     The format is put into the respective format array.
     If there already is a fitting format, it is returned instead. */
-SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
+SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet )
 {
-    SwFrmFmt *pFmt = 0;
+    SwFrameFormat *pFormat = 0;
     const bool bMod = m_rDoc.getIDocumentState().IsModified();
     bool bHeader = false;
 
@@ -126,16 +126,16 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
     case RND_STD_FOOTERL:
     case RND_STD_FOOTERR:
         {
-            pFmt = new SwFrmFmt( m_rDoc.GetAttrPool(),
+            pFormat = new SwFrameFormat( m_rDoc.GetAttrPool(),
                                  (bHeader ? "Right header" : "Right footer"),
-                                 m_rDoc.GetDfltFrmFmt() );
+                                 m_rDoc.GetDfltFrameFormat() );
 
             SwNodeIndex aTmpIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
             SwStartNode* pSttNd =
                 m_rDoc.GetNodes().MakeTextSection
                 ( aTmpIdx,
                   bHeader ? SwHeaderStartNode : SwFooterStartNode,
-                  m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>( bHeader
+                  m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>( bHeader
                                      ? ( eRequest == RND_STD_HEADERL
                                          ? RES_POOLCOLL_HEADERL
                                          : eRequest == RND_STD_HEADERR
@@ -147,10 +147,10 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
                                          ? RES_POOLCOLL_FOOTERR
                                          : RES_POOLCOLL_FOOTER )
                                      ) ) );
-            pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
+            pFormat->SetFormatAttr( SwFormatContent( pSttNd ));
 
             if( pSet )      // Set a few more attributes
-                pFmt->SetFmtAttr( *pSet );
+                pFormat->SetFormatAttr( *pSet );
 
             // Why set it back?  Doc has changed, or not?
             // In any case, wrong for the FlyFrames!
@@ -161,14 +161,14 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
 
     case RND_DRAW_OBJECT:
         {
-            pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+            pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
             if( pSet )      // Set a few more attributes
-                pFmt->SetFmtAttr( *pSet );
+                pFormat->SetFormatAttr( *pSet );
 
             if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
             {
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(
-                    new SwUndoInsLayFmt(pFmt, 0, 0));
+                    new SwUndoInsLayFormat(pFormat, 0, 0));
             }
         }
         break;
@@ -188,32 +188,32 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
                 "LayoutFormat was requested with an invalid Request." );
 
     }
-    return pFmt;
+    return pFormat;
 }
 
 /// Deletes the denoted format and its content.
-void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
+void DocumentLayoutManager::DelLayoutFormat( SwFrameFormat *pFormat )
 {
     // A chain of frames needs to be merged, if necessary,
     // so that the Frame's contents are adjusted accordingly before we destroy the Frames.
-    const SwFmtChain &rChain = pFmt->GetChain();
+    const SwFormatChain &rChain = pFormat->GetChain();
     if ( rChain.GetPrev() )
     {
-        SwFmtChain aChain( rChain.GetPrev()->GetChain() );
+        SwFormatChain aChain( rChain.GetPrev()->GetChain() );
         aChain.SetNext( rChain.GetNext() );
         m_rDoc.SetAttr( aChain, *rChain.GetPrev() );
     }
     if ( rChain.GetNext() )
     {
-        SwFmtChain aChain( rChain.GetNext()->GetChain() );
+        SwFormatChain aChain( rChain.GetNext()->GetChain() );
         aChain.SetPrev( rChain.GetPrev() );
         m_rDoc.SetAttr( aChain, *rChain.GetNext() );
     }
 
     const SwNodeIndex* pCntIdx = 0;
     // The draw format doesn't own its content, it just has a pointer to it.
-    if (pFmt->Which() != RES_DRAWFRMFMT)
-        pCntIdx = pFmt->GetCntnt().GetCntntIdx();
+    if (pFormat->Which() != RES_DRAWFRMFMT)
+        pCntIdx = pFormat->GetContent().GetContentIdx();
     if (pCntIdx && !m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
         // Disconnect if it's an OLE object
@@ -239,14 +239,14 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
     }
 
     // Destroy Frames
-    pFmt->DelFrms();
+    pFormat->DelFrms();
 
     // Only FlyFrames are undoable at first
-    const sal_uInt16 nWh = pFmt->Which();
+    const sal_uInt16 nWh = pFormat->Which();
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
         (RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh))
     {
-        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFmt( pFmt ));
+        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFormat( pFormat ));
     }
     else
     {
@@ -254,35 +254,35 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
         if ( nWh == RES_FLYFRMFMT )
         {
             // determine frame formats of at-frame anchored objects
-            const SwNodeIndex* pCntntIdx = 0;
-            if (pFmt->Which() != RES_DRAWFRMFMT)
-                pCntntIdx = pFmt->GetCntnt().GetCntntIdx();
-            if (pCntntIdx)
+            const SwNodeIndex* pContentIdx = 0;
+            if (pFormat->Which() != RES_DRAWFRMFMT)
+                pContentIdx = pFormat->GetContent().GetContentIdx();
+            if (pContentIdx)
             {
-                const SwFrmFmts* pTbl = pFmt->GetDoc()->GetSpzFrmFmts();
-                if ( pTbl )
+                const SwFrameFormats* pTable = pFormat->GetDoc()->GetSpzFrameFormats();
+                if ( pTable )
                 {
-                    std::vector<SwFrmFmt*> aToDeleteFrmFmts;
-                    const sal_uLong nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() );
+                    std::vector<SwFrameFormat*> aToDeleteFrameFormats;
+                    const sal_uLong nNodeIdxOfFlyFormat( pContentIdx->GetIndex() );
 
-                    for ( size_t i = 0; i < pTbl->size(); ++i )
+                    for ( size_t i = 0; i < pTable->size(); ++i )
                     {
-                        SwFrmFmt* pTmpFmt = (*pTbl)[i];
-                        const SwFmtAnchor &rAnch = pTmpFmt->GetAnchor();
+                        SwFrameFormat* pTmpFormat = (*pTable)[i];
+                        const SwFormatAnchor &rAnch = pTmpFormat->GetAnchor();
                         if ( rAnch.GetAnchorId() == FLY_AT_FLY &&
-                             rAnch.GetCntntAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFmt )
+                             rAnch.GetContentAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFormat )
                         {
-                            aToDeleteFrmFmts.push_back( pTmpFmt );
+                            aToDeleteFrameFormats.push_back( pTmpFormat );
                         }
                     }
 
                     // delete found frame formats
-                    while ( !aToDeleteFrmFmts.empty() )
+                    while ( !aToDeleteFrameFormats.empty() )
                     {
-                        SwFrmFmt* pTmpFmt = aToDeleteFrmFmts.back();
-                        pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pTmpFmt );
+                        SwFrameFormat* pTmpFormat = aToDeleteFrameFormats.back();
+                        pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pTmpFormat );
 
-                        aToDeleteFrmFmts.pop_back();
+                        aToDeleteFrameFormats.pop_back();
                     }
                 }
             }
@@ -292,34 +292,34 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
         if( pCntIdx )
         {
             SwNode *pNode = &pCntIdx->GetNode();
-            const_cast<SwFmtCntnt&>(static_cast<const SwFmtCntnt&>(pFmt->GetFmtAttr( RES_CNTNT ))).SetNewCntntIdx( 0 );
+            const_cast<SwFormatContent&>(static_cast<const SwFormatContent&>(pFormat->GetFormatAttr( RES_CNTNT ))).SetNewContentIdx( 0 );
             m_rDoc.getIDocumentContentOperations().DeleteSection( pNode );
         }
 
         // Delete the character for FlyFrames anchored as char (if necessary)
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-        if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetCntntAnchor())
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+        if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetContentAnchor())
         {
-            const SwPosition* pPos = rAnchor.GetCntntAnchor();
-            SwTxtNode *pTxtNd = pPos->nNode.GetNode().GetTxtNode();
+            const SwPosition* pPos = rAnchor.GetContentAnchor();
+            SwTextNode *pTextNd = pPos->nNode.GetNode().GetTextNode();
 
             // attribute is still in text node, delete it
-            if ( pTxtNd )
+            if ( pTextNd )
             {
-                SwTxtFlyCnt* const pAttr = static_cast<SwTxtFlyCnt*>(
-                    pTxtNd->GetTxtAttrForCharAt( pPos->nContent.GetIndex(),
+                SwTextFlyCnt* const pAttr = static_cast<SwTextFlyCnt*>(
+                    pTextNd->GetTextAttrForCharAt( pPos->nContent.GetIndex(),
                         RES_TXTATR_FLYCNT ));
-                if ( pAttr && (pAttr->GetFlyCnt().GetFrmFmt() == pFmt) )
+                if ( pAttr && (pAttr->GetFlyCnt().GetFrameFormat() == pFormat) )
                 {
                     // dont delete, set pointer to 0
-                    const_cast<SwFmtFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFmt();
+                    const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat();
                     SwIndex aIdx( pPos->nContent );
-                    pTxtNd->EraseText( aIdx, 1 );
+                    pTextNd->EraseText( aIdx, 1 );
                 }
             }
         }
 
-        m_rDoc.DelFrmFmt( pFmt );
+        m_rDoc.DelFrameFormat( pFormat );
     }
     m_rDoc.getIDocumentState().SetModified();
 }
@@ -330,10 +330,10 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
     If the source format is located in another document, also copy correctly
     in this case.
     The Anchor attribute's position is always set to 0! */
-SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
-    const SwFrmFmt& rSource,
-    const SwFmtAnchor& rNewAnchor,
-    bool bSetTxtFlyAtt,
+SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
+    const SwFrameFormat& rSource,
+    const SwFormatAnchor& rNewAnchor,
+    bool bSetTextFlyAtt,
     bool bMakeFrms )
 {
     const bool bFly = RES_FLYFRMFMT == rSource.Which();
@@ -356,8 +356,8 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
             ((FLY_AT_PARA == rNewAnchor.GetAnchorId()) ||
              (FLY_AT_FLY  == rNewAnchor.GetAnchorId()) ||
              (FLY_AT_CHAR == rNewAnchor.GetAnchorId())) &&
-            rNewAnchor.GetCntntAnchor() &&
-            m_rDoc.IsInHeaderFooter( rNewAnchor.GetCntntAnchor()->nNode ) &&
+            rNewAnchor.GetContentAnchor() &&
+            m_rDoc.IsInHeaderFooter( rNewAnchor.GetContentAnchor()->nNode ) &&
             pDrawContact != NULL  &&
             pDrawContact->GetMaster() != NULL  &&
             CheckControlLayer( pDrawContact->GetMaster() );
@@ -367,9 +367,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
     if( bMayNotCopy )
         return NULL;
 
-    SwFrmFmt* pDest = m_rDoc.GetDfltFrmFmt();
-    if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrmFmt() )
-        pDest = m_rDoc.CopyFrmFmt( *static_cast<const SwFrmFmt*>(rSource.GetRegisteredIn()) );
+    SwFrameFormat* pDest = m_rDoc.GetDfltFrameFormat();
+    if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrameFormat() )
+        pDest = m_rDoc.CopyFrameFormat( *static_cast<const SwFrameFormat*>(rSource.GetRegisteredIn()) );
     if( bFly )
     {
         // #i11176#
@@ -378,36 +378,36 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         // These are then added to the DrawingLayer (which needs to exist).
         // Together with correct sorting of all drawinglayer based objects
         // before cloning ZOrder transfer works correctly then.
-        SwFlyFrmFmt *pFormat = m_rDoc.MakeFlyFrmFmt( rSource.GetName(), pDest );
+        SwFlyFrameFormat *pFormat = m_rDoc.MakeFlyFrameFormat( rSource.GetName(), pDest );
         pDest = pFormat;
 
         SwXFrame::GetOrCreateSdrObject(*pFormat);
     }
     else
-        pDest = m_rDoc.MakeDrawFrmFmt( OUString(), pDest );
+        pDest = m_rDoc.MakeDrawFrameFormat( OUString(), pDest );
 
     // Copy all other or new attributes
     pDest->CopyAttrs( rSource );
 
     // Do not copy chains
-    pDest->ResetFmtAttr( RES_CHAIN );
+    pDest->ResetFormatAttr( RES_CHAIN );
 
     if( bFly )
     {
         // Duplicate the content.
-        const SwNode& rCSttNd = rSource.GetCntnt().GetCntntIdx()->GetNode();
+        const SwNode& rCSttNd = rSource.GetContent().GetContentIdx()->GetNode();
         SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() );
 
         SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
         SwStartNode* pSttNd = SwNodes::MakeEmptySection( aIdx, SwFlyStartNode );
 
-        // Set the Anchor/CntntIndex first.
-        // Within the copying part, we can access the values (DrawFmt in Headers and Footers)
+        // Set the Anchor/ContentIndex first.
+        // Within the copying part, we can access the values (DrawFormat in Headers and Footers)
         aIdx = *pSttNd;
-        SwFmtCntnt aAttr( rSource.GetCntnt() );
-        aAttr.SetNewCntntIdx( &aIdx );
-        pDest->SetFmtAttr( aAttr );
-        pDest->SetFmtAttr( rNewAnchor );
+        SwFormatContent aAttr( rSource.GetContent() );
+        aAttr.SetNewContentIdx( &aIdx );
+        pDest->SetFormatAttr( aAttr );
+        pDest->SetFormatAttr( rNewAnchor );
 
         if( !m_rDoc.IsCopyIsMove() || &m_rDoc != pSrcDoc )
         {
@@ -434,14 +434,14 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
 
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
         }
 
         // Make sure that FlyFrames in FlyFrames are copied
         aIdx = *pSttNd->EndOfSectionNode();
 
         //fdo#36631 disable (scoped) any undo operations associated with the
-        //contact object itself. They should be managed by SwUndoInsLayFmt.
+        //contact object itself. They should be managed by SwUndoInsLayFormat.
         const ::sw::DrawUndoGuard drawUndoGuard(m_rDoc.GetIDocumentUndoRedo());
 
         pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aIdx, NULL, false, true, true );
@@ -452,17 +452,17 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         // #i52780# - Note: moving object to visible layer not needed.
         const SwDrawContact* pSourceContact = static_cast<const SwDrawContact *>(rSource.FindContactObj());
 
-        SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrmFmt*>(pDest),
+        SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrameFormat*>(pDest),
                                 m_rDoc.CloneSdrObj( *pSourceContact->GetMaster(),
                                         m_rDoc.IsCopyIsMove() && &m_rDoc == pSrcDoc ) );
         // #i49730# - notify draw frame format that position attributes are
         // already set, if the position attributes are already set at the
         // source draw frame format.
-        if ( pDest->ISA(SwDrawFrmFmt) &&
-             rSource.ISA(SwDrawFrmFmt) &&
-             static_cast<const SwDrawFrmFmt&>(rSource).IsPosAttrSet() )
+        if ( pDest->ISA(SwDrawFrameFormat) &&
+             rSource.ISA(SwDrawFrameFormat) &&
+             static_cast<const SwDrawFrameFormat&>(rSource).IsPosAttrSet() )
         {
-            static_cast<SwDrawFrmFmt*>(pDest)->PosAttrSet();
+            static_cast<SwDrawFrameFormat*>(pDest)->PosAttrSet();
         }
 
         if( pDest->GetAnchor() == rNewAnchor )
@@ -474,33 +474,33 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
             }
         }
         else
-            pDest->SetFmtAttr( rNewAnchor );
+            pDest->SetFormatAttr( rNewAnchor );
 
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
         }
     }
 
-    if (bSetTxtFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
+    if (bSetTextFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
     {
-        const SwPosition* pPos = rNewAnchor.GetCntntAnchor();
-        SwFmtFlyCnt aFmt( pDest );
-        pPos->nNode.GetNode().GetTxtNode()->InsertItem(
-            aFmt, pPos->nContent.GetIndex(), 0 );
+        const SwPosition* pPos = rNewAnchor.GetContentAnchor();
+        SwFormatFlyCnt aFormat( pDest );
+        pPos->nNode.GetNode().GetTextNode()->InsertItem(
+            aFormat, pPos->nContent.GetIndex(), 0 );
     }
 
     if( bMakeFrms )
         pDest->MakeFrms();
 
     // If the draw format has a TextBox, then copy its fly format as well.
-    if (SwFrmFmt* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
+    if (SwFrameFormat* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
     {
-        SwFrmFmt* pDestTextBox = CopyLayoutFmt(*pSourceTextBox, rNewAnchor, bSetTxtFlyAtt, bMakeFrms);
+        SwFrameFormat* pDestTextBox = CopyLayoutFormat(*pSourceTextBox, rNewAnchor, bSetTextFlyAtt, bMakeFrms);
         SwAttrSet aSet(pDest->GetAttrSet());
-        SwFmtCntnt aCntnt(pDestTextBox->GetCntnt().GetCntntIdx()->GetNode().GetStartNode());
-        aSet.Put(aCntnt);
-        pDest->SetFmtAttr(aSet);
+        SwFormatContent aContent(pDestTextBox->GetContent().GetContentIdx()->GetNode().GetStartNode());
+        aSet.Put(aContent);
+        pDest->SetFormatAttr(aSet);
     }
 
     return pDest;
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 7ed4e7bf9b7f..2e2db8c74f6f 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -53,11 +53,11 @@ namespace
     struct _FindItem
     {
         const OUString m_Item;
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSectionNode* pSectNd;
 
         _FindItem(const OUString& rS)
-            : m_Item(rS), pTblNd(0), pSectNd(0)
+            : m_Item(rS), pTableNd(0), pSectNd(0)
         {}
      };
 
@@ -112,9 +112,9 @@ namespace
     }
 
 
-    bool lcl_FindSection( const SwSectionFmt* pSectFmt, _FindItem * const pItem, bool bCaseSensitive )
+    bool lcl_FindSection( const SwSectionFormat* pSectFormat, _FindItem * const pItem, bool bCaseSensitive )
     {
-        SwSection* pSect = pSectFmt->GetSection();
+        SwSection* pSect = pSectFormat->GetSection();
         if( pSect )
         {
             OUString sNm( (bCaseSensitive)
@@ -127,8 +127,8 @@ namespace
             {
                 // found, so get the data
                 const SwNodeIndex* pIdx;
-                if( 0 != (pIdx = pSectFmt->GetCntnt().GetCntntIdx() ) &&
-                    &pSectFmt->GetDoc()->GetNodes() == &pIdx->GetNodes() )
+                if( 0 != (pIdx = pSectFormat->GetContent().GetContentIdx() ) &&
+                    &pSectFormat->GetDoc()->GetNodes() == &pIdx->GetNodes() )
                 {
                     // a table in the normal NodesArr
                     pItem->pSectNd = pIdx->GetNode().GetSectionNode();
@@ -141,20 +141,20 @@ namespace
         return true;
     }
 
-    bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem )
+    bool lcl_FindTable( const SwFrameFormat* pTableFormat, _FindItem * const pItem )
     {
-        OUString sNm( GetAppCharClass().lowercase( pTableFmt->GetName() ));
+        OUString sNm( GetAppCharClass().lowercase( pTableFormat->GetName() ));
         if ( sNm == pItem->m_Item )
         {
-            SwTable* pTmpTbl;
+            SwTable* pTmpTable;
             SwTableBox* pFBox;
-            if( 0 != ( pTmpTbl = SwTable::FindTable( pTableFmt ) ) &&
-                0 != ( pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+            if( 0 != ( pTmpTable = SwTable::FindTable( pTableFormat ) ) &&
+                0 != ( pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
                 pFBox->GetSttNd() &&
-                &pTableFmt->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
+                &pTableFormat->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
             {
                 // a table in the normal NodesArr
-                pItem->pTblNd = const_cast<SwTableNode*>(
+                pItem->pTableNd = const_cast<SwTableNode*>(
                                             pFBox->GetSttNd()->FindTableNode());
                 return false;
             }
@@ -247,9 +247,9 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
         if( aPara.pSectNd )
@@ -263,14 +263,14 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
     }
 
     _FindItem aPara( GetAppCharClass().lowercase( rItem ));
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
-    if( aPara.pTblNd )
+    if( aPara.pTableNd )
     {
-        return SwServerObject( *aPara.pTblNd ).GetData( rValue, rMimeType );
+        return SwServerObject( *aPara.pTableNd ).GetData( rValue, rMimeType );
     }
 
     return false;
@@ -292,9 +292,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
         if( aPara.pSectNd )
@@ -309,9 +309,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
     OUString sItem(GetAppCharClass().lowercase(rItem));
     _FindItem aPara( sItem );
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
 
@@ -341,9 +341,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
         _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         // sections
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
 
@@ -364,17 +364,17 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
     _FindItem aPara( GetAppCharClass().lowercase(rItem) );
     // tables
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
-    if(aPara.pTblNd
-        && (0 == (pObj = aPara.pTblNd->GetTable().GetObject())))
+    if(aPara.pTableNd
+        && (0 == (pObj = aPara.pTableNd->GetTable().GetObject())))
     {
         // table found, but no link yet -> create hotlink
-        pObj = new SwServerObject(*aPara.pTblNd);
-        aPara.pTblNd->GetTable().SetRefObject(pObj);
+        pObj = new SwServerObject(*aPara.pTableNd);
+        aPara.pTableNd->GetTable().SetRefObject(pObj);
         GetLinkManager().InsertServer(pObj);
     }
     return pObj;
@@ -453,15 +453,15 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
         if( sCmp == "table" )
         {
             sName = rCC.lowercase( sName );
-            for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+            for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
             {
-                if (!(lcl_FindTable(pFmt, &aPara)))
+                if (!(lcl_FindTable(pFormat, &aPara)))
                     break;
             }
-            if( aPara.pTblNd )
+            if( aPara.pTableNd )
             {
-                rpRange = new SwNodeRange( *aPara.pTblNd, 0,
-                                *aPara.pTblNd->EndOfSectionNode(), 1 );
+                rpRange = new SwNodeRange( *aPara.pTableNd, 0,
+                                *aPara.pTableNd->EndOfSectionNode(), 1 );
                 return true;
             }
         }
@@ -469,10 +469,10 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
         {
             SwNodeIndex* pIdx;
             SwNode* pNd;
-            const SwFlyFrmFmt* pFlyFmt = m_rDoc.FindFlyByName( sName );
-            if( pFlyFmt &&
-                0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFmt->GetCntnt().GetCntntIdx()) ) &&
-                !( pNd = &pIdx->GetNode())->IsNoTxtNode() )
+            const SwFlyFrameFormat* pFlyFormat = m_rDoc.FindFlyByName( sName );
+            if( pFlyFormat &&
+                0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFormat->GetContent().GetContentIdx()) ) &&
+                !( pNd = &pIdx->GetNode())->IsNoTextNode() )
             {
                 rpRange = new SwNodeRange( *pNd, 1, *pNd->EndOfSectionNode() );
                 return true;
@@ -489,7 +489,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
             if( m_rDoc.GotoOutline( aPos, sName ))
             {
                 SwNode* pNd = &aPos.nNode.GetNode();
-                const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+                const int nLvl = pNd->GetTextNode()->GetAttrOutlineLevel()-1;
 
                 const SwOutlineNodes& rOutlNds = m_rDoc.GetNodes().GetOutLineNds();
                 sal_uInt16 nTmpPos;
@@ -499,7 +499,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
                 // look for the section's end, now
                 for( ++nTmpPos;
                         nTmpPos < rOutlNds.size() &&
-                        nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
+                        nLvl < rOutlNds[ nTmpPos ]->GetTextNode()->
                                 GetAttrOutlineLevel()-1;
                     ++nTmpPos )
                     ;       // there is no block
@@ -534,9 +534,9 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
 
         if( !m_rDoc.GetSections().empty() )
         {
-            for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+            for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
             {
-                if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+                if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                     break;
             }
             if( aPara.pSectNd )
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx
index 5844fd27abed..66de4083f0c7 100644
--- a/sw/source/core/doc/DocumentListItemsManager.cxx
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -70,8 +70,8 @@ OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum,
                                const bool bWithNumber,
                                const bool bWithSpacesForLevel ) const
 {
-    return rNodeNum.GetTxtNode()
-           ? rNodeNum.GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
+    return rNodeNum.GetTextNode()
+           ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, bWithNumber,
                                                   bWithNumber, bWithSpacesForLevel )
            : OUString();
 }
@@ -100,7 +100,7 @@ void DocumentListItemsManager::getNumItems( tSortedNodeNumList& orNodeNumList )
     {
         const SwNodeNum* pNodeNum = (*aIter);
         if ( pNodeNum->IsCounted() &&
-             pNodeNum->GetTxtNode() && pNodeNum->GetTxtNode()->HasNumber() )
+             pNodeNum->GetTextNode() && pNodeNum->GetTextNode()->HasNumber() )
         {
             orNodeNumList.push_back( pNodeNum );
         }
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 5e006164618d..95d0789fe849 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -35,22 +35,22 @@ sal_Int32 DocumentOutlineNodesManager::getOutlineNodesCount() const
 int DocumentOutlineNodesManager::getOutlineLevel( const sal_Int32 nIdx ) const
 {
     return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
-                                GetTxtNode()->GetAttrOutlineLevel()-1;
+                                GetTextNode()->GetAttrOutlineLevel()-1;
 }
 
 OUString DocumentOutlineNodesManager::getOutlineText( const sal_Int32 nIdx,
                               const bool bWithNumber,
                               const bool bWithSpacesForLevel,
-                              const bool bWithFtn ) const
+                              const bool bWithFootnote ) const
 {
     return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
-                GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
-                                            bWithNumber, bWithSpacesForLevel, bWithFtn );
+                GetTextNode()->GetExpandText( 0, -1, bWithNumber,
+                                            bWithNumber, bWithSpacesForLevel, bWithFootnote );
 }
 
-SwTxtNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
+SwTextNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
 {
-    return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTxtNode();
+    return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTextNode();
 }
 
 void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const
@@ -62,7 +62,7 @@ void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSorte
     for ( sal_Int32 i = 0; i < nOutlCount; ++i )
     {
         orOutlineNodeList.push_back(
-            m_rDoc.GetNodes().GetOutLineNds()[i]->GetTxtNode() );
+            m_rDoc.GetNodes().GetOutLineNds()[i]->GetTextNode() );
     }
 }
 
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index e9c7dffeba44..99892d69b102 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -47,14 +47,14 @@ using namespace com::sun::star;
             assert(dynamic_cast<SwIndexReg*>(&pPos->nNode.GetNode())
                     == pPos->nContent.GetIdxReg());
 
-            SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 assert(pPos->nContent == 0);
             }
             else
             {
-                assert(pPos->nContent >= 0 && pPos->nContent <= pTxtNode->Len());
+                assert(pPos->nContent >= 0 && pPos->nContent <= pTextNode->Len());
             }
         }
 
@@ -69,25 +69,25 @@ using namespace com::sun::star;
         // sure the redlines are sorted and non-overlapping.
         static void lcl_CheckRedline( IDocumentRedlineAccess& redlineAccess )
         {
-            const SwRedlineTbl& rTbl = redlineAccess.GetRedlineTbl();
+            const SwRedlineTable& rTable = redlineAccess.GetRedlineTable();
 
             // verify valid redline positions
-            for( sal_uInt16 i = 0; i < rTbl.size(); ++i )
-                lcl_CheckPam( rTbl[ i ] );
+            for( sal_uInt16 i = 0; i < rTable.size(); ++i )
+                lcl_CheckPam( rTable[ i ] );
 
-            for( sal_uInt16 j = 0; j < rTbl.size(); ++j )
+            for( sal_uInt16 j = 0; j < rTable.size(); ++j )
             {
                 // check for empty redlines
-                OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
-                            ( rTbl[j]->GetContentIdx() != NULL ),
+                OSL_ENSURE( ( *(rTable[j]->GetPoint()) != *(rTable[j]->GetMark()) ) ||
+                            ( rTable[j]->GetContentIdx() != NULL ),
                             _ERROR_PREFIX "empty redline" );
              }
 
             // verify proper redline sorting
-            for( sal_uInt16 n = 1; n < rTbl.size(); ++n )
+            for( sal_uInt16 n = 1; n < rTable.size(); ++n )
             {
-                const SwRangeRedline* pPrev = rTbl[ n-1 ];
-                const SwRangeRedline* pCurrent = rTbl[ n ];
+                const SwRangeRedline* pPrev = rTable[ n-1 ];
+                const SwRangeRedline* pCurrent = rTable[ n ];
 
                 // check redline sorting
                 SAL_WARN_IF( *pPrev->Start() > *pCurrent->Start(), "sw",
@@ -98,7 +98,7 @@ using namespace com::sun::star;
                              _ERROR_PREFIX "overlapping redlines" );
             }
 
-            assert(std::is_sorted(rTbl.begin(), rTbl.end(), CompareSwRedlineTbl()));
+            assert(std::is_sorted(rTable.begin(), rTable.end(), CompareSwRedlineTable()));
         }
     }
 
@@ -114,14 +114,14 @@ namespace
 {
     static inline bool IsPrevPos( const SwPosition & rPos1, const SwPosition & rPos2 )
     {
-        const SwCntntNode* pCNd;
+        const SwContentNode* pCNd;
         return 0 == rPos2.nContent.GetIndex() &&
                rPos2.nNode.GetIndex() - 1 == rPos1.nNode.GetIndex() &&
-               0 != ( pCNd = rPos1.nNode.GetNode().GetCntntNode() ) &&
+               0 != ( pCNd = rPos1.nNode.GetNode().GetContentNode() ) &&
                rPos1.nContent.GetIndex() == pCNd->Len();
     }
 
-    static bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    static bool lcl_AcceptRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng = 0,
                             const SwPosition* pEndRng = 0 )
@@ -240,8 +240,8 @@ namespace
                 if( pDelStt && pDelEnd )
                 {
                     SwPaM aPam( *pDelStt, *pDelEnd );
-                    SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
-                    SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+                    SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+                    SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
 
                     if( bDelRedl )
                         delete pRedl;
@@ -280,7 +280,7 @@ namespace
         return bRet;
     }
 
-    static bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    static bool lcl_RejectRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng = 0,
                             const SwPosition* pEndRng = 0 )
@@ -350,8 +350,8 @@ namespace
                 {
                     SwPaM aPam( *pDelStt, *pDelEnd );
 
-                    SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
-                    SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+                    SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+                    SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
 
                     if( bDelRedl )
                         delete pRedl;
@@ -484,14 +484,14 @@ namespace
         return bRet;
     }
 
-    typedef bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    typedef bool (*Fn_AcceptReject)( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng,
                             const SwPosition* pEndRng);
 
 
     static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
-                                SwRedlineTbl& rArr, bool bCallDelete,
+                                SwRedlineTable& rArr, bool bCallDelete,
                                 const SwPaM& rPam)
     {
         sal_uInt16 n = 0;
@@ -545,7 +545,7 @@ namespace
                                                    : rPam.GetPoint();
         SwDoc* pDoc = rPam.GetDoc();
         if( !pStt->nContent.GetIndex() &&
-            !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsCntntNode() )
+            !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsContentNode() )
         {
             const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pStt, 0 );
             if( pRedl )
@@ -556,9 +556,9 @@ namespace
                     *pStt = *pRStt;
             }
         }
-        if( pEnd->nNode.GetNode().IsCntntNode() &&
-            !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsCntntNode() &&
-            pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len()    )
+        if( pEnd->nNode.GetNode().IsContentNode() &&
+            !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsContentNode() &&
+            pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetContentNode()->Len()    )
         {
             const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pEnd, 0 );
             if( pRedl )
@@ -577,12 +577,12 @@ namespace sw
 
 DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
                                                                     meRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
-                                                                    mpRedlineTbl( new SwRedlineTbl ),
-                                                                    mpExtraRedlineTbl ( new SwExtraRedlineTbl ),
-                                                                    mpAutoFmtRedlnComment( 0 ),
+                                                                    mpRedlineTable( new SwRedlineTable ),
+                                                                    mpExtraRedlineTable ( new SwExtraRedlineTable ),
+                                                                    mpAutoFormatRedlnComment( 0 ),
                                                                     mbIsRedlineMove(false),
                                                                     mbReadlineChecked(false),
-                                                                    mnAutoFmtRedlnCommentNo( 0 )
+                                                                    mnAutoFormatRedlnCommentNo( 0 )
 {
 }
 
@@ -627,12 +627,12 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
             if (pFnc)
             {
                 for (sal_uInt16 nLoop = 1; nLoop <= 2; ++nLoop)
-                    for (size_t i = 0; i < mpRedlineTbl->size(); ++i)
-                        ((*mpRedlineTbl)[i]->*pFnc)(nLoop, i);
+                    for (size_t i = 0; i < mpRedlineTable->size(); ++i)
+                        ((*mpRedlineTable)[i]->*pFnc)(nLoop, i);
 
                 //SwRangeRedline::MoveFromSection routinely changes
-                //the keys that mpRedlineTbl is sorted by
-                mpRedlineTbl->Resort();
+                //the keys that mpRedlineTable is sorted by
+                mpRedlineTable->Resort();
             }
 
             CheckAnchoredFlyConsistency(m_rDoc);
@@ -643,7 +643,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
         m_rDoc.getIDocumentState().SetModified();
     }
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::IsRedlineOn() const
@@ -661,29 +661,29 @@ void DocumentRedlineManager::SetRedlineMode_intern(RedlineMode_t eMode)
     meRedlineMode = eMode;
 }
 
-const SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl() const
+const SwRedlineTable& DocumentRedlineManager::GetRedlineTable() const
 {
-    return *mpRedlineTbl;
+    return *mpRedlineTable;
 }
 
-SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl()
+SwRedlineTable& DocumentRedlineManager::GetRedlineTable()
 {
-    return *mpRedlineTbl;
+    return *mpRedlineTable;
 }
 
-const SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl() const
+const SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable() const
 {
-    return *mpExtraRedlineTbl;
+    return *mpExtraRedlineTable;
 }
 
-SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl()
+SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable()
 {
-    return *mpExtraRedlineTbl;
+    return *mpExtraRedlineTable;
 }
 
-bool DocumentRedlineManager::HasExtraRedlineTbl() const
+bool DocumentRedlineManager::HasExtraRedlineTable() const
 {
-    return mpExtraRedlineTbl != nullptr;
+    return mpExtraRedlineTable != nullptr;
 }
 
 bool DocumentRedlineManager::IsInRedlines(const SwNode & rNode) const
@@ -739,13 +739,13 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
     {
         pNewRedl->InvalidateRange();
 
-        if( m_rDoc.IsAutoFmtRedline() )
+        if( m_rDoc.IsAutoFormatRedline() )
         {
-            pNewRedl->SetAutoFmtFlag();
-            if( mpAutoFmtRedlnComment && !mpAutoFmtRedlnComment->isEmpty() )
+            pNewRedl->SetAutoFormatFlag();
+            if( mpAutoFormatRedlnComment && !mpAutoFormatRedlnComment->isEmpty() )
             {
-                pNewRedl->SetComment( *mpAutoFmtRedlnComment );
-                pNewRedl->SetSeqNo( mnAutoFmtRedlnCommentNo );
+                pNewRedl->SetComment( *mpAutoFormatRedlnComment );
+                pNewRedl->SetSeqNo( mnAutoFormatRedlnCommentNo );
             }
         }
 
@@ -753,8 +753,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                   * pEnd = pStt == pNewRedl->GetPoint() ? pNewRedl->GetMark()
                                                         : pNewRedl->GetPoint();
         {
-            SwTxtNode* pTxtNode = pStt->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            SwTextNode* pTextNode = pStt->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 if( pStt->nContent > 0 )
                 {
@@ -764,14 +764,14 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             }
             else
             {
-                if( pStt->nContent > pTxtNode->Len() )
+                if( pStt->nContent > pTextNode->Len() )
                 {
                     OSL_ENSURE( false, "Redline start: index after text" );
-                    pStt->nContent = pTxtNode->Len();
+                    pStt->nContent = pTextNode->Len();
                 }
             }
-            pTxtNode = pEnd->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            pTextNode = pEnd->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 if( pEnd->nContent > 0 )
                 {
@@ -781,10 +781,10 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             }
             else
             {
-                if( pEnd->nContent > pTxtNode->Len() )
+                if( pEnd->nContent > pTextNode->Len() )
                 {
                     OSL_ENSURE( false, "Redline end: index after text" );
-                    pEnd->nContent = pTxtNode->Len();
+                    pEnd->nContent = pTextNode->Len();
                 }
             }
         }
@@ -801,11 +801,11 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             --n;
         bool bDec = false;
 
-        for( ; pNewRedl && n < mpRedlineTbl->size(); bDec ? n : ++n )
+        for( ; pNewRedl && n < mpRedlineTable->size(); bDec ? n : ++n )
         {
             bDec = false;
 
-            SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+            SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
             SwPosition* pRStt = pRedl->Start(),
                       * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark()
                                                            : pRedl->GetPoint();
@@ -814,7 +814,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             if( ( *pRStt == *pREnd ) &&
                 ( pRedl->GetContentIdx() == NULL ) )
             {
-                mpRedlineTbl->DeleteAndDestroy(n);
+                mpRedlineTable->DeleteAndDestroy(n);
                 continue;
             }
 
@@ -836,16 +836,16 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                              ( POS_COLLIDE_START == eCmpPos ) ||
                              ( POS_OVERLAP_BEHIND == eCmpPos ) ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
-                            ( n+1 >= (sal_uInt16)mpRedlineTbl->size() ||
-                             ( *(*mpRedlineTbl)[ n+1 ]->Start() >= *pEnd &&
-                             *(*mpRedlineTbl)[ n+1 ]->Start() != *pREnd ) ) )
+                            ( n+1 >= (sal_uInt16)mpRedlineTable->size() ||
+                             ( *(*mpRedlineTable)[ n+1 ]->Start() >= *pEnd &&
+                             *(*mpRedlineTable)[ n+1 ]->Start() != *pREnd ) ) )
                         {
                             pRedl->SetEnd( *pEnd, pREnd );
                             if( !pRedl->HasValidRange() )
                             {
                                 // re-insert
-                                mpRedlineTbl->Remove( n );
-                                mpRedlineTbl->Insert( pRedl );
+                                mpRedlineTable->Remove( n );
+                                mpRedlineTable->Insert( pRedl );
                             }
 
                             bMerged = true;
@@ -857,12 +857,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                   ( POS_OVERLAP_BEFORE == eCmpPos ) ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
                             ( !n ||
-                             *(*mpRedlineTbl)[ n-1 ]->End() != *pRStt ))
+                             *(*mpRedlineTable)[ n-1 ]->End() != *pRStt ))
                         {
                             pRedl->SetStart( *pStt, pRStt );
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl );
 
                             bMerged = true;
                             bDelete = true;
@@ -871,7 +871,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             // own insert-over-insert redlines:
                             // just scrap the inside ones
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -904,20 +904,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
                             pCpy->SetStart( *pEnd );
-                            mpRedlineTbl->Insert( pCpy );
+                            mpRedlineTable->Insert( pCpy );
                         }
                         pRedl->SetEnd( *pStt, pREnd );
                         if( ( *pStt == *pRStt ) &&
                             ( pRedl->GetContentIdx() == NULL ) )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( !pRedl->HasValidRange() )
                         {
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl );
                         }
                     }
                     else if ( POS_OUTSIDE == eCmpPos )
@@ -930,7 +930,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
                         pSplit->SetEnd( *pRStt );
                         pNewRedl->SetStart( *pREnd );
-                        mpRedlineTbl->Insert( pSplit );
+                        mpRedlineTable->Insert( pSplit );
                         if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
                         {
                             delete pNewRedl;
@@ -964,20 +964,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
                             pCpy->SetStart( *pEnd );
-                            mpRedlineTbl->Insert( pCpy );
+                            mpRedlineTable->Insert( pCpy );
                         }
                         pRedl->SetEnd( *pStt, pREnd );
                         if( ( *pStt == *pRStt ) &&
                             ( pRedl->GetContentIdx() == NULL ) )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( !pRedl->HasValidRange() )
                         {
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl, n );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl, n );
                         }
                     }
                     else if ( POS_OUTSIDE == eCmpPos )
@@ -990,7 +990,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
                         pSplit->SetEnd( *pRStt );
                         pNewRedl->SetStart( *pREnd );
-                        mpRedlineTbl->Insert( pSplit );
+                        mpRedlineTable->Insert( pSplit );
                         if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
                         {
                             delete pNewRedl;
@@ -1002,7 +1002,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     {
                         // handle identical redlines in broken documents
                         // delete old (delete) redline
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                     }
                     else if ( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1016,8 +1016,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OVERLAP_BEFORE:
                         pRedl->SetStart( *pEnd, pRStt );
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl, n );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl, n );
                         bDec = true;
                         break;
 
@@ -1025,7 +1025,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         pRedl->SetEnd( *pStt, pREnd );
                         if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1034,7 +1034,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OUTSIDE:
                         // Overlaps the current one completely or has the
                         // same dimension, delete the old one
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                         break;
 
@@ -1049,7 +1049,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNew->SetStart( *pEnd );
                                 pRedl->SetEnd( *pStt, pREnd );
                                 if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 AppendRedline( pNew, bCallDelete );
                                 n = 0;      // re-initialize
                                 bDec = true;
@@ -1108,7 +1108,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNewRedl->SetStart( *pRStt, pStt );
                             else
                                 pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1127,9 +1127,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 // Before we can merge, we make it visible!
                                 // We insert temporarily so that pNew is
                                 // also dealt with when moving the indices.
-                                mpRedlineTbl->Insert(pNewRedl);
-                                pRedl->Show(0, mpRedlineTbl->GetPos(pRedl));
-                                mpRedlineTbl->Remove( pNewRedl );
+                                mpRedlineTable->Insert(pNewRedl);
+                                pRedl->Show(0, mpRedlineTable->GetPos(pRedl));
+                                mpRedlineTable->Remove( pNewRedl );
                                 pRStt = pRedl->Start();
                                 pREnd = pRedl->End();
                             }
@@ -1159,7 +1159,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 bDec = true;
                             }
 
-                            mpRedlineTbl->DeleteAndDestroy( nToBeDeleted );
+                            mpRedlineTable->DeleteAndDestroy( nToBeDeleted );
                         }
                         break;
                     default:
@@ -1183,7 +1183,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                         case POS_EQUAL:
                             bCompress = true;
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                             // no break!
 
@@ -1203,7 +1203,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 {
                                     pEnd->nNode--;
                                     pEnd->nContent.Assign(
-                                        pEnd->nNode.GetNode().GetTxtNode(), 0);
+                                        pEnd->nNode.GetNode().GetTextNode(), 0);
                                     m_rDoc.getIDocumentContentOperations().DelFullPara( *pNewRedl );
                                 }
                                 else
@@ -1216,15 +1216,15 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
 
                         case POS_OUTSIDE:
                             {
-                                mpRedlineTbl->Remove( n );
+                                mpRedlineTable->Remove( n );
                                 bDec = true;
                                 // We insert temporarily so that pNew is
                                 // also dealt with when moving the indices.
                                 if( bCallDelete )
                                 {
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                 }
                                 delete pRedl;
@@ -1236,22 +1236,22 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 SwPaM aPam( *pRStt, *pEnd );
 
                                 if( *pEnd == *pREnd )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 else
                                 {
                                     pRedl->SetStart( *pEnd, pRStt );
                                     // re-insert
-                                    mpRedlineTbl->Remove( n );
-                                    mpRedlineTbl->Insert( pRedl, n );
+                                    mpRedlineTable->Remove( n );
+                                    mpRedlineTable->Insert( pRedl, n );
                                 }
 
                                 if( bCallDelete )
                                 {
                                     // We insert temporarily so that pNew is
                                     // also dealt with when moving the indices.
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                     n = 0;      // re-initialize
                                 }
@@ -1265,7 +1265,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
 
                                 if( *pStt == *pRStt )
                                 {
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                     bDec = true;
                                 }
                                 else
@@ -1275,9 +1275,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 {
                                     // We insert temporarily so that pNew is
                                     // also dealt with when moving the indices.
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                     n = 0;      // re-initialize
                                     bDec = true;
@@ -1306,7 +1306,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 delete pNewRedl, pNewRedl = 0;
                                 if( IsHideChanges( meRedlineMode ))
                                 {
-                                    pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
+                                    pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
                                 }
                                 bCompress = true;
                             }
@@ -1323,8 +1323,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                         pNewRedl->PushData( *pRedl, false );
                                         pRedl->SetStart( *pEnd, pRStt );
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl, n );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl, n );
                                         bDec = true;
                                     }
                                 }
@@ -1340,8 +1340,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     if( !pRedl->HasValidRange() )
                                     {
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl, n );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl, n );
                                     }
                                 }
                             }
@@ -1370,9 +1370,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetEnd( *pRStt, pEnd );
                                     if( IsHideChanges( meRedlineMode ))
                                     {
-                                        mpRedlineTbl->Insert(pNewRedl);
-                                        pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
-                                        mpRedlineTbl->Remove( pNewRedl );
+                                        mpRedlineTable->Insert(pNewRedl);
+                                        pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+                                        mpRedlineTable->Remove( pNewRedl );
                                     }
                                 }
                                 else
@@ -1383,8 +1383,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetEnd( *pRStt, pEnd );
                                     pRedl->SetStart( *pNew->End(), pRStt ) ;
                                     // re-insert
-                                    mpRedlineTbl->Remove( n );
-                                    mpRedlineTbl->Insert( pRedl );
+                                    mpRedlineTable->Remove( n );
+                                    mpRedlineTable->Insert( pRedl );
                                     bDec = true;
                                 }
                             }
@@ -1398,9 +1398,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetStart( *pREnd, pStt );
                                     if( IsHideChanges( meRedlineMode ))
                                     {
-                                        mpRedlineTbl->Insert( pNewRedl );
-                                        pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
-                                        mpRedlineTbl->Remove( pNewRedl );
+                                        mpRedlineTable->Insert( pNewRedl );
+                                        pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+                                        mpRedlineTable->Remove( pNewRedl );
                                     }
                                 }
                                 else
@@ -1413,8 +1413,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     if( !pRedl->HasValidRange() )
                                     {
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl );
                                     }
                                 }
                             }
@@ -1426,7 +1426,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         // insert the pNew part (if it exists)
                         if( pNew )
                         {
-                            mpRedlineTbl->Insert( pNew );
+                            mpRedlineTable->Insert( pNew );
 
                             // pNew must be deleted if Insert() wasn't
                             // successful. But that can't happen, since pNew is
@@ -1447,8 +1447,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OVERLAP_BEFORE:
                         pRedl->SetStart( *pEnd, pRStt );
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl, n );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl, n );
                         bDec = true;
                         break;
 
@@ -1460,7 +1460,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OUTSIDE:
                         // Overlaps the current one completely or has the
                         // same dimension, delete the old one
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                         break;
 
@@ -1476,7 +1476,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pRedl->SetEnd( *pStt, pREnd );
                                 if( ( *pStt == *pRStt ) &&
                                     ( pRedl->GetContentIdx() == NULL ) )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 AppendRedline( pNew, bCallDelete );
                                 n = 0;      // re-initialize
                                 bDec = true;
@@ -1544,7 +1544,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             // Overlaps the current one completely or has the
                             // same dimension, delete the old one
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1563,8 +1563,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                             // or else only shorten the current one
                             pRedl->SetStart( *pEnd, pRStt );
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl, n );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl, n );
                             bDec = true;
                         }
                         else
@@ -1591,7 +1591,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNewRedl->SetStart( *pRStt, pStt );
                             else
                                 pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = false;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1603,25 +1603,25 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_COLLIDE_END:
                         if( pRedl->IsOwnRedline( *pNewRedl ) &&
                             pRedl->CanCombine( *pNewRedl ) && n &&
-                            *(*mpRedlineTbl)[ n-1 ]->End() < *pStt )
+                            *(*mpRedlineTable)[ n-1 ]->End() < *pStt )
                         {
                             // If that's the case we can merge it, meaning
                             // the new one covers this well
                             pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
                     case POS_COLLIDE_START:
                         if( pRedl->IsOwnRedline( *pNewRedl ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
-                            n+1 < (sal_uInt16)mpRedlineTbl->size() &&
-                            *(*mpRedlineTbl)[ n+1 ]->Start() < *pEnd )
+                            n+1 < (sal_uInt16)mpRedlineTable->size() &&
+                            *(*mpRedlineTable)[ n+1 ]->Start() < *pEnd )
                         {
                             // If that's the case we can merge it, meaning
                             // the new one covers this well
                             pNewRedl->SetStart( *pRStt, pStt );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1652,7 +1652,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                 pNewRedl = 0;
             }
             else
-                mpRedlineTbl->Insert( pNewRedl );
+                mpRedlineTable->Insert( pNewRedl );
         }
 
         if( bCompress )
@@ -1695,7 +1695,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
 
         // Make equivalent of 'AppendRedline' checks inside here too
 
-        mpExtraRedlineTbl->Insert( pNewRedl );
+        mpExtraRedlineTable->Insert( pNewRedl );
     }
     else
     {
@@ -1740,7 +1740,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
 
         // Make equivalent of 'AppendRedline' checks inside here too
 
-        mpExtraRedlineTbl->Insert( pNewRedl );
+        mpExtraRedlineTable->Insert( pNewRedl );
     }
     else
     {
@@ -1782,10 +1782,10 @@ void DocumentRedlineManager::CompressRedlines()
     }
 
     // Try to merge identical ones
-    for( sal_uInt16 n = 1; n < mpRedlineTbl->size(); ++n )
+    for( sal_uInt16 n = 1; n < mpRedlineTable->size(); ++n )
     {
-        SwRangeRedline* pPrev = (*mpRedlineTbl)[ n-1 ],
-                    * pCur = (*mpRedlineTbl)[ n ];
+        SwRangeRedline* pPrev = (*mpRedlineTable)[ n-1 ],
+                    * pCur = (*mpRedlineTable)[ n ];
         const SwPosition* pPrevStt = pPrev->Start(),
                         * pPrevEnd = pPrevStt == pPrev->GetPoint()
                             ? pPrev->GetMark() : pPrev->GetPoint();
@@ -1803,7 +1803,7 @@ void DocumentRedlineManager::CompressRedlines()
             pCur->Show(0, n);
 
             pPrev->SetEnd( *pCur->End() );
-            mpRedlineTbl->DeleteAndDestroy( n );
+            mpRedlineTable->DeleteAndDestroy( n );
             --n;
             if( pFnc )
                 (pPrev->*pFnc)(0, nPrevIndex);
@@ -1811,7 +1811,7 @@ void DocumentRedlineManager::CompressRedlines()
     }
     _CHECK_REDLINE( *this )
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
@@ -1821,9 +1821,9 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
     const SwPosition* pStt = rRange.Start();
     const SwPosition* pEnd = rRange.End();
     GetRedline( *pStt, &n );
-    for ( ; n < mpRedlineTbl->size(); ++n)
+    for ( ; n < mpRedlineTable->size(); ++n)
     {
-        SwRangeRedline * pRedline = (*mpRedlineTbl)[ n ];
+        SwRangeRedline * pRedline = (*mpRedlineTable)[ n ];
         SwPosition *const pRedlineStart = pRedline->Start();
         SwPosition *const pRedlineEnd = pRedline->End();
         if (*pRedlineStart <= *pStt && *pStt <= *pRedlineEnd &&
@@ -1855,25 +1855,25 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
 
             case 3:
                 pRedline->InvalidateRange();
-                mpRedlineTbl->DeleteAndDestroy( n-- );
+                mpRedlineTable->DeleteAndDestroy( n-- );
                 pRedline = nullptr;
                 break;
             }
             if (pRedline && !pRedline->HasValidRange())
             {
                 // re-insert
-                mpRedlineTbl->Remove( n );
-                mpRedlineTbl->Insert( pRedline, n );
+                mpRedlineTable->Remove( n );
+                mpRedlineTable->Insert( pRedline, n );
             }
             if( pNew )
-                mpRedlineTbl->Insert( pNew, n );
+                mpRedlineTable->Insert( pNew, n );
         }
         else if (*pEnd < *pRedlineStart)
             break;
     }
     return bChg;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo,
@@ -1901,9 +1901,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                                                        : rRange.GetPoint();
     sal_uInt16 n = 0;
     GetRedline( *pStt, &n );
-    for( ; n < mpRedlineTbl->size() ; ++n )
+    for( ; n < mpRedlineTable->size() ; ++n )
     {
-        SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+        SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
         if( USHRT_MAX != nDelType && nDelType != pRedl->GetType() )
             continue;
 
@@ -1915,7 +1915,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
         case POS_EQUAL:
         case POS_OUTSIDE:
             pRedl->InvalidateRange();
-            mpRedlineTbl->DeleteAndDestroy( n-- );
+            mpRedlineTable->DeleteAndDestroy( n-- );
             bChg = true;
             break;
 
@@ -1923,8 +1923,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 pRedl->InvalidateRange();
                 pRedl->SetStart( *pEnd, pRStt );
                 // re-insert
-                mpRedlineTbl->Remove( n );
-                mpRedlineTbl->Insert( pRedl );
+                mpRedlineTable->Remove( n );
+                mpRedlineTable->Insert( pRedl );
                 --n;
             break;
 
@@ -1934,8 +1934,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 if( !pRedl->HasValidRange() )
                 {
                     // re-insert
-                    mpRedlineTbl->Remove( n );
-                    mpRedlineTbl->Insert( pRedl );
+                    mpRedlineTable->Remove( n );
+                    mpRedlineTable->Insert( pRedl );
                     --n;
                 }
             break;
@@ -1948,8 +1948,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 {
                     pRedl->SetStart( *pEnd, pRStt );
                     // re-insert
-                    mpRedlineTbl->Remove( n );
-                    mpRedlineTbl->Insert( pRedl );
+                    mpRedlineTable->Remove( n );
+                    mpRedlineTable->Insert( pRedl );
                     --n;
                 }
                 else
@@ -1966,19 +1966,19 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                     if( !pRedl->HasValidRange() )
                     {
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl );
                         --n;
                     }
                     if( pCpy )
-                        mpRedlineTbl->Insert( pCpy );
+                        mpRedlineTable->Insert( pCpy );
                 }
             }
             break;
 
         case POS_COLLIDE_END:
         case POS_BEFORE:
-            n = mpRedlineTbl->size();
+            n = mpRedlineTable->size();
             break;
         default:
             break;
@@ -1990,7 +1990,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
 
     return bChg;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSaveInUndo,
@@ -2003,9 +2003,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSave
 sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const
 {
     const sal_uLong nNdIdx = rNd.GetIndex();
-    for( sal_uInt16 n = 0; n < mpRedlineTbl->size() ; ++n )
+    for( sal_uInt16 n = 0; n < mpRedlineTable->size() ; ++n )
     {
-        const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+        const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
         sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
               nMk = pTmp->GetMark()->nNode.GetIndex();
         if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; }
@@ -2019,20 +2019,20 @@ sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16
     }
     return USHRT_MAX;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos,
                                     sal_uInt16* pFndPos ) const
 {
-    sal_uInt16 nO = mpRedlineTbl->size(), nM, nU = 0;
+    sal_uInt16 nO = mpRedlineTable->size(), nM, nU = 0;
     if( nO > 0 )
     {
         nO--;
         while( nU <= nO )
         {
             nM = nU + ( nO - nU ) / 2;
-            const SwRangeRedline* pRedl = (*mpRedlineTbl)[ nM ];
+            const SwRangeRedline* pRedl = (*mpRedlineTable)[ nM ];
             const SwPosition* pStt = pRedl->Start();
             const SwPosition* pEnd = pStt == pRedl->GetPoint()
                                         ? pRedl->GetMark()
@@ -2041,11 +2041,11 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
                     ? *pStt == rPos
                     : ( *pStt <= rPos && rPos < *pEnd ) )
             {
-                while( nM && rPos == *(*mpRedlineTbl)[ nM - 1 ]->End() &&
-                    rPos == *(*mpRedlineTbl)[ nM - 1 ]->Start() )
+                while( nM && rPos == *(*mpRedlineTable)[ nM - 1 ]->End() &&
+                    rPos == *(*mpRedlineTable)[ nM - 1 ]->Start() )
                 {
                     --nM;
-                    pRedl = (*mpRedlineTbl)[ nM ];
+                    pRedl = (*mpRedlineTable)[ nM ];
                 }
                 // if there are format and insert changes in the same position
                 // show insert change first.
@@ -2053,19 +2053,19 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
                 // before and after the current redline
                 if( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
                 {
-                    if( nM && rPos >= *(*mpRedlineTbl)[ nM - 1 ]->Start() &&
-                        rPos <= *(*mpRedlineTbl)[ nM - 1 ]->End() &&
-                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM - 1 ]->GetType() ) )
+                    if( nM && rPos >= *(*mpRedlineTable)[ nM - 1 ]->Start() &&
+                        rPos <= *(*mpRedlineTable)[ nM - 1 ]->End() &&
+                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM - 1 ]->GetType() ) )
                     {
                         --nM;
-                        pRedl = (*mpRedlineTbl)[ nM ];
+                        pRedl = (*mpRedlineTable)[ nM ];
                     }
-                    else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTbl)[ nM + 1 ]->Start() &&
-                        rPos <= *(*mpRedlineTbl)[ nM + 1 ]->End() &&
-                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM + 1 ]->GetType() ) )
+                    else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTable)[ nM + 1 ]->Start() &&
+                        rPos <= *(*mpRedlineTable)[ nM + 1 ]->End() &&
+                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM + 1 ]->GetType() ) )
                     {
                         ++nM;
-                        pRedl = (*mpRedlineTbl)[ nM ];
+                        pRedl = (*mpRedlineTable)[ nM ];
                     }
                 }
 
@@ -2089,7 +2089,7 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
         *pFndPos = nU;
     return 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2101,7 +2101,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
         (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
       SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
 
-    SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+    SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
     if( pTmp->HasMark() && pTmp->IsVisible() )
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2123,19 +2123,19 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            bRet |= lcl_AcceptRedline( *mpRedlineTbl, nPos, bCallDelete );
+            bRet |= lcl_AcceptRedline( *mpRedlineTable, nPos, bCallDelete );
 
             if( nSeqNo )
             {
                 if( USHRT_MAX == nPos )
                     nPos = 0;
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
-                                    : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+                                    ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+                                    : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
                 if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
                     USHRT_MAX != ( nFndPos =
-                        mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
-                    pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+                        mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+                    pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
                 else
                     nLoopCnt = 0;
             }
@@ -2157,7 +2157,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
     }
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2179,7 +2179,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoAcceptRedline( aPam ));
     }
 
-    int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTbl,
+    int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTable,
                                      bCallDelete, aPam );
     if( nRet > 0 )
     {
@@ -2203,7 +2203,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
     }
     return nRet != 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2215,7 +2215,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
         (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
       SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
 
-    SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+    SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
     if( pTmp->HasMark() && pTmp->IsVisible() )
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2237,19 +2237,19 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            bRet |= lcl_RejectRedline( *mpRedlineTbl, nPos, bCallDelete );
+            bRet |= lcl_RejectRedline( *mpRedlineTable, nPos, bCallDelete );
 
             if( nSeqNo )
             {
                 if( USHRT_MAX == nPos )
                     nPos = 0;
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
-                                    : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+                                    ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+                                    : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
                 if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
                     USHRT_MAX != ( nFndPos =
-                            mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
-                    pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+                            mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+                    pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
                 else
                     nLoopCnt = 0;
             }
@@ -2271,7 +2271,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
     }
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2293,7 +2293,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoRejectRedline(aPam) );
     }
 
-    int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTbl,
+    int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTable,
                                         bCallDelete, aPam );
     if( nRet > 0 )
     {
@@ -2318,7 +2318,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
 
     return nRet != 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) const
@@ -2333,14 +2333,14 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
     // If the starting position points to the last valid ContentNode,
     // we take the next Redline in any case.
     sal_uInt16 n = 0;
-    const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, true );
+    const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, true );
     if( pFnd )
     {
         const SwPosition* pEnd = pFnd->End();
-        if( !pEnd->nNode.GetNode().IsCntntNode() )
+        if( !pEnd->nNode.GetNode().IsContentNode() )
         {
             SwNodeIndex aTmp( pEnd->nNode );
-            SwCntntNode* pCNd = SwNodes::GoPrevSection( &aTmp );
+            SwContentNode* pCNd = SwNodes::GoPrevSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 pCNd->Len() == rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2352,9 +2352,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
     do {
         bRestart = false;
 
-        for( ; !pFnd && n < mpRedlineTbl->size(); ++n )
+        for( ; !pFnd && n < mpRedlineTable->size(); ++n )
         {
-            pFnd = (*mpRedlineTbl)[ n ];
+            pFnd = (*mpRedlineTable)[ n ];
             if( pFnd->HasMark() && pFnd->IsVisible() )
             {
                 *rPam.GetMark() = *pFnd->Start();
@@ -2370,9 +2370,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             // Merge all of the same type and author that are
             // consecutive into one Selection.
             const SwPosition* pPrevEnd = pFnd->End();
-            while( ++n < mpRedlineTbl->size() )
+            while( ++n < mpRedlineTable->size() )
             {
-                const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+                const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
                 if( pTmp->HasMark() && pTmp->IsVisible() )
                 {
                     const SwPosition *pRStt;
@@ -2394,9 +2394,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
         {
             const SwRangeRedline* pSaveFnd = pFnd;
 
-            SwCntntNode* pCNd;
+            SwContentNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
             {
                 if( *pIdx <= rPam.GetPoint()->nNode )
@@ -2408,7 +2408,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             if( pFnd )
             {
                 pIdx = &rPam.GetPoint()->nNode;
-                if( !pIdx->GetNode().IsCntntNode() &&
+                if( !pIdx->GetNode().IsContentNode() &&
                     0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
                 {
                     if( *pIdx >= rPam.GetMark()->nNode )
@@ -2420,7 +2420,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
 
             if( !pFnd || *rPam.GetMark() == *rPam.GetPoint() )
             {
-                if( n < mpRedlineTbl->size() )
+                if( n < mpRedlineTable->size() )
                 {
                     bRestart = true;
                     *rPam.GetPoint() = *pSaveFnd->End();
@@ -2437,7 +2437,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
 
     return pFnd;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) const
@@ -2452,14 +2452,14 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
     // If the starting position points to the last valid ContentNode,
     // we take the previous Redline in any case.
     sal_uInt16 n = 0;
-    const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, false );
+    const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, false );
     if( pFnd )
     {
         const SwPosition* pStt = pFnd->Start();
-        if( !pStt->nNode.GetNode().IsCntntNode() )
+        if( !pStt->nNode.GetNode().IsContentNode() )
         {
             SwNodeIndex aTmp( pStt->nNode );
-            SwCntntNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
+            SwContentNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 !rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2473,7 +2473,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
 
         while( !pFnd && 0 < n )
         {
-            pFnd = (*mpRedlineTbl)[ --n ];
+            pFnd = (*mpRedlineTable)[ --n ];
             if( pFnd->HasMark() && pFnd->IsVisible() )
             {
                 *rPam.GetMark() = *pFnd->End();
@@ -2490,7 +2490,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             const SwPosition* pNextStt = pFnd->Start();
             while( 0 < n )
             {
-                const SwRangeRedline* pTmp = (*mpRedlineTbl)[ --n ];
+                const SwRangeRedline* pTmp = (*mpRedlineTable)[ --n ];
                 if( pTmp->HasMark() && pTmp->IsVisible() )
                 {
                     const SwPosition *pREnd;
@@ -2515,9 +2515,9 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
         {
             const SwRangeRedline* pSaveFnd = pFnd;
 
-            SwCntntNode* pCNd;
+            SwContentNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
             {
                 if( *pIdx >= rPam.GetPoint()->nNode )
@@ -2529,7 +2529,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             if( pFnd )
             {
                 pIdx = &rPam.GetPoint()->nNode;
-                if( !pIdx->GetNode().IsCntntNode() &&
+                if( !pIdx->GetNode().IsContentNode() &&
                     0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
                 {
                     if( *pIdx <= rPam.GetMark()->nNode )
@@ -2558,7 +2558,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
 
     return pFnd;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 // Set comment at the Redline
@@ -2569,12 +2569,12 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
                     * pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark()
                                                      : rPaM.GetPoint();
     sal_uInt16 n = 0;
-    if( GetRedlineTbl().FindAtPosition( *pStt, n, true ) )
+    if( GetRedlineTable().FindAtPosition( *pStt, n, true ) )
     {
-        for( ; n < mpRedlineTbl->size(); ++n )
+        for( ; n < mpRedlineTable->size(); ++n )
         {
             bRet = true;
-            SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+            SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
             if( pStt != pEnd && *pTmp->Start() > *pEnd )
                 break;
 
@@ -2588,7 +2588,7 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
 
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 // Create a new author if necessary
@@ -2605,15 +2605,15 @@ sal_uInt16 DocumentRedlineManager::InsertRedlineAuthor( const OUString& rNew )
 
 void DocumentRedlineManager::UpdateRedlineAttr()
 {
-    const SwRedlineTbl& rTbl = GetRedlineTbl();
-    for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
+    const SwRedlineTable& rTable = GetRedlineTable();
+    for( sal_uInt16 n = 0; n < rTable.size(); ++n )
     {
-        SwRangeRedline* pRedl = rTbl[ n ];
+        SwRangeRedline* pRedl = rTable[ n ];
         if( pRedl->IsVisible() )
             pRedl->InvalidateRange();
     }
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const uno::Sequence <sal_Int8>& DocumentRedlineManager::GetRedlinePassword() const
@@ -2632,30 +2632,30 @@ void DocumentRedlineManager::SetRedlinePassword(
 /// AppendRedline. Is used by Autoformat.
 /// A null pointer resets the mode. The pointer is not copied, so it
 /// needs to stay valid!
-void DocumentRedlineManager::SetAutoFmtRedlineComment( const OUString* pTxt, sal_uInt16 nSeqNo )
+void DocumentRedlineManager::SetAutoFormatRedlineComment( const OUString* pText, sal_uInt16 nSeqNo )
 {
-    m_rDoc.SetAutoFmtRedline( 0 != pTxt );
-    if( pTxt )
+    m_rDoc.SetAutoFormatRedline( 0 != pText );
+    if( pText )
     {
-        if( !mpAutoFmtRedlnComment )
-            mpAutoFmtRedlnComment = new OUString( *pTxt );
+        if( !mpAutoFormatRedlnComment )
+            mpAutoFormatRedlnComment = new OUString( *pText );
         else
-            *mpAutoFmtRedlnComment = *pTxt;
+            *mpAutoFormatRedlnComment = *pText;
     }
     else
-        delete mpAutoFmtRedlnComment, mpAutoFmtRedlnComment = 0;
+        delete mpAutoFormatRedlnComment, mpAutoFormatRedlnComment = 0;
 
-    mnAutoFmtRedlnCommentNo = nSeqNo;
+    mnAutoFormatRedlnCommentNo = nSeqNo;
 }
 
 #define MAX_REDLINE_COUNT   250
 
 void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
 {
-    const SwRedlineTbl& rRedlineTbl = GetRedlineTbl();
+    const SwRedlineTable& rRedlineTable = GetRedlineTable();
     SwEditShell* pEditShell = m_rDoc.GetEditShell();
     vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : NULL;
-    if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT
+    if ( pParent && !mbReadlineChecked && rRedlineTable.size() > MAX_REDLINE_COUNT
         && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) )
     {
         ScopedVclPtrInstance< MessageDialog > aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
@@ -2672,9 +2672,9 @@ void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
 
 DocumentRedlineManager::~DocumentRedlineManager()
 {
-    delete mpRedlineTbl; mpRedlineTbl = 0;
-    delete mpExtraRedlineTbl; mpExtraRedlineTbl = 0;
-    delete mpAutoFmtRedlnComment; mpAutoFmtRedlnComment = 0;
+    delete mpRedlineTable; mpRedlineTable = 0;
+    delete mpExtraRedlineTable; mpExtraRedlineTable = 0;
+    delete mpAutoFormatRedlnComment; mpAutoFormatRedlnComment = 0;
 }
 
 }
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 83ba90f99e78..6970d1f8044e 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -39,7 +39,7 @@
 sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
     :m_rDoc(rDoc),
     mnLinkUpdMode( GLOBALSETTING ),
-    meFldUpdMode( AUTOUPD_GLOBALSETTING ),
+    meFieldUpdMode( AUTOUPD_GLOBALSETTING ),
     meChrCmprType( CHARCOMPRESS_NONE ),
     mn32DummyCompatibilityOptions1(0),
     mn32DummyCompatibilityOptions2(0),
@@ -210,9 +210,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
             {
                 mbOldNumbering = value;
 
-                const SwNumRuleTbl& rNmTbl = m_rDoc.GetNumRuleTbl();
-                for( SwNumRuleTbl::size_type n = 0; n < rNmTbl.size(); ++n )
-                    rNmTbl[n]->SetInvalidRule(true);
+                const SwNumRuleTable& rNmTable = m_rDoc.GetNumRuleTable();
+                for( SwNumRuleTable::size_type n = 0; n < rNmTable.size(); ++n )
+                    rNmTable[n]->SetInvalidRule(true);
 
                 m_rDoc.UpdateNumRule();
 
@@ -417,7 +417,7 @@ void sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLan
     {
         pTmpRoot->StartAllAction();
         std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
         pTmpRoot->EndAllAction();
     }
     m_rDoc.getIDocumentState().SetModified();
@@ -450,17 +450,17 @@ void sw::DocumentSettingManager::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
     mnLinkUpdMode = eMode;
 }
 
-SwFldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
+SwFieldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
 {
-    SwFldUpdateFlags eRet = meFldUpdMode;
+    SwFieldUpdateFlags eRet = meFieldUpdMode;
     if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet )
-        eRet = SW_MOD()->GetFldUpdateFlags(get(DocumentSettingId::HTML_MODE));
+        eRet = SW_MOD()->GetFieldUpdateFlags(get(DocumentSettingId::HTML_MODE));
     return eRet;
 }
 
-void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFldUpdateFlags eMode )
+void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFieldUpdateFlags eMode )
 {
-    meFldUpdMode = eMode;
+    meFieldUpdMode = eMode;
 }
 
 SwCharCompressType sw::DocumentSettingManager::getCharacterCompressionType() const
@@ -487,7 +487,7 @@ void sw::DocumentSettingManager::setCharacterCompressionType( /*[in]*/SwCharComp
         {
             pTmpRoot->StartAllAction();
             std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
             pTmpRoot->EndAllAction();
         }
         m_rDoc.getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx
index 1e55f30d8d0e..601525073574 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -31,7 +31,7 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) :
     m_rDoc( i_rSwdoc ),
     mbModified(false),
     mbLoaded(false),
-    mbUpdateExpFld(false),
+    mbUpdateExpField(false),
     mbNewDoc(false),
     mbPageNums(false),
     mbInCallModified(false)
@@ -89,9 +89,9 @@ bool DocumentStateManager::IsLoaded() const
     return mbLoaded;
 }
 
-bool DocumentStateManager::IsUpdateExpFld() const
+bool DocumentStateManager::IsUpdateExpField() const
 {
-    return mbUpdateExpFld;
+    return mbUpdateExpField;
 }
 
 bool DocumentStateManager::IsNewDoc() const
@@ -114,9 +114,9 @@ void DocumentStateManager::SetNewDoc(bool b)
     mbNewDoc = b;
 }
 
-void DocumentStateManager::SetUpdateExpFldStat(bool b)
+void DocumentStateManager::SetUpdateExpFieldStat(bool b)
 {
-    mbUpdateExpFld = b;
+    mbUpdateExpField = b;
 }
 
 void DocumentStateManager::SetLoaded(bool b)
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 5f231eca35fd..4fed190ea0e8 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -79,8 +79,8 @@ DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rDoc
 
 void DocumentStatisticsManager::DocInfoChgd( )
 {
-    m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )->UpdateFlds();
-    m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )->UpdateFlds();
+    m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )->UpdateFields();
+    m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD )->UpdateFields();
     m_rDoc.getIDocumentState().SetModified();
 }
 
@@ -140,14 +140,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
         case ND_TEXTNODE:
         {
             long const nOldChars(mpDocStat->nChar);
-            SwTxtNode *pTxt = static_cast< SwTxtNode * >( pNd );
-            if (pTxt->CountWords(*mpDocStat, 0, pTxt->GetTxt().getLength()))
+            SwTextNode *pText = static_cast< SwTextNode * >( pNd );
+            if (pText->CountWords(*mpDocStat, 0, pText->GetText().getLength()))
             {
                 nChars -= (mpDocStat->nChar - nOldChars);
             }
             break;
         }
-        case ND_TABLENODE:      ++mpDocStat->nTbl;   break;
+        case ND_TABLENODE:      ++mpDocStat->nTable;   break;
         case ND_GRFNODE:        ++mpDocStat->nGrf;   break;
         case ND_OLENODE:        ++mpDocStat->nOLE;   break;
         case ND_SECTIONNODE:    break;
@@ -156,14 +156,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
 
     // #i93174#: notes contain paragraphs that are not nodes
     {
-        SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD) );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pPostits );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld;  pFmtFld = aIter.Next() )
+        SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD) );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pPostits );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField;  pFormatField = aIter.Next() )
         {
-            if (pFmtFld->IsFldInDoc())
+            if (pFormatField->IsFieldInDoc())
             {
                 SwPostItField const * const pField(
-                    static_cast<SwPostItField const*>(pFmtFld->GetField()));
+                    static_cast<SwPostItField const*>(pFormatField->GetField()));
                 mpDocStat->nAllPara += pField->GetNumberOfParagraphs();
             }
         }
@@ -175,7 +175,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
     sal_Int32 n=0;
     aStat[n].Name = "TableCount";
-    aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
+    aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable;
     aStat[n].Name = "ImageCount";
     aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
     aStat[n].Name = "ObjectCount";
@@ -218,8 +218,8 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
     // optionally update stat. fields
     if (bFields)
     {
-        SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD);
-        pType->UpdateFlds();
+        SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DOCSTATFLD);
+        pType->UpdateFields();
     }
 
     return nChars < 0;
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index b9403e8e38b1..f652f56d1670 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -94,11 +94,11 @@ namespace
     {
         // Make sure that the printer settings are taken over to the standard
         // page style
-        const SwFrmFmt& rPgDscFmt = rDoc.GetPageDesc( 0 ).GetMaster();
-        const SvxLRSpaceItem& rLR = rPgDscFmt.GetLRSpace();
+        const SwFrameFormat& rPgDscFormat = rDoc.GetPageDesc( 0 ).GetMaster();
+        const SvxLRSpaceItem& rLR = rPgDscFormat.GetLRSpace();
         const long nLeft = rLR.GetLeft();
         const long nRight = rLR.GetRight();
-        const long nWidth = rPgDscFmt.GetFrmSize().GetWidth();
+        const long nWidth = rPgDscFormat.GetFrmSize().GetWidth();
         return nWidth - nLeft - nRight;
     }
 
@@ -154,7 +154,7 @@ namespace
         }
     }
 
-    static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
+    static void lcl_SetHeadline( SwDoc* pDoc, SwTextFormatColl* pColl,
                             SfxItemSet& rSet,
                             sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, bool bItalic )
     {
@@ -184,16 +184,16 @@ namespace
                 if( !bHTMLMode )
                 {
                     SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
-                    const SwNumFmt& rNFmt = pOutlineRule->Get( nLevel );
+                    const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
 
-                    if ( rNFmt.GetPositionAndSpaceMode() ==
+                    if ( rNFormat.GetPositionAndSpaceMode() ==
                                         SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
-                         ( rNFmt.GetAbsLSpace() || rNFmt.GetFirstLineOffset() ) )
+                         ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
                     {
-                        SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFmtAttr( RES_LR_SPACE )) );
-                        aLR.SetTxtFirstLineOfstValue( rNFmt.GetFirstLineOffset() );
-                        aLR.SetTxtLeft( rNFmt.GetAbsLSpace() );
-                        pColl->SetFmtAttr( aLR );
+                        SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
+                        aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
+                        aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
+                        pColl->SetFormatAttr( aLR );
                     }
 
                     // #i71764#
@@ -203,11 +203,11 @@ namespace
                     {
                         SwNumRuleItem aItem(pOutlineRule->GetName());
 
-                        pColl->SetFmtAttr(aItem);
+                        pColl->SetFormatAttr(aItem);
                     }
                 }
             }
-            pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(
+            pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
                                             RES_POOLCOLL_TEXT ));
         }
     }
@@ -217,7 +217,7 @@ namespace
     {
         SvxLRSpaceItem aLR( RES_LR_SPACE );
         sal_uInt16 nLeft = nFact ? GetMetricVal( CM_05 ) * nFact : 0;
-        aLR.SetTxtLeft( nLeft );
+        aLR.SetTextLeft( nLeft );
 
         rSet.Put( aLR );
         if( bHeader )
@@ -236,26 +236,26 @@ namespace
         }
     }
 
-    static void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
+    static void lcl_SetNumBul( SwDoc* pDoc, SwTextFormatColl* pColl,
                             SfxItemSet& rSet,
                             sal_uInt16 nNxt, SwTwips nEZ, SwTwips nLeft,
                             SwTwips nUpper, SwTwips nLower )
     {
 
         SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE );
-        aLR.SetTxtFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTxtLeft( sal_uInt16(nLeft) );
+        aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTextLeft( sal_uInt16(nLeft) );
         aUL.SetUpper( sal_uInt16(nUpper) ); aUL.SetLower( sal_uInt16(nLower) );
         rSet.Put( aLR );
         rSet.Put( aUL );
 
         if( pColl )
-            pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nNxt ));
+            pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nNxt ));
     }
 
     static void lcl_PutStdPageSizeIntoItemSet( SwDoc* pDoc, SfxItemSet& rSet )
     {
         SwPageDesc* pStdPgDsc = pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-        SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+        SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
         if( pStdPgDsc->GetLandscape() )
         {
             SwTwips nTmp = aFrmSz.GetHeight();
@@ -274,7 +274,7 @@ DocumentStylePoolManager::DocumentStylePoolManager( SwDoc& i_rSwdoc ) : m_rDoc(
 {
 }
 
-SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
+SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
 {
     OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -285,11 +285,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
             "Wrong  AutoFormat Id" );
 
-    SwTxtFmtColl* pNewColl;
+    SwTextFormatColl* pNewColl;
     sal_uInt16 nOutLvlBits = 0;
-    for( sal_uInt16 n = 0; n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+    for( sal_uInt16 n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
     {
-        if( nId == ( pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ] )->GetPoolFmtId() )
+        if( nId == ( pNewColl = (*m_rDoc.GetTextFormatColls())[ n ] )->GetPoolFormatId() )
         {
             return pNewColl;
         }
@@ -315,29 +315,29 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
     OSL_ENSURE( nResId, "Invalid Pool ID" );
     if( !nResId )
-        return GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+        return GetTextCollFromPool( RES_POOLCOLL_STANDARD );
 
     ResId aResId( nResId + nId, *pSwResMgr );
     OUString aNm( aResId );
 
     // A Set for all to-be-set Attributes
-    SwAttrSet aSet( m_rDoc.GetAttrPool(), aTxtFmtCollSetRange );
+    SwAttrSet aSet( m_rDoc.GetAttrPool(), aTextFormatCollSetRange );
     sal_uInt16 nParent = GetPoolParent( nId );
 
     {
 
 //FEATURE::CONDCOLL
         if(::IsConditionalByPoolId( nId ))
-            pNewColl = new SwConditionTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
-                                                ? m_rDoc.GetDfltTxtFmtColl()
-                                                : GetTxtCollFromPool( nParent ));
+            pNewColl = new SwConditionTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+                                                ? m_rDoc.GetDfltTextFormatColl()
+                                                : GetTextCollFromPool( nParent ));
         else
 //FEATURE::CONDCOLL
-            pNewColl = new SwTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
-                                            ? m_rDoc.GetDfltTxtFmtColl()
-                                            : GetTxtCollFromPool( nParent ));
-        pNewColl->SetPoolFmtId( nId );
-        m_rDoc.GetTxtFmtColls()->push_back( pNewColl );
+            pNewColl = new SwTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+                                            ? m_rDoc.GetDfltTextFormatColl()
+                                            : GetTextCollFromPool( nParent ));
+        pNewColl->SetPoolFormatId( nId );
+        m_rDoc.GetTextFormatColls()->push_back( pNewColl );
     }
 
     bool bNoDefault = m_rDoc.GetDocumentSettingManager().get( DocumentSettingId::STYLES_NODEFAULT );
@@ -379,15 +379,15 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TEXT_IDENT:           // Text body indentation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( GetMetricVal( CM_05 ));
+                aLR.SetTextFirstLineOfst( GetMetricVal( CM_05 ));
                 aSet.Put( aLR );
             }
             break;
         case RES_POOLCOLL_TEXT_NEGIDENT:        // Text body neg. indentation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( -(short)GetMetricVal( CM_05 ));
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ));
+                aLR.SetTextFirstLineOfst( -(short)GetMetricVal( CM_05 ));
+                aLR.SetTextLeft( GetMetricVal( CM_1 ));
                 SvxTabStopItem aTStops(RES_PARATR_TABSTOP);    aTStops.Insert( SvxTabStop( 0 ));
 
                 aSet.Put( aLR );
@@ -397,7 +397,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TEXT_MOVE:            // Text body move
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtLeft( GetMetricVal( CM_05 ));
+                aLR.SetTextLeft( GetMetricVal( CM_05 ));
                 aSet.Put( aLR );
             }
             break;
@@ -405,9 +405,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_CONFRONTATION:    // Text body confrontation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
+                aLR.SetTextFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
                                                   GetMetricVal( CM_05)) );
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 5 );
+                aLR.SetTextLeft( GetMetricVal( CM_1 ) * 5 );
                 SvxTabStopItem aTStops( RES_PARATR_TABSTOP );    aTStops.Insert( SvxTabStop( 0 ));
 
                 aSet.Put( aLR );
@@ -417,7 +417,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_MARGINAL:         // Text body marginal
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 4 );
+                aLR.SetTextLeft( GetMetricVal( CM_1 ) * 4 );
                 aSet.Put( aLR );
             }
             break;
@@ -466,9 +466,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                 SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE );
                 if( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
                     aUL.SetLower( HTML_PARSPACE );
-                aSet.Put( SvxFmtKeepItem( true, RES_KEEP ));
+                aSet.Put( SvxFormatKeepItem( true, RES_KEEP ));
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
 
                 aSet.Put( aUL );
                 SetAllScriptItem( aSet, aFntSize );
@@ -483,7 +483,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_SIGNATURE:            // Signatures
         case RES_POOLCOLL_TABLE:                // Tabele content
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -569,7 +569,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_FOOTERL:
         case RES_POOLCOLL_FOOTERR:
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
 
                 long nRightMargin = lcl_GetRightMargin( m_rDoc );
@@ -586,7 +586,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) );
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -595,11 +595,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_ENDNOTE:              // paragraph style Endnote
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
-                aLR.SetTxtLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
+                aLR.SetTextFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
+                aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
                 aSet.Put( aLR );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -610,7 +610,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                 aSet.Put( aUL );
                 SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL, RES_CHRATR_POSTURE ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -626,7 +626,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                 aSet.Put( aUL );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -640,7 +640,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                     SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                     aSet.Put( aUL );
                 }
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -649,7 +649,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_USERH:            // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -688,7 +688,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_IDXH:         // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -709,7 +709,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_CNTNTH:       // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -750,7 +750,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_AUTHORITIESH:
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -960,7 +960,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
             }
             break;
 
@@ -972,7 +972,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ));
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                     RES_POOLCOLL_TEXT ));
             }
             break;
@@ -1019,13 +1019,13 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 SvxULSpaceItem aUL( RES_UL_SPACE );
                 {
-                    pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                    pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                     RES_POOLCOLL_TEXT ));
                     aUL = pNewColl->GetULSpace();
                 }
                 aUL.SetLower( HTML_PARSPACE );
                 aSet.Put( aUL);
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -1043,7 +1043,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
                 {
-                    pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                    pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                         RES_POOLCOLL_HTML_DD ));
                     aLR = pNewColl->GetLRSpace();
                 }
@@ -1058,7 +1058,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
     if( aSet.Count() )
     {
         {
-            pNewColl->SetFmtAttr( aSet );
+            pNewColl->SetFormatAttr( aSet );
         }
     }
     return pNewColl;
@@ -1066,12 +1066,12 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
 /// Return the AutomaticFormat with the supplied Id. If it doesn't
 /// exist, create it.
-SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
+SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
 {
-    SwFmt *pNewFmt = 0;
-    SwFmt *pDeriveFmt = 0;
+    SwFormat *pNewFormat = 0;
+    SwFormat *pDeriveFormat = 0;
 
-    SwFmtsBase* pArray[ 2 ];
+    SwFormatsBase* pArray[ 2 ];
     sal_uInt16 nArrCnt = 1, nRCId = 0;
     sal_uInt16* pWhichRange = 0;
 
@@ -1079,14 +1079,14 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     {
     case POOLGRP_CHARFMT:
         {
-            pArray[0] = m_rDoc.GetCharFmts();
-            pDeriveFmt = m_rDoc.GetDfltCharFmt();
+            pArray[0] = m_rDoc.GetCharFormats();
+            pDeriveFormat = m_rDoc.GetDfltCharFormat();
 
             if( nId > RES_POOLCHR_NORMAL_END )
                 nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN;
             else
                 nRCId = RC_POOLCHRFMT_BEGIN - RES_POOLCHR_BEGIN;
-            pWhichRange =  aCharFmtSetRange;
+            pWhichRange =  aCharFormatSetRange;
 
             // Fault: unknown Format, but a CharFormat
             //             -> return the first one
@@ -1099,12 +1099,12 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
         break;
     case POOLGRP_FRAMEFMT:
         {
-            pArray[0] = m_rDoc.GetFrmFmts();
-            pArray[1] = m_rDoc.GetSpzFrmFmts();
-            pDeriveFmt = m_rDoc.GetDfltFrmFmt();
+            pArray[0] = m_rDoc.GetFrameFormats();
+            pArray[1] = m_rDoc.GetSpzFrameFormats();
+            pDeriveFormat = m_rDoc.GetDfltFrameFormat();
             nArrCnt = 2;
             nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN;
-            pWhichRange = aFrmFmtSetRange;
+            pWhichRange = aFrameFormatSetRange;
 
             // Fault: unknown Format, but a FrameFormat
             //             -> return the first one
@@ -1124,11 +1124,11 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     OSL_ENSURE( nRCId, "invalid Id" );
 
     while( nArrCnt-- )
-        for( size_t n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
-            if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
-                    GetPoolFmtId() )
+        for( size_t n = 0; n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+            if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+                    GetPoolFormatId() )
             {
-                return pNewFmt;
+                return pNewFormat;
             }
 
     ResId aResId( nRCId + nId, *pSwResMgr );
@@ -1143,10 +1143,10 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
             switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
             {
                 case POOLGRP_CHARFMT:
-                    pNewFmt = m_rDoc._MakeCharFmt(aNm, pDeriveFmt, false, true);
+                    pNewFormat = m_rDoc._MakeCharFormat(aNm, pDeriveFormat, false, true);
                     break;
                 case POOLGRP_FRAMEFMT:
-                    pNewFmt = m_rDoc._MakeFrmFmt(aNm, pDeriveFmt, false, true);
+                    pNewFormat = m_rDoc._MakeFrameFormat(aNm, pDeriveFormat, false, true);
                     break;
                 default:
                     break;
@@ -1155,8 +1155,8 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
 
         if( !bIsModified )
             m_rDoc.getIDocumentState().ResetModified();
-        pNewFmt->SetPoolFmtId( nId );
-        pNewFmt->SetAuto( false );      // no AutoFormat
+        pNewFormat->SetPoolFormatId( nId );
+        pNewFormat->SetAuto( false );      // no AutoFormat
     }
 
     switch( nId )
@@ -1258,16 +1258,16 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
         {
             if ( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
             {
-                aSet.Put( SwFmtAnchor( FLY_AS_CHAR ));
-                aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
-                aSet.Put( SwFmtSurround( SURROUND_NONE ) );
+                aSet.Put( SwFormatAnchor( FLY_AS_CHAR ));
+                aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatSurround( SURROUND_NONE ) );
             }
             else
             {
-                aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-                aSet.Put( SwFmtSurround( SURROUND_PARALLEL ) );
-                aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
-                aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+                aSet.Put( SwFormatSurround( SURROUND_PARALLEL ) );
+                aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
                 Color aCol( COL_BLACK );
                 SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
                 SvxBoxItem aBox( RES_BOX );
@@ -1288,44 +1288,44 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     case RES_POOLFRM_GRAPHIC:
     case RES_POOLFRM_OLE:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtSurround( SURROUND_IDEAL ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatSurround( SURROUND_IDEAL ));
         }
         break;
     case RES_POOLFRM_FORMEL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
+            aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
             aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
         }
         break;
     case RES_POOLFRM_MARGINAL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtSurround( SURROUND_PARALLEL ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatSurround( SURROUND_PARALLEL ));
             // Set the default width to 3.5 cm, use the minimum value for the height
-            aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE,
+            aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE,
                     GetMetricVal( CM_1 ) * 3 + GetMetricVal( CM_05 ),
                     MM50 ));
         }
         break;
     case RES_POOLFRM_WATERSIGN:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PAGE ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PAGE ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
             aSet.Put( SvxOpaqueItem( RES_OPAQUE, false ));
-            aSet.Put( SwFmtSurround( SURROUND_THROUGHT ));
+            aSet.Put( SwFormatSurround( SURROUND_THROUGHT ));
         }
         break;
     case RES_POOLFRM_LABEL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+            aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
             aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
 
             SvxProtectItem aProtect( RES_PROTECT );
@@ -1333,27 +1333,27 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
             aProtect.SetPosProtect( true );
             aSet.Put( aProtect );
 
-            pNewFmt->SetAutoUpdateFmt( true );
+            pNewFormat->SetAutoUpdateFormat( true );
         }
         break;
     }
     if( aSet.Count() )
     {
         {
-            pNewFmt->SetFmtAttr( aSet );
+            pNewFormat->SetFormatAttr( aSet );
         }
     }
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFrmFmt* DocumentStylePoolManager::GetFrmFmtFromPool( sal_uInt16 nId )
+SwFrameFormat* DocumentStylePoolManager::GetFrameFormatFromPool( sal_uInt16 nId )
 {
-    return static_cast<SwFrmFmt*>(GetFmtFromPool( nId ));
+    return static_cast<SwFrameFormat*>(GetFormatFromPool( nId ));
 }
 
-SwCharFmt* DocumentStylePoolManager::GetCharFmtFromPool( sal_uInt16 nId )
+SwCharFormat* DocumentStylePoolManager::GetCharFormatFromPool( sal_uInt16 nId )
 {
-    return static_cast<SwCharFmt*>(GetFmtFromPool( nId ));
+    return static_cast<SwCharFormat*>(GetFormatFromPool( nId ));
 }
 
 SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
@@ -1363,7 +1363,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
 
     for( size_t n = 0; n < m_rDoc.GetPageDescCnt(); ++n )
     {
-        if ( nId == m_rDoc.GetPageDesc(n).GetPoolFmtId() )
+        if ( nId == m_rDoc.GetPageDesc(n).GetPoolFormatId() )
         {
             return &m_rDoc.GetPageDesc(n);
         }
@@ -1387,7 +1387,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
             pNewPgDsc = m_rDoc.MakePageDesc(aNm, 0, bRegardLanguage);
         }
 
-        pNewPgDsc->SetPoolFmtId( nId );
+        pNewPgDsc->SetPoolFormatId( nId );
         if ( !bIsModified )
         {
             m_rDoc.getIDocumentState().ResetModified();
@@ -1405,7 +1405,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
         aUL.SetLower( (sal_uInt16)aLR.GetLeft() );
     }
 
-    SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrmFmtSetRange );
+    SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrameFormatSetRange );
     bool bSetLeft = true;
 
     switch( nId )
@@ -1457,7 +1457,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
         {
             Size aPSize( SvxPaperInfo::GetPaperSize( PAPER_ENV_C65 ) );
             LandscapeSwap( aPSize );
-            aSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
+            aSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
             aLR.SetLeft( 0 ); aLR.SetRight( 0 );
             aUL.SetUpper( 0 ); aUL.SetLower( 0 );
             aSet.Put( aLR );
@@ -1488,18 +1488,18 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
             aSet.Put( aLR );
             aSet.Put( aUL );
             pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
-            SwPageFtnInfo aInf( pNewPgDsc->GetFtnInfo() );
+            SwPageFootnoteInfo aInf( pNewPgDsc->GetFootnoteInfo() );
             aInf.SetLineWidth( 0 );
             aInf.SetTopDist( 0 );
             aInf.SetBottomDist( 0 );
-            pNewPgDsc->SetFtnInfo( aInf );
+            pNewPgDsc->SetFootnoteInfo( aInf );
         }
         break;
 
     case RES_POOLPAGE_LANDSCAPE:    // "Landscape"
         {
             SwPageDesc* pStdPgDsc = GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-            SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+            SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
             if ( !pStdPgDsc->GetLandscape() )
             {
                 const SwTwips nTmp = aFrmSz.GetHeight();
@@ -1520,11 +1520,11 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
     {
         if( bSetLeft )
         {
-            pNewPgDsc->GetLeft().SetFmtAttr( aSet );
-            pNewPgDsc->GetFirstLeft().SetFmtAttr( aSet );
+            pNewPgDsc->GetLeft().SetFormatAttr( aSet );
+            pNewPgDsc->GetFirstLeft().SetFormatAttr( aSet );
         }
-        pNewPgDsc->GetMaster().SetFmtAttr( aSet );
-        pNewPgDsc->GetFirstMaster().SetFmtAttr( aSet );
+        pNewPgDsc->GetMaster().SetFormatAttr( aSet );
+        pNewPgDsc->GetFirstMaster().SetFormatAttr( aSet );
     }
     return pNewPgDsc;
 }
@@ -1536,9 +1536,9 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
     SwNumRule* pNewRule;
 
-    for (size_t n = 0; n < m_rDoc.GetNumRuleTbl().size(); ++n )
+    for (size_t n = 0; n < m_rDoc.GetNumRuleTable().size(); ++n )
     {
-        if (nId == ( pNewRule = m_rDoc.GetNumRuleTbl()[ n ] )->GetPoolFmtId())
+        if (nId == ( pNewRule = m_rDoc.GetNumRuleTable()[ n ] )->GetPoolFormatId())
         {
             return pNewRule;
         }
@@ -1554,7 +1554,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
     ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
     OUString aNm( aResId );
 
-    SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
+    SwCharFormat *pNumCFormat = 0, *pBullCFormat = 0;
 
     const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
                                   = numfunc::GetDefaultPositionAndSpaceMode(); //#i89178#
@@ -1563,16 +1563,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
         sal_uInt16 n = m_rDoc.MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode );
 
-        pNewRule = m_rDoc.GetNumRuleTbl()[ n ];
-        pNewRule->SetPoolFmtId( nId );
+        pNewRule = m_rDoc.GetNumRuleTable()[ n ];
+        pNewRule->SetPoolFormatId( nId );
         pNewRule->SetAutoRule( false );
 
         if( RES_POOLNUMRULE_NUM1 <= nId && nId <= RES_POOLNUMRULE_NUM5 )
-            pNumCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+            pNumCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
 
         if( ( RES_POOLNUMRULE_BUL1 <= nId && nId <= RES_POOLNUMRULE_BUL5 ) ||
             RES_POOLNUMRULE_NUM5 == nId )
-            pBullCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+            pBullCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
 
         if( !bIsModified )
             m_rDoc.getIDocumentState().ResetModified();
@@ -1582,13 +1582,13 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
     {
     case RES_POOLNUMRULE_NUM1:
         {
-            SwNumFmt aFmt;
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            SwNumFormat aFormat;
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1599,27 +1599,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -1634,16 +1634,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
                 };
 
             const sal_uInt16* pArr = aAbsSpace;
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
             }
 
             sal_uInt16 nSpace = 0;
@@ -1651,69 +1651,69 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
-                    aFmt.SetFirstLineOffset( - pArr[ n ] );
+                    aFormat.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
+                    aFormat.SetFirstLineOffset( - pArr[ n ] );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( nSpace = nSpace + pArr[ n ] );
-                    aFmt.SetIndentAt( nSpace );
-                    aFmt.SetFirstLineIndent( - pArr[ n ] );
+                    aFormat.SetListtabPos( nSpace = nSpace + pArr[ n ] );
+                    aFormat.SetIndentAt( nSpace );
+                    aFormat.SetFirstLineIndent( - pArr[ n ] );
                 }
 
-                aFmt.SetStart( n+1 );
-                pNewRule->Set( n, aFmt );
+                aFormat.SetStart( n+1 );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_NUM3:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
 
             sal_uInt16 nOffs = GetMetricVal( CM_1 ) * 3;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( (n+1) * nOffs );
+                    aFormat.SetAbsLSpace( (n+1) * nOffs );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = (n+1) * static_cast<long>(nOffs);
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                aFmt.SetStart( n+1 );
-                pNewRule->Set( n, aFmt );
+                aFormat.SetStart( n+1 );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_NUM4:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ROMAN_UPPER);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1724,29 +1724,29 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
-                aFmt.SetStart( n + 1 );
+                aFormat.SetStart( n + 1 );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -1761,118 +1761,118 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
                 };
 
             const sal_uInt16* pArr0to2 = aAbsSpace0to2;
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
             }
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( -pArr0to2[0] );    // == 0.40 cm
-                aFmt.SetAbsLSpace( pArr0to2[1] );           // == 0.40 cm
+                aFormat.SetFirstLineOffset( -pArr0to2[0] );    // == 0.40 cm
+                aFormat.SetAbsLSpace( pArr0to2[1] );           // == 0.40 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[0] );
-                aFmt.SetListtabPos( pArr0to2[1] );
-                aFmt.SetIndentAt( pArr0to2[1] );
+                aFormat.SetFirstLineIndent( -pArr0to2[0] );
+                aFormat.SetListtabPos( pArr0to2[1] );
+                aFormat.SetIndentAt( pArr0to2[1] );
             }
 
-            aFmt.SetCharFmt( pNumCFmt );
-            pNewRule->Set( 0, aFmt );
+            aFormat.SetCharFormat( pNumCFormat );
+            pNewRule->Set( 0, aFormat );
 
-            aFmt.SetIncludeUpperLevels( 2 );
-            aFmt.SetStart( 2 );
+            aFormat.SetIncludeUpperLevels( 2 );
+            aFormat.SetStart( 2 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( -pArr0to2[2] );    // == 0.65 cm
-                aFmt.SetAbsLSpace( pArr0to2[3] );           // == 1.10 cm
+                aFormat.SetFirstLineOffset( -pArr0to2[2] );    // == 0.65 cm
+                aFormat.SetAbsLSpace( pArr0to2[3] );           // == 1.10 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[2] );
-                aFmt.SetListtabPos( pArr0to2[3] );
-                aFmt.SetIndentAt( pArr0to2[3] );
+                aFormat.SetFirstLineIndent( -pArr0to2[2] );
+                aFormat.SetListtabPos( pArr0to2[3] );
+                aFormat.SetIndentAt( pArr0to2[3] );
             }
 
-            pNewRule->Set( 1, aFmt );
+            pNewRule->Set( 1, aFormat );
 
-            aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
-            aFmt.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetStart( 3 );
+            aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
+            aFormat.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetStart( 3 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - pArr0to2[4] );   // == 0.45cm
-                aFmt.SetAbsLSpace( pArr0to2[5] );           // == 1.55 cm
+                aFormat.SetFirstLineOffset( - pArr0to2[4] );   // == 0.45cm
+                aFormat.SetAbsLSpace( pArr0to2[5] );           // == 1.55 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[4] );
-                aFmt.SetListtabPos( pArr0to2[5] );
-                aFmt.SetIndentAt( pArr0to2[5] );
+                aFormat.SetFirstLineIndent( -pArr0to2[4] );
+                aFormat.SetListtabPos( pArr0to2[5] );
+                aFormat.SetIndentAt( pArr0to2[5] );
             }
 
-            pNewRule->Set( 2, aFmt );
+            pNewRule->Set( 2, aFormat );
 
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( cBulletChar );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( cBulletChar );
             sal_Int16 nOffs = GetMetricVal( CM_01 ) * 4,
                    nOffs2 = GetMetricVal( CM_1 ) * 2;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
-            aFmt.SetSuffix( OUString() );
+            aFormat.SetSuffix( OUString() );
             for (sal_uInt16 n = 3; n < MAXLEVEL; ++n)
             {
-                aFmt.SetStart( n+1 );
+                aFormat.SetStart( n+1 );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
+                    aFormat.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = nOffs2 + ((n-3) * static_cast<long>(nOffs));
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
 
     case RES_POOLNUMRULE_BUL1:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( cBulletChar );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( cBulletChar );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1883,41 +1883,41 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL2:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( 0x2013 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( 0x2013 );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1928,83 +1928,83 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL3:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
 
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
 
             sal_uInt16 nOffs = GetMetricVal( CM_01 ) * 4;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
             {
-                aFmt.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
+                aFormat.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( ((n & 1) +1) * nOffs );
+                    aFormat.SetAbsLSpace( ((n & 1) +1) * nOffs );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = ((n & 1) +1) * static_cast<long>(nOffs);
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL4:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -2016,48 +2016,48 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 switch( n )
                 {
-                case 0:     aFmt.SetBulletChar( 0x27a2 );   break;
-                case 1:     aFmt.SetBulletChar( 0xE006 );   break;
-                default:    aFmt.SetBulletChar( 0xE004 );   break;
+                case 0:     aFormat.SetBulletChar( 0x27a2 );   break;
+                case 1:     aFormat.SetBulletChar( 0xE006 );   break;
+                default:    aFormat.SetBulletChar( 0xE004 );   break;
                 }
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL5:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletChar( 0x2717 );
-            aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletChar( 0x2717 );
+            aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -2068,27 +2068,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -2098,7 +2098,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 }
 
 /// Check if this AutoCollection is already/still in use in this Document
-bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolTextCollUsed( sal_uInt16 nId ) const
 {
     OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -2109,38 +2109,38 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
         (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
             "Wrong AutoFormat Id" );
 
-    SwTxtFmtColl* pNewColl = 0;
+    SwTextFormatColl* pNewColl = 0;
     bool bFnd = false;
-    for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+    for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTextFormatColls()->size(); ++n )
     {
-        pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ];
-        if( nId == pNewColl->GetPoolFmtId() )
+        pNewColl = (*m_rDoc.GetTextFormatColls())[ n ];
+        if( nId == pNewColl->GetPoolFormatId() )
             bFnd = true;
     }
 
     if( !bFnd || !pNewColl->HasWriterListeners() )
         return false;
 
-    SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
     return !pNewColl->GetInfo( aGetHt );
 }
 
 /// Check if this AutoCollection is already/still in use
-bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolFormatUsed( sal_uInt16 nId ) const
 {
-    const SwFmt *pNewFmt = 0;
-    const SwFmtsBase* pArray[ 2 ];
+    const SwFormat *pNewFormat = 0;
+    const SwFormatsBase* pArray[ 2 ];
     sal_uInt16 nArrCnt = 1;
     bool bFnd = true;
 
     if (RES_POOLCHR_BEGIN <= nId && nId < RES_POOLCHR_END)
     {
-        pArray[0] = m_rDoc.GetCharFmts();
+        pArray[0] = m_rDoc.GetCharFormats();
     }
     else if (RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END)
     {
-        pArray[0] = m_rDoc.GetFrmFmts();
-        pArray[1] = m_rDoc.GetSpzFrmFmts();
+        pArray[0] = m_rDoc.GetFrameFormats();
+        pArray[1] = m_rDoc.GetSpzFrameFormats();
         nArrCnt = 2;
     }
     else
@@ -2155,19 +2155,19 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
     {
         bFnd = false;
         while( nArrCnt-- && !bFnd )
-            for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
-                if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
-                        GetPoolFmtId() )
+            for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+                if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+                        GetPoolFormatId() )
                     bFnd = true;
     }
 
     // Not found or no dependencies?
-    if( bFnd && pNewFmt->HasWriterListeners() )
+    if( bFnd && pNewFormat->HasWriterListeners() )
     {
         // Check if we have dependent ContentNodes in the Nodes array
         // (also indirect ones for derived Formats)
-        SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
-        bFnd = !pNewFmt->GetInfo( aGetHt );
+        SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
+        bFnd = !pNewFormat->GetInfo( aGetHt );
     }
     else
         bFnd = false;
@@ -2185,7 +2185,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
     for( size_t n = 0; !bFnd && n < m_rDoc.GetPageDescCnt(); ++n )
     {
         pNewPgDsc = &m_rDoc.GetPageDesc(n);
-        if( nId == pNewPgDsc->GetPoolFmtId() )
+        if( nId == pNewPgDsc->GetPoolFormatId() )
             bFnd = true;
     }
 
@@ -2195,7 +2195,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
 
     // Check if we have dependent ContentNodes in the Nodes array
     // (also indirect ones for derived Formats)
-    SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
     return !pNewPgDsc->GetInfo( aGetHt );
 }
 
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx
index 210eb3689424..8ac66584af7d 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -124,23 +124,23 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
             }
         }
 
-        SwFldUpdateFlags nFldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
-        if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag
-                    || AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) &&
-                m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsFieldsDirty()
+        SwFieldUpdateFlags nFieldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
+        if( ( AUTOUPD_FIELD_ONLY == nFieldUpdFlag
+                    || AUTOUPD_FIELD_AND_CHARTS == nFieldUpdFlag ) &&
+                m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsFieldsDirty()
                 // If we switch the field name the Fields are not updated.
                 // So the "background update" should always be carried out
-                /* && !pStartSh->GetViewOptions()->IsFldName()*/ )
+                /* && !pStartSh->GetViewOptions()->IsFieldName()*/ )
         {
-            if ( m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsInUpdateFlds() ||
-                 m_rDoc.getIDocumentFieldsAccess().IsExpFldsLocked() )
+            if ( m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsInUpdateFields() ||
+                 m_rDoc.getIDocumentFieldsAccess().IsExpFieldsLocked() )
             {
                 pIdle->Start();
                 return;
             }
 
             //  Action brackets!
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( true );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( true );
 
             pTmpRoot->StartAllAction();
 
@@ -148,17 +148,17 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
             const bool bOldLockView = pShell->IsViewLocked();
             pShell->LockView( true );
 
-            m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 );    // ChapterField
-            m_rDoc.getIDocumentFieldsAccess().UpdateExpFlds( 0, false );      // Updates ExpressionFields
-            m_rDoc.getIDocumentFieldsAccess().UpdateTblFlds(NULL);                // Tables
-            m_rDoc.getIDocumentFieldsAccess().UpdateRefFlds(NULL);                // References
+            m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 );    // ChapterField
+            m_rDoc.getIDocumentFieldsAccess().UpdateExpFields( 0, false );      // Updates ExpressionFields
+            m_rDoc.getIDocumentFieldsAccess().UpdateTableFields(NULL);                // Tables
+            m_rDoc.getIDocumentFieldsAccess().UpdateRefFields(NULL);                // References
 
             pTmpRoot->EndAllAction();
 
             pShell->LockView( bOldLockView );
 
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( false );
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty( false );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( false );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetFieldsDirty( false );
         }
     }
 #ifdef TIMELOG
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index dab5cf8a00c7..43db6abb9dc7 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -37,9 +37,9 @@ extern ResMgr* pSwResMgr;
                 *SwStyleNameMapper::pRegisterUINameArray = 0,
                 *SwStyleNameMapper::pDocUINameArray = 0,
                 *SwStyleNameMapper::pHTMLUINameArray = 0,
-                *SwStyleNameMapper::pFrmFmtUINameArray = 0,
-                *SwStyleNameMapper::pChrFmtUINameArray = 0,
-                *SwStyleNameMapper::pHTMLChrFmtUINameArray = 0,
+                *SwStyleNameMapper::pFrameFormatUINameArray = 0,
+                *SwStyleNameMapper::pChrFormatUINameArray = 0,
+                *SwStyleNameMapper::pHTMLChrFormatUINameArray = 0,
                 *SwStyleNameMapper::pPageDescUINameArray = 0,
                 *SwStyleNameMapper::pNumRuleUINameArray = 0,
 
@@ -50,9 +50,9 @@ extern ResMgr* pSwResMgr;
                 *SwStyleNameMapper::pRegisterProgNameArray = 0,
                 *SwStyleNameMapper::pDocProgNameArray = 0,
                 *SwStyleNameMapper::pHTMLProgNameArray = 0,
-                *SwStyleNameMapper::pFrmFmtProgNameArray = 0,
-                *SwStyleNameMapper::pChrFmtProgNameArray = 0,
-                *SwStyleNameMapper::pHTMLChrFmtProgNameArray = 0,
+                *SwStyleNameMapper::pFrameFormatProgNameArray = 0,
+                *SwStyleNameMapper::pChrFormatProgNameArray = 0,
+                *SwStyleNameMapper::pHTMLChrFormatProgNameArray = 0,
                 *SwStyleNameMapper::pPageDescProgNameArray = 0,
                 *SwStyleNameMapper::pNumRuleProgNameArray = 0;
 
@@ -233,7 +233,7 @@ const struct SwTableEntry HTMLProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry FrmFmtProgNameTable [] =
+const struct SwTableEntry FrameFormatProgNameTable [] =
 {
     ENTRY( "Frame" ), // RES_POOLFRM_FRAME
     ENTRY( "Graphics" ),
@@ -245,7 +245,7 @@ const struct SwTableEntry FrmFmtProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry ChrFmtProgNameTable [] =
+const struct SwTableEntry ChrFormatProgNameTable [] =
 {
     ENTRY( "Footnote Symbol" ), // RES_POOLCHR_FOOTNOTE
     ENTRY( "Page Number" ),
@@ -267,7 +267,7 @@ const struct SwTableEntry ChrFmtProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry HTMLChrFmtProgNameTable [] =
+const struct SwTableEntry HTMLChrFormatProgNameTable [] =
 {
     ENTRY( "Emphasis" ), // RES_POOLCHR_HTML_EMPHASIS
     ENTRY( "Citation" ),
@@ -447,14 +447,14 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         case nsSwGetPoolIdFromName::GET_POOLID_CHRFMT:
         {
             pHashPointer = bProgName ? &pCharProgMap : &pCharUIMap;
-            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFmtProgNameArray : &GetChrFmtUINameArray) );
-            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFmtProgNameArray : &GetHTMLChrFmtUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFormatProgNameArray : &GetChrFormatUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFormatProgNameArray : &GetHTMLChrFormatUINameArray) );
         }
         break;
         case nsSwGetPoolIdFromName::GET_POOLID_FRMFMT:
         {
             pHashPointer = bProgName ? &pFrameProgMap : &pFrameUIMap;
-            vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrmFmtProgNameArray : &GetFrmFmtUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrameFormatProgNameArray : &GetFrameFormatUINameArray) );
         }
         break;
         case nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC:
@@ -637,19 +637,19 @@ const OUString& SwStyleNameMapper::getNameFromId(
     case POOLGRP_CHARFMT:
         if( RES_POOLCHR_NORMAL_BEGIN <= nId && nId < RES_POOLCHR_NORMAL_END )
         {
-            pStrArr = bProgName ? &GetChrFmtProgNameArray() : &GetChrFmtUINameArray();
+            pStrArr = bProgName ? &GetChrFormatProgNameArray() : &GetChrFormatUINameArray();
             nStt = RES_POOLCHR_NORMAL_BEGIN;
         }
         else if( RES_POOLCHR_HTML_BEGIN <= nId && nId < RES_POOLCHR_HTML_END )
         {
-            pStrArr = bProgName ? &GetHTMLChrFmtProgNameArray() : &GetHTMLChrFmtUINameArray();
+            pStrArr = bProgName ? &GetHTMLChrFormatProgNameArray() : &GetHTMLChrFormatUINameArray();
             nStt = RES_POOLCHR_HTML_BEGIN;
         }
         break;
     case POOLGRP_FRAMEFMT:
         if( RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END )
         {
-            pStrArr = bProgName ? &GetFrmFmtProgNameArray() : &GetFrmFmtUINameArray();
+            pStrArr = bProgName ? &GetFrameFormatProgNameArray() : &GetFrameFormatUINameArray();
             nStt = RES_POOLFRM_BEGIN;
         }
         break;
@@ -769,28 +769,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
     return *pHTMLUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
 {
-    if (!pFrmFmtUINameArray)
-        pFrmFmtUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
+    if (!pFrameFormatUINameArray)
+        pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
             RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
-    return *pFrmFmtUINameArray;
+    return *pFrameFormatUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
 {
-    if (!pChrFmtUINameArray)
-        pChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
+    if (!pChrFormatUINameArray)
+        pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
             RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
-    return *pChrFmtUINameArray;
+    return *pChrFormatUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
 {
-    if (!pHTMLChrFmtUINameArray)
-        pHTMLChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
+    if (!pHTMLChrFormatUINameArray)
+        pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
             RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
-    return *pHTMLChrFmtUINameArray;
+    return *pHTMLChrFormatUINameArray;
 }
 
 const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
@@ -857,28 +857,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray()
     return *pHTMLProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray()
 {
-    if (!pFrmFmtProgNameArray)
-        pFrmFmtProgNameArray = lcl_NewProgNameArray( FrmFmtProgNameTable,
-            sizeof ( FrmFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pFrmFmtProgNameArray;
+    if (!pFrameFormatProgNameArray)
+        pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable,
+            sizeof ( FrameFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pFrameFormatProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray()
 {
-    if (!pChrFmtProgNameArray)
-        pChrFmtProgNameArray = lcl_NewProgNameArray( ChrFmtProgNameTable,
-            sizeof ( ChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pChrFmtProgNameArray;
+    if (!pChrFormatProgNameArray)
+        pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable,
+            sizeof ( ChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pChrFormatProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray()
 {
-    if (!pHTMLChrFmtProgNameArray)
-        pHTMLChrFmtProgNameArray = lcl_NewProgNameArray( HTMLChrFmtProgNameTable,
-            sizeof ( HTMLChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pHTMLChrFmtProgNameArray;
+    if (!pHTMLChrFormatProgNameArray)
+        pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable,
+            sizeof ( HTMLChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pHTMLChrFormatProgNameArray;
 }
 
 const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray()
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 05e2b821a5f9..50afa2e7ad1a 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -297,7 +297,7 @@ const char * dbg_out(const SfxItemSet & rSet)
     return dbg_out(lcl_dbg_out(rSet));
 }
 
-static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
+static const OUString lcl_dbg_out(const SwTextAttr & rAttr)
 {
     OUString aStr("[ ");
 
@@ -312,7 +312,7 @@ static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
     return aStr;
 }
 
-const char * dbg_out(const SwTxtAttr & rAttr)
+const char * dbg_out(const SwTextAttr & rAttr)
 {
     return dbg_out(lcl_dbg_out(rAttr));
 }
@@ -413,31 +413,31 @@ const char * dbg_out(const SwRect & rRect)
     return dbg_out(lcl_dbg_out(rRect));
 }
 
-static OUString lcl_dbg_out(const SwFrmFmt & rFrmFmt)
+static OUString lcl_dbg_out(const SwFrameFormat & rFrameFormat)
 {
     OUString aResult("[ ");
 
     char sBuffer[256];
-    sprintf(sBuffer, "%p", &rFrmFmt);
+    sprintf(sBuffer, "%p", &rFrameFormat);
 
     aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
     aResult += "(";
-    aResult += rFrmFmt.GetName();
+    aResult += rFrameFormat.GetName();
     aResult += ")";
 
-    if (rFrmFmt.IsAuto())
+    if (rFrameFormat.IsAuto())
         aResult += "*";
 
     aResult += " ,";
-    aResult += lcl_dbg_out(rFrmFmt.FindLayoutRect());
+    aResult += lcl_dbg_out(rFrameFormat.FindLayoutRect());
     aResult += " ]";
 
     return aResult;
 }
 
-const char * dbg_out(const SwFrmFmt & rFrmFmt)
+const char * dbg_out(const SwFrameFormat & rFrameFormat)
 {
-    return dbg_out(lcl_dbg_out(rFrmFmt));
+    return dbg_out(lcl_dbg_out(rFrameFormat));
 }
 
 static const OUString lcl_AnchoredFrames(const SwNode & rNode)
@@ -447,16 +447,16 @@ static const OUString lcl_AnchoredFrames(const SwNode & rNode)
     const SwDoc * pDoc = rNode.GetDoc();
     if (pDoc)
     {
-        const SwFrmFmts * pFrmFmts = pDoc->GetSpzFrmFmts();
+        const SwFrameFormats * pFrameFormats = pDoc->GetSpzFrameFormats();
 
-        if (pFrmFmts)
+        if (pFrameFormats)
         {
             bool bFirst = true;
-            for (SwFrmFmts::const_iterator i(pFrmFmts->begin());
-                 i != pFrmFmts->end(); ++i)
+            for (SwFrameFormats::const_iterator i(pFrameFormats->begin());
+                 i != pFrameFormats->end(); ++i)
             {
-                const SwFmtAnchor & rAnchor = (*i)->GetAnchor();
-                const SwPosition * pPos = rAnchor.GetCntntAnchor();
+                const SwFormatAnchor & rAnchor = (*i)->GetAnchor();
+                const SwPosition * pPos = rAnchor.GetContentAnchor();
 
                 if (pPos && &pPos->nNode.GetNode() == &rNode)
                 {
@@ -542,31 +542,31 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
     aTmpStr += "\">";
 
-    const SwTxtNode * pTxtNode = rNode.GetTxtNode();
+    const SwTextNode * pTextNode = rNode.GetTextNode();
 
-    if (rNode.IsTxtNode())
+    if (rNode.IsTextNode())
     {
-        const SfxItemSet * pAttrSet = pTxtNode->GetpSwAttrSet();
+        const SfxItemSet * pAttrSet = pTextNode->GetpSwAttrSet();
 
         aTmpStr += "<txt>";
-        aTmpStr += pTxtNode->GetTxt().getLength() > 10 ? pTxtNode->GetTxt().copy(0, 10) : pTxtNode->GetTxt();
+        aTmpStr += pTextNode->GetText().getLength() > 10 ? pTextNode->GetText().copy(0, 10) : pTextNode->GetText();
         aTmpStr += "</txt>";
 
         if (rNode.IsTableNode())
             aTmpStr += "<tbl/>";
 
         aTmpStr += "<outlinelevel>";
-        aTmpStr += OUString::number(pTxtNode->GetAttrOutlineLevel()-1);
+        aTmpStr += OUString::number(pTextNode->GetAttrOutlineLevel()-1);
         aTmpStr += "</outlinelevel>";
 
-        const SwNumRule * pNumRule = pTxtNode->GetNumRule();
+        const SwNumRule * pNumRule = pTextNode->GetNumRule();
 
         if (pNumRule != NULL)
         {
             aTmpStr += "<number>";
-            if ( pTxtNode->GetNum() )
+            if ( pTextNode->GetNum() )
             {
-                aTmpStr += lcl_dbg_out(*(pTxtNode->GetNum()));
+                aTmpStr += lcl_dbg_out(*(pTextNode->GetNum()));
             }
             aTmpStr += "</number>";
 
@@ -585,25 +585,25 @@ static OUString lcl_dbg_out(const SwNode & rNode)
                 aTmpStr += "*";
             }
 
-            const SwNumFmt * pNumFmt = NULL;
+            const SwNumFormat * pNumFormat = NULL;
             aTmpStr += "</rule>";
 
-            if (pTxtNode->GetActualListLevel() > 0)
-                pNumFmt = pNumRule->GetNumFmt( static_cast< sal_uInt16 >(pTxtNode->GetActualListLevel()) );
+            if (pTextNode->GetActualListLevel() > 0)
+                pNumFormat = pNumRule->GetNumFormat( static_cast< sal_uInt16 >(pTextNode->GetActualListLevel()) );
 
-            if (pNumFmt)
+            if (pNumFormat)
             {
                 aTmpStr += "<numformat>";
                 aTmpStr +=
-                    lcl_dbg_out_NumType(pNumFmt->GetNumberingType());
+                    lcl_dbg_out_NumType(pNumFormat->GetNumberingType());
                 aTmpStr += "</numformat>";
             }
         }
 
-        if (pTxtNode->IsCountedInList())
+        if (pTextNode->IsCountedInList())
             aTmpStr += "<counted/>";
 
-        SwFmtColl * pColl = pTxtNode->GetFmtColl();
+        SwFormatColl * pColl = pTextNode->GetFormatColl();
 
         if (pColl)
         {
@@ -612,10 +612,10 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
             aTmpStr += "(";
 
-            SwTxtFmtColl *pTxtColl = static_cast<SwTxtFmtColl*>(pColl);
-            if (pTxtColl->IsAssignedToListLevelOfOutlineStyle())
+            SwTextFormatColl *pTextColl = static_cast<SwTextFormatColl*>(pColl);
+            if (pTextColl->IsAssignedToListLevelOfOutlineStyle())
             {
-                aTmpStr += OUString::number(pTxtColl->GetAssignedOutlineStyleLevel());
+                aTmpStr += OUString::number(pTextColl->GetAssignedOutlineStyleLevel());
             }
             else
             {
@@ -624,7 +624,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
             const SwNumRuleItem & rItem =
                 static_cast<const SwNumRuleItem &>
-                (pColl->GetFmtAttr(RES_PARATR_NUMRULE));
+                (pColl->GetFormatAttr(RES_PARATR_NUMRULE));
             const OUString sNumruleName = rItem.GetValue();
 
             if (!sNumruleName.isEmpty())
@@ -636,7 +636,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
             aTmpStr += "</coll>";
         }
 
-        SwFmtColl * pCColl = pTxtNode->GetCondFmtColl();
+        SwFormatColl * pCColl = pTextNode->GetCondFormatColl();
 
         if (pCColl)
         {
@@ -652,7 +652,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
         if (bDbgOutPrintAttrSet)
         {
             aTmpStr += "<attrs>";
-            aTmpStr += lcl_dbg_out(pTxtNode->GetSwAttrSet());
+            aTmpStr += lcl_dbg_out(pTextNode->GetSwAttrSet());
             aTmpStr += "</attrs>";
         }
     }
@@ -687,7 +687,7 @@ const char * dbg_out(const SwNode * pNode)
         return NULL;
 }
 
-const char * dbg_out(const SwCntntNode * pNode)
+const char * dbg_out(const SwContentNode * pNode)
 {
     if (NULL != pNode)
         return dbg_out(*pNode);
@@ -695,7 +695,7 @@ const char * dbg_out(const SwCntntNode * pNode)
         return NULL;
 }
 
-const char * dbg_out(const SwTxtNode * pNode)
+const char * dbg_out(const SwTextNode * pNode)
 {
     if (NULL != pNode)
         return dbg_out(*pNode);
@@ -829,11 +829,11 @@ const char * dbg_out(const SwRewriter & rRewriter)
     return dbg_out(lcl_dbg_out(rRewriter));
 }
 
-static OUString lcl_dbg_out(const SvxNumberFormat & rFmt)
+static OUString lcl_dbg_out(const SvxNumberFormat & rFormat)
 {
     OUString aResult;
 
-    aResult = lcl_dbg_out_NumType(rFmt.GetNumberingType());
+    aResult = lcl_dbg_out_NumType(rFormat.GetNumberingType());
 
     return aResult;
 }
@@ -865,45 +865,45 @@ const char * dbg_out(const SwNumRule & rRule)
     return dbg_out(lcl_dbg_out(rRule));
 }
 
-static OUString lcl_dbg_out(const SwTxtFmtColl & rFmt)
+static OUString lcl_dbg_out(const SwTextFormatColl & rFormat)
 {
-    OUString aResult(rFmt.GetName());
+    OUString aResult(rFormat.GetName());
 
     aResult += "(";
-    aResult += OUString::number(rFmt.GetAttrOutlineLevel());
+    aResult += OUString::number(rFormat.GetAttrOutlineLevel());
     aResult += ")";
 
     return aResult;
 }
 
-const char * dbg_out(const SwTxtFmtColl & rFmt)
+const char * dbg_out(const SwTextFormatColl & rFormat)
 {
-    return dbg_out(lcl_dbg_out(rFmt));
+    return dbg_out(lcl_dbg_out(rFormat));
 }
 
-static OUString lcl_dbg_out(const SwFrmFmts & rFrmFmts)
+static OUString lcl_dbg_out(const SwFrameFormats & rFrameFormats)
 {
-    return lcl_dbg_out_SvPtrArr<SwFrmFmts>(rFrmFmts);
+    return lcl_dbg_out_SvPtrArr<SwFrameFormats>(rFrameFormats);
 }
 
-const char * dbg_out(const SwFrmFmts & rFrmFmts)
+const char * dbg_out(const SwFrameFormats & rFrameFormats)
 {
-    return dbg_out(lcl_dbg_out(rFrmFmts));
+    return dbg_out(lcl_dbg_out(rFrameFormats));
 }
 
-static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
+static OUString lcl_dbg_out(const SwNumRuleTable & rTable)
 {
     OUString aResult("[");
 
-    for (size_t n = 0; n < rTbl.size(); n++)
+    for (size_t n = 0; n < rTable.size(); n++)
     {
         if (n > 0)
             aResult += ", ";
 
-        aResult += rTbl[n]->GetName();
+        aResult += rTable[n]->GetName();
 
         char sBuffer[256];
-        sprintf(sBuffer, "(%p)", rTbl[n]);
+        sprintf(sBuffer, "(%p)", rTable[n]);
         aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
     }
 
@@ -912,9 +912,9 @@ static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
     return aResult;
 }
 
-const char * dbg_out(const SwNumRuleTbl & rTbl)
+const char * dbg_out(const SwNumRuleTable & rTable)
 {
-    return dbg_out(lcl_dbg_out(rTbl));
+    return dbg_out(lcl_dbg_out(rTable));
 }
 
 static OUString lcl_TokenType2Str(FormTokenType nType)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index e90448e836df..f1880db1d6ae 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -500,13 +500,13 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
         maDBData = rNewData;
         getIDocumentState().SetModified();
     }
-    getIDocumentFieldsAccess().GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
+    getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD)->UpdateFields();
 }
 
-struct _PostItFld : public _SetGetExpFld
+struct _PostItField : public _SetGetExpField
 {
-    _PostItFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld,  const SwIndex* pIdx = 0 )
-        : _SetGetExpFld( rNdIdx, pFld, pIdx ) {}
+    _PostItField( const SwNodeIndex& rNdIdx, const SwTextField* pField,  const SwIndex* pIdx = 0 )
+        : _SetGetExpField( rNdIdx, pField, pIdx ) {}
 
     sal_uInt16 GetPageNo( const StringRangeEnumerator &rRangeEnum,
             const std::set< sal_Int32 > &rPossiblePages,
@@ -514,24 +514,24 @@ struct _PostItFld : public _SetGetExpFld
 
     const SwPostItField* GetPostIt() const
     {
-        return static_cast<const SwPostItField*>( GetTxtFld()->GetFmtFld().GetField() );
+        return static_cast<const SwPostItField*>( GetTextField()->GetFormatField().GetField() );
     }
 };
 
-sal_uInt16 _PostItFld::GetPageNo(
+sal_uInt16 _PostItField::GetPageNo(
     const StringRangeEnumerator &rRangeEnum,
     const std::set< sal_Int32 > &rPossiblePages,
     /* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo )
 {
-    //Problem: If a PostItFld is contained in a Node that is represented
+    //Problem: If a PostItField is contained in a Node that is represented
     //by more than one layout instance,
     //we have to decide whether it should be printed once or n-times.
     //Probably only once. For the page number we don't select a random one,
     //but the PostIt's first occurrence in the selected area.
     rVirtPgNo = 0;
-    const sal_Int32 nPos = GetCntnt();
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( GetTxtFld()->GetTxtNode() );
-    for( SwTxtFrm* pFrm = aIter.First(); pFrm;  pFrm = aIter.Next() )
+    const sal_Int32 nPos = GetContent();
+    SwIterator<SwTextFrm,SwTextNode> aIter( GetTextField()->GetTextNode() );
+    for( SwTextFrm* pFrm = aIter.First(); pFrm;  pFrm = aIter.Next() )
     {
         if( pFrm->GetOfst() > nPos ||
             (pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos) )
@@ -550,28 +550,28 @@ sal_uInt16 _PostItFld::GetPageNo(
 
 bool sw_GetPostIts(
     IDocumentFieldsAccess* pIDFA,
-    _SetGetExpFlds * pSrtLst )
+    _SetGetExpFields * pSrtLst )
 {
     bool bHasPostIts = false;
 
-    SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
-    OSL_ENSURE( pFldType, "no PostItType ? ");
+    SwFieldType* pFieldType = pIDFA->GetSysFieldType( RES_POSTITFLD );
+    OSL_ENSURE( pFieldType, "no PostItType ? ");
 
-    if( pFldType->HasWriterListeners() )
+    if( pFieldType->HasWriterListeners() )
     {
         // Found modify object; insert all fields into the array
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFld = aIter.First(); pFld;  pFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pField = aIter.First(); pField;  pField = aIter.Next() )
         {
-            const SwTxtFld* pTxtFld;
-            if( 0 != ( pTxtFld = pFld->GetTxtFld() ) &&
-                pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+            const SwTextField* pTextField;
+            if( 0 != ( pTextField = pField->GetTextField() ) &&
+                pTextField->GetTextNode().GetNodes().IsDocNodes() )
             {
                 bHasPostIts = true;
                 if (pSrtLst)
                 {
-                    SwNodeIndex aIdx( pTxtFld->GetTxtNode() );
-                    _PostItFld* pNew = new _PostItFld( aIdx, pTxtFld );
+                    SwNodeIndex aIdx( pTextField->GetTextNode() );
+                    _PostItField* pNew = new _PostItField( aIdx, pTextField );
                     pSrtLst->insert( pNew );
                 }
                 else
@@ -596,7 +596,7 @@ static void lcl_FormatPostIt(
 
     if (bNewPage)
     {
-        pIDCO->InsertPoolItem( aPam, SvxFmtBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
+        pIDCO->InsertPoolItem( aPam, SvxFormatBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
         pIDCO->SplitNode( *aPam.GetPoint(), false );
     }
     else if (!bIsFirstPostIt)
@@ -641,9 +641,9 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
 {
     sal_Int32 nRes = -1;
 
-    const SwFrmFmt &rFmt = pStartFrm->GetPageDesc()->GetMaster();
+    const SwFrameFormat &rFormat = pStartFrm->GetPageDesc()->GetMaster();
     const SfxPoolItem *pItem = NULL;
-    SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, false, &pItem );
+    SfxItemState eState = rFormat.GetItemState( RES_PAPER_BIN, false, &pItem );
     const SvxPaperBinItem *pPaperBinItem = dynamic_cast< const SvxPaperBinItem * >(pItem);
     if (eState > SfxItemState::DEFAULT && pPaperBinItem)
         nRes = pPaperBinItem->GetValue();
@@ -742,7 +742,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
     sal_Int16 nPostItMode = (sal_Int16) rOptions.getIntValue( "PrintAnnotationMode", 0 );
     OSL_ENSURE(nPostItMode == POSTITS_NONE || rData.HasPostItData(),
             "print post-its without post-it data?" );
-    const _SetGetExpFlds::size_type nPostItCount =
+    const _SetGetExpFields::size_type nPostItCount =
         rData.HasPostItData() ? rData.m_pPostItFields->size() : 0;
     if (nPostItMode != POSTITS_NONE && nPostItCount > 0)
     {
@@ -770,9 +770,9 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
         // already get them in the correct order
         sal_uInt16 nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0;
         bool bIsFirstPostIt = true;
-        for (_SetGetExpFlds::size_type i = 0; i < nPostItCount; ++i)
+        for (_SetGetExpFields::size_type i = 0; i < nPostItCount; ++i)
         {
-            _PostItFld& rPostIt = static_cast<_PostItFld&>(*(*rData.m_pPostItFields)[ i ]);
+            _PostItField& rPostIt = static_cast<_PostItField&>(*(*rData.m_pPostItFields)[ i ]);
             nLastPageNum = nPhyPageNum;
             nPhyPageNum = rPostIt.GetPageNo(
                     aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
@@ -1016,7 +1016,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 }
 
 /// @return the reference in the doc for the name
-const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
+const SwFormatRefMark* SwDoc::GetRefMark( const OUString& rName ) const
 {
     sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     for( sal_uInt32 n = 0; n < nMaxItems; ++n )
@@ -1025,20 +1025,20 @@ const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
         if( 0 == (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n ) ))
             continue;
 
-        const SwFmtRefMark* pFmtRef = static_cast<const SwFmtRefMark*>(pItem);
-        const SwTxtRefMark* pTxtRef = pFmtRef->GetTxtRefMark();
-        if( pTxtRef && &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() &&
-            rName == pFmtRef->GetRefName() )
-            return pFmtRef;
+        const SwFormatRefMark* pFormatRef = static_cast<const SwFormatRefMark*>(pItem);
+        const SwTextRefMark* pTextRef = pFormatRef->GetTextRefMark();
+        if( pTextRef && &pTextRef->GetTextNode().GetNodes() == &GetNodes() &&
+            rName == pFormatRef->GetRefName() )
+            return pFormatRef;
     }
     return 0;
 }
 
 /// @return the RefMark per index - for Uno
-const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
+const SwFormatRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
 {
-    const SwTxtRefMark* pTxtRef;
-    const SwFmtRefMark* pRet = 0;
+    const SwTextRefMark* pTextRef;
+    const SwFormatRefMark* pRet = 0;
 
     sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     sal_uInt32 nCount = 0;
@@ -1047,12 +1047,12 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
         const SfxPoolItem* pItem;
 
         if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
-            0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
-            &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+            0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+            &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
         {
             if(nCount == nIndex)
             {
-                pRet = static_cast<const SwFmtRefMark*>(pItem);
+                pRet = static_cast<const SwFormatRefMark*>(pItem);
                 break;
             }
             nCount++;
@@ -1066,7 +1066,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
 // OS 25.06.96: From now on we always return the reference count
 sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
 {
-    const SwTxtRefMark* pTxtRef;
+    const SwTextRefMark* pTextRef;
 
     const sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     sal_uInt16 nCount = 0;
@@ -1075,12 +1075,12 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
         const SfxPoolItem* pItem;
 
         if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
-            0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
-            &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+            0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+            &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
         {
             if( pNames )
             {
-                OUString pTmp(static_cast<const SwFmtRefMark*>(pItem)->GetRefName());
+                OUString pTmp(static_cast<const SwFormatRefMark*>(pItem)->GetRefName());
                 pNames->insert(pNames->begin() + nCount, pTmp);
             }
             ++nCount;
@@ -1092,27 +1092,27 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
 
 static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 {
-    SwTxtNode *pTxtNode = rpNd->GetTxtNode();
+    SwTextNode *pTextNode = rpNd->GetTextNode();
     bool bOnlyWrong = *static_cast<sal_Bool*>(pArgs);
-    if( pTxtNode )
+    if( pTextNode )
     {
         if( bOnlyWrong )
         {
-            if( pTxtNode->GetWrong() &&
-                pTxtNode->GetWrong()->InvalidateWrong() )
-                pTxtNode->SetWrongDirty( true );
-            if( pTxtNode->GetGrammarCheck() &&
-                pTxtNode->GetGrammarCheck()->InvalidateWrong() )
-                pTxtNode->SetGrammarCheckDirty( true );
+            if( pTextNode->GetWrong() &&
+                pTextNode->GetWrong()->InvalidateWrong() )
+                pTextNode->SetWrongDirty( true );
+            if( pTextNode->GetGrammarCheck() &&
+                pTextNode->GetGrammarCheck()->InvalidateWrong() )
+                pTextNode->SetGrammarCheckDirty( true );
         }
         else
         {
-            pTxtNode->SetWrongDirty( true );
-            if( pTxtNode->GetWrong() )
-                pTxtNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
-            pTxtNode->SetGrammarCheckDirty( true );
-            if( pTxtNode->GetGrammarCheck() )
-                pTxtNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
+            pTextNode->SetWrongDirty( true );
+            if( pTextNode->GetWrong() )
+                pTextNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
+            pTextNode->SetGrammarCheckDirty( true );
+            if( pTextNode->GetGrammarCheck() )
+                pTextNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
         }
     }
     return true;
@@ -1120,13 +1120,13 @@ static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 
 static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
 {
-    SwTxtNode *pTxtNode = rpNd->GetTxtNode();
-    if( pTxtNode )
+    SwTextNode *pTextNode = rpNd->GetTextNode();
+    if( pTextNode )
     {
-        pTxtNode->SetSmartTagDirty( true );
-        if( pTxtNode->GetSmartTags() )
+        pTextNode->SetSmartTagDirty( true );
+        if( pTextNode->GetSmartTags() )
         {
-            pTxtNode->SetSmartTags( NULL );
+            pTextNode->SetSmartTags( NULL );
         }
     }
     return true;
@@ -1166,28 +1166,28 @@ void SwDoc::InvalidateAutoCompleteFlag()
         std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));
         for( sal_uLong nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd )
         {
-            SwTxtNode* pTxtNode = GetNodes()[ nNd ]->GetTxtNode();
-            if ( pTxtNode ) pTxtNode->SetAutoCompleteWordDirty( true );
+            SwTextNode* pTextNode = GetNodes()[ nNd ]->GetTextNode();
+            if ( pTextNode ) pTextNode->SetAutoCompleteWordDirty( true );
         }
 
         std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));
     }
 }
 
-const SwFmtINetFmt* SwDoc::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwDoc::FindINetAttr( const OUString& rName ) const
 {
-    const SwFmtINetFmt* pItem;
-    const SwTxtINetFmt* pTxtAttr;
-    const SwTxtNode* pTxtNd;
+    const SwFormatINetFormat* pItem;
+    const SwTextINetFormat* pTextAttr;
+    const SwTextNode* pTextNd;
     sal_uInt32 n, nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
     for( n = 0; n < nMaxItems; ++n )
     {
-        pItem = static_cast<const SwFmtINetFmt*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
+        pItem = static_cast<const SwFormatINetFormat*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
         if( 0 != pItem &&
             pItem->GetName() == rName &&
-            0 != ( pTxtAttr = pItem->GetTxtINetFmt()) &&
-            0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
-            &pTxtNd->GetNodes() == &GetNodes() )
+            0 != ( pTextAttr = pItem->GetTextINetFormat()) &&
+            0 != ( pTextNd = pTextAttr->GetpTextNode() ) &&
+            &pTextNd->GetNodes() == &GetNodes() )
         {
             return pItem;
         }
@@ -1207,7 +1207,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
             ::SetProgressState( static_cast<long>(i), GetDocShell() );
             const sal_uLong nIndex = rOutNds[ i ]->GetIndex();
 
-            const int nLvl = GetNodes()[ nIndex ]->GetTxtNode()->GetAttrOutlineLevel()-1;
+            const int nLvl = GetNodes()[ nIndex ]->GetTextNode()->GetAttrOutlineLevel()-1;
             if( nLvl > nLevel )
                 continue;
             long nEndOfs = 1;
@@ -1216,42 +1216,42 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
                 rOutNds[ i + 1 ]->GetIndex() : GetNodes().Count();
             bool bKeep = false;
             while( ( nWish || bKeep ) && nIndex + nEndOfs < nNextOutNd &&
-                   GetNodes()[ nIndex + nEndOfs ]->IsTxtNode() )
+                   GetNodes()[ nIndex + nEndOfs ]->IsTextNode() )
             {
-                SwTxtNode* pTxtNode = GetNodes()[ nIndex+nEndOfs ]->GetTxtNode();
-                if (pTxtNode->GetTxt().getLength() && nWish)
+                SwTextNode* pTextNode = GetNodes()[ nIndex+nEndOfs ]->GetTextNode();
+                if (pTextNode->GetText().getLength() && nWish)
                     --nWish;
-                bKeep = pTxtNode->GetSwAttrSet().GetKeep().GetValue();
+                bKeep = pTextNode->GetSwAttrSet().GetKeep().GetValue();
                 ++nEndOfs;
             }
 
             SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs );
             GetNodes()._Copy( aRange, aEndOfDoc );
         }
-        const SwTxtFmtColls *pColl = pExtDoc->GetTxtFmtColls();
-        for( SwTxtFmtColls::size_type i = 0; i < pColl->size(); ++i )
-            (*pColl)[ i ]->ResetFmtAttr( RES_PAGEDESC, RES_BREAK );
+        const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls();
+        for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i )
+            (*pColl)[ i ]->ResetFormatAttr( RES_PAGEDESC, RES_BREAK );
         SwNodeIndex aIndx( pExtDoc->GetNodes().GetEndOfExtras() );
         ++aEndOfDoc;
         while( aIndx < aEndOfDoc )
         {
             SwNode *pNode;
             bool bDelete = false;
-            if( (pNode = &aIndx.GetNode())->IsTxtNode() )
+            if( (pNode = &aIndx.GetNode())->IsTextNode() )
             {
-                SwTxtNode *pNd = pNode->GetTxtNode();
+                SwTextNode *pNd = pNode->GetTextNode();
                 if( pNd->HasSwAttrSet() )
                     pNd->ResetAttr( RES_PAGEDESC, RES_BREAK );
                 if( bImpress )
                 {
-                    SwTxtFmtColl* pMyColl = pNd->GetTxtColl();
+                    SwTextFormatColl* pMyColl = pNd->GetTextColl();
 
                     const sal_uInt16 nHeadLine = static_cast<sal_uInt16>(
                                 !pMyColl->IsAssignedToListLevelOfOutlineStyle()
                                 ? RES_POOLCOLL_HEADLINE2
                                 : RES_POOLCOLL_HEADLINE1 );
-                    pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nHeadLine );
-                    pNd->ChgFmtColl( pMyColl );
+                    pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nHeadLine );
+                    pNd->ChgFormatColl( pMyColl );
                 }
                 if( !pNd->Len() &&
                     pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() )
@@ -1274,26 +1274,26 @@ bool SwDoc::RemoveInvisibleContent()
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL );
 
     {
-        SwTxtNode* pTxtNd;
-        SwIterator<SwFmtFld,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD )  );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld;  pFmtFld = aIter.Next() )
+        SwTextNode* pTextNd;
+        SwIterator<SwFormatField,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD )  );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField;  pFormatField = aIter.Next() )
         {
-            if( pFmtFld->GetTxtFld() &&
-                0 != ( pTxtNd = pFmtFld->GetTxtFld()->GetpTxtNode() ) &&
-                pTxtNd->GetpSwpHints() && pTxtNd->HasHiddenParaField() &&
-                &pTxtNd->GetNodes() == &GetNodes() )
+            if( pFormatField->GetTextField() &&
+                0 != ( pTextNd = pFormatField->GetTextField()->GetpTextNode() ) &&
+                pTextNd->GetpSwpHints() && pTextNd->HasHiddenParaField() &&
+                &pTextNd->GetNodes() == &GetNodes() )
             {
                 bRet = true;
-                SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
+                SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
 
                 // Remove hidden paragraph or delete contents:
                 // Delete contents if
                 // 1. removing the paragraph would result in an empty section or
                 // 2. if the paragraph is the last paragraph in the section and
                 //    there is no paragraph in front of the paragraph:
-                if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
-                     ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
-                       !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+                if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+                     ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+                       !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
                 {
                     getIDocumentContentOperations().DeleteRange( aPam );
                 }
@@ -1309,12 +1309,12 @@ bool SwDoc::RemoveInvisibleContent()
     // Remove any hidden paragraph (hidden text attribute)
     for( sal_uLong n = GetNodes().Count(); n; )
     {
-        SwTxtNode* pTxtNd = GetNodes()[ --n ]->GetTxtNode();
-        if ( pTxtNd )
+        SwTextNode* pTextNd = GetNodes()[ --n ]->GetTextNode();
+        if ( pTextNd )
         {
             bool bRemoved = false;
-            SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
-            if ( pTxtNd->HasHiddenCharAttribute( true ) )
+            SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+            if ( pTextNd->HasHiddenCharAttribute( true ) )
             {
                 bRemoved = true;
                 bRet = true;
@@ -1324,9 +1324,9 @@ bool SwDoc::RemoveInvisibleContent()
                 // 1. removing the paragraph would result in an empty section or
                 // 2. if the paragraph is the last paragraph in the section and
                 //    there is no paragraph in front of the paragraph:
-                if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
-                     ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
-                       !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+                if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+                     ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+                       !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
                 {
                     getIDocumentContentOperations().DeleteRange( aPam );
                 }
@@ -1336,11 +1336,11 @@ bool SwDoc::RemoveInvisibleContent()
                     getIDocumentContentOperations().DelFullPara( aPam );
                 }
             }
-            else if ( pTxtNd->HasHiddenCharAttribute( false ) )
+            else if ( pTextNd->HasHiddenCharAttribute( false ) )
             {
                 bRemoved = true;
                 bRet = true;
-                SwScriptInfo::DeleteHiddenRanges( *pTxtNd );
+                SwScriptInfo::DeleteHiddenRanges( *pTextNd );
             }
 
             // Footnotes/Frames may have been removed, therefore we have
@@ -1352,16 +1352,16 @@ bool SwDoc::RemoveInvisibleContent()
 
     {
         // Delete/empty all hidden areas
-        SwSectionFmts aSectFmts;
-        SwSectionFmts& rSectFmts = GetSections();
+        SwSectionFormats aSectFormats;
+        SwSectionFormats& rSectFormats = GetSections();
 
-        for( SwSectionFmts::size_type n = rSectFmts.size(); n; )
+        for( SwSectionFormats::size_type n = rSectFormats.size(); n; )
         {
-            SwSectionFmt* pSectFmt = rSectFmts[ --n ];
+            SwSectionFormat* pSectFormat = rSectFormats[ --n ];
             // don't add sections in Undo/Redo
-            if( !pSectFmt->IsInNodesArr())
+            if( !pSectFormat->IsInNodesArr())
                 continue;
-            SwSection* pSect = pSectFmt->GetSection();
+            SwSection* pSect = pSectFormat->GetSection();
             if( pSect->CalcHiddenFlag() )
             {
                 SwSection* pParent = pSect, *pTmp;
@@ -1372,10 +1372,10 @@ bool SwDoc::RemoveInvisibleContent()
                     pParent = pTmp;
                 }
 
-                SwSectionFmts::iterator it = std::find(
-                        aSectFmts.begin(), aSectFmts.end(), pSect->GetFmt() );
-                if (it == aSectFmts.end())
-                    aSectFmts.insert( aSectFmts.begin(), pSect->GetFmt() );
+                SwSectionFormats::iterator it = std::find(
+                        aSectFormats.begin(), aSectFormats.end(), pSect->GetFormat() );
+                if (it == aSectFormats.end())
+                    aSectFormats.insert( aSectFormats.begin(), pSect->GetFormat() );
             }
             if( !pSect->GetCondition().isEmpty() )
             {
@@ -1386,14 +1386,14 @@ bool SwDoc::RemoveInvisibleContent()
             }
         }
 
-        SwSectionFmts::size_type n = aSectFmts.size();
+        SwSectionFormats::size_type n = aSectFormats.size();
 
         if( 0 != n )
         {
             while( n )
             {
-                SwSectionFmt* pSectFmt = aSectFmts[ --n ];
-                SwSectionNode* pSectNd = pSectFmt->GetSectionNode();
+                SwSectionFormat* pSectFormat = aSectFormats[ --n ];
+                SwSectionNode* pSectNd = pSectFormat->GetSectionNode();
                 if( pSectNd )
                 {
                     bRet = true;
@@ -1405,7 +1405,7 @@ bool SwDoc::RemoveInvisibleContent()
                         pSectNd->EndOfSectionIndex() + 1 )
                     {
                         // only delete the content
-                        SwCntntNode* pCNd = GetNodes().GoNext(
+                        SwContentNode* pCNd = GetNodes().GoNext(
                                                 &aPam.GetPoint()->nNode );
                         aPam.GetPoint()->nContent.Assign( pCNd, 0 );
                         aPam.SetMark();
@@ -1426,7 +1426,7 @@ bool SwDoc::RemoveInvisibleContent()
 
                 }
             }
-            aSectFmts.clear();
+            aSectFormats.clear();
         }
     }
 
@@ -1438,29 +1438,29 @@ bool SwDoc::RemoveInvisibleContent()
 
 bool SwDoc::HasInvisibleContent() const
 {
-    if(SwIterator<SwFmtFld,SwFieldType>(*getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD)).First())
+    if(SwIterator<SwFormatField,SwFieldType>(*getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD)).First())
         return true;
 
     // Search for any hidden paragraph (hidden text attribute)
     for( sal_uLong n = GetNodes().Count()-1; n; --n)
     {
-        SwTxtNode* pTxtNd = GetNodes()[ n ]->GetTxtNode();
-        if ( pTxtNd )
+        SwTextNode* pTextNd = GetNodes()[ n ]->GetTextNode();
+        if ( pTextNd )
         {
-            SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
-            if( pTxtNd->HasHiddenCharAttribute( true ) ||  ( pTxtNd->HasHiddenCharAttribute( false ) ) )
+            SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+            if( pTextNd->HasHiddenCharAttribute( true ) ||  ( pTextNd->HasHiddenCharAttribute( false ) ) )
                 return true;
         }
     }
 
-    const SwSectionFmts& rSectFmts = GetSections();
-    for( SwSectionFmts::size_type n = rSectFmts.size()-1; n; --n )
+    const SwSectionFormats& rSectFormats = GetSections();
+    for( SwSectionFormats::size_type n = rSectFormats.size()-1; n; --n )
     {
-        SwSectionFmt* pSectFmt = rSectFmts[ n ];
+        SwSectionFormat* pSectFormat = rSectFormats[ n ];
         // don't add sections in Undo/Redo
-        if( !pSectFmt->IsInNodesArr())
+        if( !pSectFormat->IsInNodesArr())
             continue;
-        SwSection* pSect = pSectFmt->GetSection();
+        SwSection* pSect = pSectFormat->GetSection();
         if( pSect->IsHidden() )
             return true;
     }
@@ -1483,40 +1483,40 @@ bool SwDoc::RestoreInvisibleContent()
 bool SwDoc::ConvertFieldsToText()
 {
     bool bRet = false;
-    getIDocumentFieldsAccess().LockExpFlds();
+    getIDocumentFieldsAccess().LockExpFields();
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE, NULL );
 
-    const SwFldTypes* pMyFldTypes = getIDocumentFieldsAccess().GetFldTypes();
-    const SwFldTypes::size_type nCount = pMyFldTypes->size();
+    const SwFieldTypes* pMyFieldTypes = getIDocumentFieldsAccess().GetFieldTypes();
+    const SwFieldTypes::size_type nCount = pMyFieldTypes->size();
     //go backward, field types are removed
-    for(SwFldTypes::size_type nType = nCount; nType > 0; --nType)
+    for(SwFieldTypes::size_type nType = nCount; nType > 0; --nType)
     {
-        const SwFieldType *pCurType = (*pMyFldTypes)[nType - 1];
+        const SwFieldType *pCurType = (*pMyFieldTypes)[nType - 1];
 
         if ( RES_POSTITFLD == pCurType->Which() )
             continue;
 
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pCurType );
-        ::std::vector<const SwFmtFld*> aFieldFmts;
-        for( SwFmtFld* pCurFldFmt = aIter.First(); pCurFldFmt; pCurFldFmt = aIter.Next() )
-            aFieldFmts.push_back(pCurFldFmt);
+        SwIterator<SwFormatField,SwFieldType> aIter( *pCurType );
+        ::std::vector<const SwFormatField*> aFieldFormats;
+        for( SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next() )
+            aFieldFormats.push_back(pCurFieldFormat);
 
-        ::std::vector<const SwFmtFld*>::iterator aBegin = aFieldFmts.begin();
-        ::std::vector<const SwFmtFld*>::iterator aEnd = aFieldFmts.end();
+        ::std::vector<const SwFormatField*>::iterator aBegin = aFieldFormats.begin();
+        ::std::vector<const SwFormatField*>::iterator aEnd = aFieldFormats.end();
         while(aBegin != aEnd)
         {
-            const SwTxtFld *pTxtFld = (*aBegin)->GetTxtFld();
+            const SwTextField *pTextField = (*aBegin)->GetTextField();
             // skip fields that are currently not in the document
             // e.g. fields in undo or redo array
 
-            bool bSkip = !pTxtFld ||
-                         !pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes();
+            bool bSkip = !pTextField ||
+                         !pTextField->GetpTextNode()->GetNodes().IsDocNodes();
 
             if (!bSkip)
             {
-                bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
-                const SwFmtFld& rFmtFld = pTxtFld->GetFmtFld();
-                const SwField*  pField = rFmtFld.GetField();
+                bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTextField->GetpTextNode()));
+                const SwFormatField& rFormatField = pTextField->GetFormatField();
+                const SwField*  pField = rFormatField.GetField();
 
                 //#i55595# some fields have to be excluded in headers/footers
                 sal_uInt16 nWhich = pField->GetTyp()->Which();
@@ -1535,15 +1535,15 @@ bool SwDoc::ConvertFieldsToText()
                     if( RES_DBFLD == pCurType->Which() && !static_cast<const SwDBField*>(pField)->IsInitialized())
                         sText.clear();
 
-                    SwPaM aInsertPam(*pTxtFld->GetpTxtNode(), pTxtFld->GetStart());
+                    SwPaM aInsertPam(*pTextField->GetpTextNode(), pTextField->GetStart());
                     aInsertPam.SetMark();
 
                     // go to the end of the field
-                    const SwTxtFld *pFieldAtEnd = sw::DocumentFieldsManager::GetTxtFldAtPos(*aInsertPam.End());
+                    const SwTextField *pFieldAtEnd = sw::DocumentFieldsManager::GetTextFieldAtPos(*aInsertPam.End());
                     if (pFieldAtEnd && pFieldAtEnd->Which() == RES_TXTATR_INPUTFIELD)
                     {
                         SwPosition &rEndPos = *aInsertPam.GetPoint();
-                        rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( *aInsertPam.End() );
+                        rEndPos.nContent = SwCrsrShell::EndOfInputFieldAtPos( *aInsertPam.End() );
                     }
                     else
                     {
@@ -1580,24 +1580,24 @@ bool SwDoc::ConvertFieldsToText()
     if( bRet )
         getIDocumentState().SetModified();
     GetIDocumentUndoRedo().EndUndo( UNDO_UI_REPLACE, NULL );
-    getIDocumentFieldsAccess().UnlockExpFlds();
+    getIDocumentFieldsAccess().UnlockExpFields();
     return bRet;
 
 }
 
-bool SwDoc::IsInsTblFormatNum() const
+bool SwDoc::IsInsTableFormatNum() const
 {
-    return SW_MOD()->IsInsTblFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
-bool SwDoc::IsInsTblChangeNumFormat() const
+bool SwDoc::IsInsTableChangeNumFormat() const
 {
-    return SW_MOD()->IsInsTblChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
-bool SwDoc::IsInsTblAlignNum() const
+bool SwDoc::IsInsTableAlignNum() const
 {
-    return SW_MOD()->IsInsTblAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
 /// Set up the InsertDB as Undo table
@@ -1605,11 +1605,11 @@ void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable )
 {
     if( bIsTable )
     {
-        const SwTableNode* pTblNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
-        if( pTblNd )
+        const SwTableNode* pTableNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
+        if( pTableNd )
         {
-            SwUndoCpyTbl* pUndo = new SwUndoCpyTbl;
-            pUndo->SetTableSttIdx( pTblNd->GetIndex() );
+            SwUndoCpyTable* pUndo = new SwUndoCpyTable;
+            pUndo->SetTableSttIdx( pTableNd->GetIndex() );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
     }
@@ -1645,15 +1645,15 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
 {
     if (&rPam.GetNode(true) == &rPam.GetNode(false))
     {
-        SwTxtNode * pTxtNode = rPam.GetNode(true).GetTxtNode();
+        SwTextNode * pTextNode = rPam.GetNode(true).GetTextNode();
 
-        if (0 != pTxtNode)
+        if (0 != pTextNode)
         {
             const sal_Int32 nStart = rPam.Start()->nContent.GetIndex();
             const sal_Int32 nEnd = rPam.End()->nContent.GetIndex();
 
             return SW_RESSTR(STR_START_QUOTE)
-                + ShortenString(pTxtNode->GetTxt().copy(nStart, nEnd - nStart),
+                + ShortenString(pTextNode->GetText().copy(nStart, nEnd - nStart),
                                 nUndoStringLength,
                                 SW_RESSTR(STR_LDOTS))
                 + SW_RESSTR(STR_END_QUOTE);
@@ -1672,30 +1672,30 @@ bool SwDoc::ContainsHiddenChars() const
     for( sal_uLong n = GetNodes().Count(); n; )
     {
         SwNode* pNd = GetNodes()[ --n ];
-        if ( pNd->IsTxtNode() && pNd->GetTxtNode()->HasHiddenCharAttribute( false ) )
+        if ( pNd->IsTextNode() && pNd->GetTextNode()->HasHiddenCharAttribute( false ) )
             return true;
     }
 
     return false;
 }
 
-SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr )
+SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr )
 {
     SwUnoCrsr* pNew;
-    if( bTblCrsr )
+    if( bTableCrsr )
         pNew = new SwUnoTableCrsr( rPos );
     else
         pNew = new SwUnoCrsr( rPos );
 
-    mpUnoCrsrTbl->insert( pNew );
+    mpUnoCrsrTable->insert( pNew );
     return pNew;
 }
 
 void SwDoc::ChkCondColls()
 {
-     for (SwTxtFmtColls::size_type n = 0; n < mpTxtFmtCollTbl->size(); ++n)
+     for (SwTextFormatColls::size_type n = 0; n < mpTextFormatCollTable->size(); ++n)
      {
-        SwTxtFmtColl *pColl = (*mpTxtFmtCollTbl)[n];
+        SwTextFormatColl *pColl = (*mpTextFormatCollTable)[n];
         if (RES_CONDTXTFMTCOLL == pColl->Which())
             pColl->CallSwClientNotify( SwAttrHint(RES_CONDTXTFMTCOLL) );
      }
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index e28666606618..48c92bb71d9d 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -137,7 +137,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
         return 0;
 
     sal_uInt16 nRet = 0;
-    const SvxMacroTableDtor* pTbl = 0;
+    const SvxMacroTableDtor* pTable = 0;
     switch( rCallEvent.eType )
     {
     case EVENT_OBJECT_INETATTR:
@@ -156,20 +156,20 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
             }
         }
         if( !bCheckPtr )
-            pTbl = rCallEvent.PTR.pINetAttr->GetMacroTbl();
+            pTable = rCallEvent.PTR.pINetAttr->GetMacroTable();
         break;
 
     case EVENT_OBJECT_URLITEM:
     case EVENT_OBJECT_IMAGE:
         {
-            const SwFrmFmt* pFmt = rCallEvent.PTR.pFmt;
+            const SwFrameFormat* pFormat = rCallEvent.PTR.pFormat;
             if( bCheckPtr )
             {
-                if ( GetSpzFrmFmts()->Contains( pFmt ) )
+                if ( GetSpzFrameFormats()->Contains( pFormat ) )
                     bCheckPtr = false;      // misuse as a flag
             }
             if( !bCheckPtr )
-                pTbl = &pFmt->GetMacro().GetMacroTable();
+                pTable = &pFormat->GetMacro().GetMacroTable();
         }
         break;
 
@@ -178,10 +178,10 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
             const IMapObject* pIMapObj = rCallEvent.PTR.IMAP.pIMapObj;
             if( bCheckPtr )
             {
-                const SwFrmFmt* pFmt = rCallEvent.PTR.IMAP.pFmt;
+                const SwFrameFormat* pFormat = rCallEvent.PTR.IMAP.pFormat;
                 const ImageMap* pIMap;
-                if( GetSpzFrmFmts()->Contains( pFmt ) &&
-                    0 != (pIMap = pFmt->GetURL().GetMap()) )
+                if( GetSpzFrameFormats()->Contains( pFormat ) &&
+                    0 != (pIMap = pFormat->GetURL().GetMap()) )
                 {
                     for( size_t nPos = pIMap->GetIMapObjectCount(); nPos; )
                         if( pIMapObj == pIMap->GetIMapObject( --nPos ))
@@ -192,19 +192,19 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
                 }
             }
             if( !bCheckPtr )
-                pTbl = &pIMapObj->GetMacroTable();
+                pTable = &pIMapObj->GetMacroTable();
         }
         break;
     default:
         break;
     }
 
-    if( pTbl )
+    if( pTable )
     {
         nRet = 0x1;
-        if( pTbl->IsKeyValid( nEvent ) )
+        if( pTable->IsKeyValid( nEvent ) )
         {
-            const SvxMacro& rMacro = *pTbl->Get( nEvent );
+            const SvxMacro& rMacro = *pTable->Get( nEvent );
             if( STARBASIC == rMacro.GetScriptType() )
             {
                 nRet += 0 == mpDocShell->CallBasic( rMacro.GetMacName(),
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 3975e13b0a35..9b9f143320d7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -101,25 +101,25 @@ namespace
             pMark);
     }
 
-    static inline ::std::unique_ptr<SwPosition> lcl_PositionFromCntntNode(
-        SwCntntNode * const pCntntNode,
+    static inline ::std::unique_ptr<SwPosition> lcl_PositionFromContentNode(
+        SwContentNode * const pContentNode,
         const bool bAtEnd=false)
     {
-        ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pCntntNode));
-        pResult->nContent.Assign(pCntntNode, bAtEnd ? pCntntNode->Len() : 0);
+        ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode));
+        pResult->nContent.Assign(pContentNode, bAtEnd ? pContentNode->Len() : 0);
         return pResult;
     }
 
-    // return a position at the begin of rEnd, if it is a CntntNode
+    // return a position at the begin of rEnd, if it is a ContentNode
     // else set it to the begin of the Node after rEnd, if there is one
     // else set it to the end of the node before rStt
-    // else set it to the CntntNode of the Pos outside the Range
+    // else set it to the ContentNode of the Pos outside the Range
     static inline ::std::unique_ptr<SwPosition> lcl_FindExpelPosition(
         const SwNodeIndex& rStt,
         const SwNodeIndex& rEnd,
         const SwPosition& rOtherPosition)
     {
-        SwCntntNode * pNode = rEnd.GetNode().GetCntntNode();
+        SwContentNode * pNode = rEnd.GetNode().GetContentNode();
         bool bPosAtEndOfNode = false;
         if ( pNode == NULL)
         {
@@ -135,7 +135,7 @@ namespace
         }
         if ( pNode != NULL )
         {
-            return lcl_PositionFromCntntNode( pNode, bPosAtEndOfNode );
+            return lcl_PositionFromContentNode( pNode, bPosAtEndOfNode );
         }
 
         return ::std::unique_ptr<SwPosition>(new SwPosition(rOtherPosition));
@@ -333,11 +333,11 @@ OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()
 
 bool IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
 {
-    return rPaM.Start()->nNode.GetNode().IsTxtNode() &&
+    return rPaM.Start()->nNode.GetNode().IsTextNode() &&
            rPaM.Start()->nContent.GetIndex() == 0 &&
            ( !rPaM.HasMark() ||
              ( rPaM.GetMark()->nNode == rPaM.GetPoint()->nNode &&
-               rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTxtNode()->Len() ) );
+               rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTextNode()->Len() ) );
 }
 
 namespace sw { namespace mark
@@ -369,7 +369,7 @@ namespace sw { namespace mark
                 pPos2->nContent.GetIndex());
         }
 #endif
-        // see for example _SaveCntntIdx, Shells
+        // see for example _SaveContentIdx, Shells
         OSL_PRECOND(m_vAllMarks.size() < USHRT_MAX,
             "MarkManager::makeMark(..)"
             " - more than USHRT_MAX marks are not supported correctly");
@@ -494,12 +494,12 @@ namespace sw { namespace mark
         return pFieldMark;
     }
 
-    ::sw::mark::IMark* MarkManager::getMarkForTxtNode(
-        const SwTxtNode& rTxtNode,
+    ::sw::mark::IMark* MarkManager::getMarkForTextNode(
+        const SwTextNode& rTextNode,
         const IDocumentMarkAccess::MarkType eType )
     {
-        SwPosition aPos(rTxtNode);
-        aPos.nContent.Assign(&(const_cast<SwTxtNode&>(rTxtNode)), 0);
+        SwPosition aPos(rTextNode);
+        aPos.nContent.Assign(&(const_cast<SwTextNode&>(rTextNode)), 0);
         const iterator_t ppExistingMark = lcl_FindMarkAtPos(m_vBookmarks, aPos, eType);
         if(ppExistingMark != m_vBookmarks.end())
             return ppExistingMark->get();
@@ -1208,31 +1208,31 @@ SaveBookmark::SaveBookmark(
         }
     }
     m_nNode1 = rBkmk.GetMarkPos().nNode.GetIndex();
-    m_nCntnt1 = rBkmk.GetMarkPos().nContent.GetIndex();
+    m_nContent1 = rBkmk.GetMarkPos().nContent.GetIndex();
 
     if(m_bSavePos)
     {
         m_nNode1 -= rMvPos.GetIndex();
         if(pIdx && !m_nNode1)
-            m_nCntnt1 -= pIdx->GetIndex();
+            m_nContent1 -= pIdx->GetIndex();
     }
 
     if(rBkmk.IsExpanded())
     {
         m_nNode2 = rBkmk.GetOtherMarkPos().nNode.GetIndex();
-        m_nCntnt2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
+        m_nContent2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
 
         if(m_bSaveOtherPos)
         {
             m_nNode2 -= rMvPos.GetIndex();
             if(pIdx && !m_nNode2)
-                m_nCntnt2 -= pIdx->GetIndex();
+                m_nContent2 -= pIdx->GetIndex();
         }
     }
     else
     {
         m_nNode2 = ULONG_MAX;
-        m_nCntnt2 = -1;
+        m_nContent2 = -1;
     }
 }
 
@@ -1253,14 +1253,14 @@ void SaveBookmark::SetInDoc(
         {
             aPam.GetMark()->nNode += m_nNode2;
             if(pIdx && !m_nNode2)
-                aPam.GetMark()->nContent += m_nCntnt2;
+                aPam.GetMark()->nContent += m_nContent2;
             else
-                aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+                aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
         }
         else
         {
             aPam.GetMark()->nNode = m_nNode2;
-            aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+            aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
         }
     }
 
@@ -1269,14 +1269,14 @@ void SaveBookmark::SetInDoc(
         aPam.GetPoint()->nNode += m_nNode1;
 
         if(pIdx && !m_nNode1)
-            aPam.GetPoint()->nContent += m_nCntnt1;
+            aPam.GetPoint()->nContent += m_nContent1;
         else
-            aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+            aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
     }
     else
     {
         aPam.GetPoint()->nNode = m_nNode1;
-        aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+        aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
     }
 
     if(!aPam.HasMark()
@@ -1321,11 +1321,11 @@ void _DelBookmarks(
     // Copy all Redlines which are in the move area into an array
     // which holds all position information as offset.
     // Assignement happens after moving.
-    SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-    for(SwRedlineTbl::size_type nCnt = 0; nCnt < rTbl.size(); ++nCnt )
+    SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    for(SwRedlineTable::size_type nCnt = 0; nCnt < rTable.size(); ++nCnt )
     {
         // Is at position?
-        SwRangeRedline* pRedl = rTbl[ nCnt ];
+        SwRangeRedline* pRedl = rTable[ nCnt ];
 
         SwPosition *const pRStt = pRedl->Start();
         SwPosition *const pREnd = pRedl->End();
@@ -1338,7 +1338,7 @@ void _DelBookmarks(
             else
             {
                 bool bStt = true;
-                SwCntntNode* pCNd = pRStt->nNode.GetNode().GetCntntNode();
+                SwContentNode* pCNd = pRStt->nNode.GetNode().GetContentNode();
                 if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoNext( &pRStt->nNode )) )
                 {
                     bStt = false;
@@ -1346,7 +1346,7 @@ void _DelBookmarks(
                     if( 0 == ( pCNd = SwNodes::GoPrevious( &pRStt->nNode )) )
                     {
                         pRStt->nNode = pREnd->nNode;
-                        pCNd = pRStt->nNode.GetNode().GetCntntNode();
+                        pCNd = pRStt->nNode.GetNode().GetContentNode();
                     }
                 }
                 pRStt->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
@@ -1360,7 +1360,7 @@ void _DelBookmarks(
             else
             {
                 bool bStt = false;
-                SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
+                SwContentNode* pCNd = pREnd->nNode.GetNode().GetContentNode();
                 if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &pREnd->nNode )) )
                 {
                     bStt = true;
@@ -1368,7 +1368,7 @@ void _DelBookmarks(
                     if( 0 == ( pCNd = pDoc->GetNodes().GoNext( &pREnd->nNode )) )
                     {
                         pREnd->nNode = pRStt->nNode;
-                        pCNd = pREnd->nNode.GetNode().GetCntntNode();
+                        pCNd = pREnd->nNode.GetNode().GetContentNode();
                     }
                 }
                 pREnd->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 6c5b45997824..1354afaa51f5 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -43,10 +43,10 @@
 
 void SwTable::UpdateCharts() const
 {
-    GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() );
+    GetFrameFormat()->GetDoc()->UpdateCharts( GetFrameFormat()->GetName() );
 }
 
-bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
+bool SwTable::IsTableComplexForChart( const OUString& rSelection ) const
 {
     const SwTableBox* pSttBox, *pEndBox;
     if( 2 < rSelection.getLength() )
@@ -59,8 +59,8 @@ bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
         const sal_Int32 nLength {'>' == rSelection[ rSelection.getLength()-1 ]
             ? rSelection.getLength()-1 : rSelection.getLength()};
 
-        pSttBox = GetTblBox(rSelection.copy( nOffset, nSeparator - nOffset ));
-        pEndBox = GetTblBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
+        pSttBox = GetTableBox(rSelection.copy( nOffset, nSeparator - nOffset ));
+        pEndBox = GetTableBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
     }
     else
     {
@@ -90,26 +90,26 @@ void SwDoc::DoUpdateAllCharts()
     SwViewShell* pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
     if( pVSh )
     {
-        const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
-        for( size_t n = 0; n < rTblFmts.size(); ++n )
+        const SwFrameFormats& rTableFormats = *GetTableFrameFormats();
+        for( size_t n = 0; n < rTableFormats.size(); ++n )
         {
-            SwTable* pTmpTbl;
-            const SwTableNode* pTblNd;
-            const SwFrmFmt* pFmt = rTblFmts[ n ];
+            SwTable* pTmpTable;
+            const SwTableNode* pTableNd;
+            const SwFrameFormat* pFormat = rTableFormats[ n ];
 
-            if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-                0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
-                pTblNd->GetNodes().IsDocNodes() )
+            if( 0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+                0 != ( pTableNd = pTmpTable->GetTableNode() ) &&
+                pTableNd->GetNodes().IsDocNodes() )
             {
-                _UpdateCharts( *pTmpTbl, *pVSh );
+                _UpdateCharts( *pTmpTable, *pVSh );
             }
         }
     }
 }
 
-void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
+void SwDoc::_UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const
 {
-    OUString aName( rTbl.GetFrmFmt()->GetName() );
+    OUString aName( rTable.GetFrameFormat()->GetName() );
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
     while( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
@@ -117,12 +117,12 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
         ++aIdx;
         SwOLENode *pONd;
         if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-            aName == pONd->GetChartTblName() &&
+            aName == pONd->GetChartTableName() &&
             pONd->getLayoutFrm( rVSh.GetLayout() ) )
         {
             SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
             if (pPCD)
-                pPCD->InvalidateTable( &rTbl );
+                pPCD->InvalidateTable( &rTable );
             // following this the framework will now take care of repainting
             // the chart or it's replacement image...
         }
@@ -132,29 +132,29 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
 
 void SwDoc::UpdateCharts( const OUString &rName ) const
 {
-    SwTable* pTmpTbl = SwTable::FindTable( FindTblFmtByName( rName ) );
-    if( pTmpTbl )
+    SwTable* pTmpTable = SwTable::FindTable( FindTableFormatByName( rName ) );
+    if( pTmpTable )
     {
         SwViewShell const * pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
 
         if( pVSh )
-            _UpdateCharts( *pTmpTbl, *pVSh );
+            _UpdateCharts( *pTmpTable, *pVSh );
     }
 }
 
-void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
+void SwDoc::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName )
 {
-    const OUString aOldName( rTblFmt.GetName() );
+    const OUString aOldName( rTableFormat.GetName() );
 
     bool bNameFound = rNewName.isEmpty();
     if( !bNameFound )
     {
-        const SwFrmFmts& rTbl = *GetTblFrmFmts();
-        for( size_t i = rTbl.size(); i; )
+        const SwFrameFormats& rTable = *GetTableFrameFormats();
+        for( size_t i = rTable.size(); i; )
         {
-            const SwFrmFmt* pFmt;
-            if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
-                pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
+            const SwFrameFormat* pFormat;
+            if( !( pFormat = rTable[ --i ] )->IsDefault() &&
+                pFormat->GetName() == rNewName && IsUsed( *pFormat ) )
             {
                 bNameFound = true;
                 break;
@@ -163,9 +163,9 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
     }
 
     if( !bNameFound )
-        rTblFmt.SetName( rNewName, true );
+        rTableFormat.SetName( rNewName, true );
     else
-        rTblFmt.SetName( GetUniqueTblName(), true );
+        rTableFormat.SetName( GetUniqueTableName(), true );
 
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -173,11 +173,11 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
     {
         ++aIdx;
         SwOLENode *pNd = aIdx.GetNode().GetOLENode();
-        if( pNd && aOldName == pNd->GetChartTblName() )
+        if( pNd && aOldName == pNd->GetChartTableName() )
         {
-            pNd->SetChartTblName( rNewName );
+            pNd->SetChartTableName( rNewName );
 
-            SwTable* pTable = SwTable::FindTable( &rTblFmt );
+            SwTable* pTable = SwTable::FindTable( &rTableFormat );
             SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
             if (pPCD)
                 pPCD->InvalidateTable( pTable );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index e53e37c09409..df1886680394 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -146,11 +146,11 @@ public:
     }
 };
 
-class CompareFrmFmtText : public CompareData
+class CompareFrameFormatText : public CompareData
 {
     const SwNodeIndex &m_rIndex;
 public:
-    CompareFrmFmtText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
+    CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
         : CompareData(rD, bRecordDiff)
         , m_rIndex(rIndex)
     {
@@ -261,14 +261,14 @@ public:
 class WordArrayComparator : public ArrayComparator
 {
 private:
-    const SwTxtNode *pTxtNd1, *pTxtNd2;
+    const SwTextNode *pTextNd1, *pTextNd2;
     int *pPos1, *pPos2;
     int nCnt1, nCnt2;		// number of words
 
-    static void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
+    static void CalcPositions( int *pPos, const SwTextNode *pTextNd, int &nCnt );
 
 public:
-    WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
+    WordArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 );
     virtual ~WordArrayComparator();
 
     virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
@@ -281,17 +281,17 @@ public:
 class CharArrayComparator : public ArrayComparator
 {
 private:
-    const SwTxtNode *pTxtNd1, *pTxtNd2;
+    const SwTextNode *pTextNd1, *pTextNd2;
 
 public:
-    CharArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 )
-        : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
+    CharArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 )
+        : pTextNd1( pNode1 ), pTextNd2( pNode2 )
     {
     }
 
     virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
-    virtual int GetLen1() const SAL_OVERRIDE { return pTxtNd1->GetTxt().getLength(); }
-    virtual int GetLen2() const SAL_OVERRIDE { return pTxtNd2->GetTxt().getLength(); }
+    virtual int GetLen1() const SAL_OVERRIDE { return pTextNd1->GetText().getLength(); }
+    virtual int GetLen2() const SAL_OVERRIDE { return pTextNd2->GetText().getLength(); }
 };
 
 /// Options set in Tools->Options->Writer->Comparison
@@ -999,10 +999,10 @@ public:
     virtual sal_uLong GetHashValue() const SAL_OVERRIDE;
     virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE;
 
-    static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal );
+    static sal_uLong GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal );
     static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
-    static bool CompareTxtNd( const SwTxtNode& rDstNd,
-                              const SwTxtNode& rSrcNd );
+    static bool CompareTextNd( const SwTextNode& rDstNd,
+                              const SwTextNode& rSrcNd );
 
     bool ChangesInLine( const SwCompareLine& rLine,
                             SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const;
@@ -1030,7 +1030,7 @@ sal_uLong SwCompareLine::GetHashValue() const
     switch( rNode.GetNodeType() )
     {
     case ND_TEXTNODE:
-        nRet = GetTxtNodeHashValue( *rNode.GetTxtNode(), nRet );
+        nRet = GetTextNodeHashValue( *rNode.GetTextNode(), nRet );
         break;
 
     case ND_TABLENODE:
@@ -1039,8 +1039,8 @@ sal_uLong SwCompareLine::GetHashValue() const
             SwNodeIndex aIdx( rNode );
             while( &aIdx.GetNode() != pEndNd )
             {
-                if( aIdx.GetNode().IsTxtNode() )
-                    nRet = GetTxtNodeHashValue( *aIdx.GetNode().GetTxtNode(), nRet );
+                if( aIdx.GetNode().IsTextNode() )
+                    nRet = GetTextNodeHashValue( *aIdx.GetNode().GetTextNode(), nRet );
                 ++aIdx;
             }
         }
@@ -1097,13 +1097,13 @@ namespace
         SwNodeIndex aIdx( rNode );
         while (&aIdx.GetNode() != pEndNd)
         {
-            if (aIdx.GetNode().IsTxtNode())
+            if (aIdx.GetNode().IsTextNode())
             {
                 if (sRet.getLength())
                 {
                     sRet.append( '\n' );
                 }
-                sRet.append( aIdx.GetNode().GetTxtNode()->GetExpandTxt() );
+                sRet.append( aIdx.GetNode().GetTextNode()->GetExpandText() );
             }
             ++aIdx;
         }
@@ -1121,8 +1121,8 @@ bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
     switch( rDstNd.GetNodeType() )
     {
     case ND_TEXTNODE:
-        bRet = CompareTxtNd( *rDstNd.GetTxtNode(), *rSrcNd.GetTxtNode() )
-            && ( !CmpOptions.bUseRsid || rDstNd.GetTxtNode()->CompareParRsid( *rSrcNd.GetTxtNode() ) );
+        bRet = CompareTextNd( *rDstNd.GetTextNode(), *rSrcNd.GetTextNode() )
+            && ( !CmpOptions.bUseRsid || rDstNd.GetTextNode()->CompareParRsid( *rSrcNd.GetTextNode() ) );
         break;
 
     case ND_TABLENODE:
@@ -1210,7 +1210,7 @@ OUString SwCompareLine::GetText() const
     switch( rNode.GetNodeType() )
     {
     case ND_TEXTNODE:
-        sRet = rNode.GetTxtNode()->GetExpandTxt();
+        sRet = rNode.GetTextNode()->GetExpandText();
         break;
 
     case ND_TABLENODE:
@@ -1261,20 +1261,20 @@ OUString SwCompareLine::GetText() const
     return sRet;
 }
 
-sal_uLong SwCompareLine::GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal )
+sal_uLong SwCompareLine::GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal )
 {
-    OUString sStr( rNd.GetExpandTxt() );
+    OUString sStr( rNd.GetExpandText() );
     for( sal_Int32 n = 0; n < sStr.getLength(); ++n )
         ( nVal <<= 1 ) += sStr[ n ];
     return nVal;
 }
 
-bool SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
-                                  const SwTxtNode& rSrcNd )
+bool SwCompareLine::CompareTextNd( const SwTextNode& rDstNd,
+                                  const SwTextNode& rSrcNd )
 {
     bool bRet = false;
     // Very simple at first
-    if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
+    if( rDstNd.GetText() == rSrcNd.GetText() )
     {
         // The text is the same, but are the "special attributes" (0xFF) also the same?
         bRet = true;
@@ -1291,14 +1291,14 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
     if( ND_TEXTNODE == rNode.GetNodeType() &&
         ND_TEXTNODE == rLine.GetNode().GetNodeType() )
     {
-        SwTxtNode& rDstNd = *const_cast<SwTxtNode*>(rNode.GetTxtNode());
-        const SwTxtNode& rSrcNd = *rLine.GetNode().GetTxtNode();
+        SwTextNode& rDstNd = *const_cast<SwTextNode*>(rNode.GetTextNode());
+        const SwTextNode& rSrcNd = *rLine.GetNode().GetTextNode();
         SwDoc* pDstDoc = rDstNd.GetDoc();
 
         int nLcsLen = 0;
 
-        int nDstLen = rDstNd.GetTxt().getLength();
-        int nSrcLen = rSrcNd.GetTxt().getLength();
+        int nDstLen = rDstNd.GetText().getLength();
+        int nSrcLen = rSrcNd.GetText().getLength();
 
         int nMinLen = std::min( nDstLen , nSrcLen );
         int nAvgLen = ( nDstLen + nSrcLen )/2;
@@ -1669,7 +1669,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
             if( pTmp->GetPoint()->nContent == 0 )
             {
                 ++pTmp->GetPoint()->nNode;
-                pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+                pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
             }
             // #i101009#
             // prevent redlines that end on structural end node
@@ -1677,7 +1677,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
                 & pTmp->GetPoint()->nNode.GetNode())
             {
                 --pTmp->GetPoint()->nNode;
-                SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+                SwContentNode *const pContentNode( pTmp->GetContentNode() );
                 pTmp->GetPoint()->nContent.Assign( pContentNode,
                         (pContentNode) ? pContentNode->Len() : 0 );
             }
@@ -1701,7 +1701,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
             if( pTmp->GetPoint()->nContent == 0 )
             {
                 ++pTmp->GetPoint()->nNode;
-                pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+                pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
             }
             // #i101009#
             // prevent redlines that end on structural end node
@@ -1709,7 +1709,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
                 & pTmp->GetPoint()->nNode.GetNode())
             {
                 --pTmp->GetPoint()->nNode;
-                SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+                SwContentNode *const pContentNode( pTmp->GetContentNode() );
                 pTmp->GetPoint()->nContent.Assign( pContentNode,
                         (pContentNode) ? pContentNode->Len() : 0 );
             }
@@ -1720,14 +1720,14 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
         // combine consecutive
         if( pTmp->GetNext() != pInsRing )
         {
-            const SwCntntNode* pCNd;
+            const SwContentNode* pCNd;
             do {
                 SwPosition& rSttEnd = *pTmp->End(),
                           & rEndStt = *(pTmp->GetNext())->Start();
                 if( rSttEnd == rEndStt ||
                     (!rEndStt.nContent.GetIndex() &&
                     rEndStt.nNode.GetIndex() - 1 == rSttEnd.nNode.GetIndex() &&
-                    0 != ( pCNd = rSttEnd.nNode.GetNode().GetCntntNode() ) &&
+                    0 != ( pCNd = rSttEnd.nNode.GetNode().GetContentNode() ) &&
                     rSttEnd.nContent.GetIndex() == pCNd->Len()))
                 {
                     if( pTmp->GetNext() == pInsRing )
@@ -1774,16 +1774,16 @@ namespace
                                                   CompareDataPtr(new CompareMainText(rDestDoc))));
 
         //if we have the same number of frames then try to compare within them
-        const SwFrmFmts *pSrcFrmFmts = rSrcDoc.GetSpzFrmFmts();
-        const SwFrmFmts *pDestFrmFmts = rDestDoc.GetSpzFrmFmts();
-        if (pSrcFrmFmts->size() == pDestFrmFmts->size())
+        const SwFrameFormats *pSrcFrameFormats = rSrcDoc.GetSpzFrameFormats();
+        const SwFrameFormats *pDestFrameFormats = rDestDoc.GetSpzFrameFormats();
+        if (pSrcFrameFormats->size() == pDestFrameFormats->size())
         {
-            for (size_t i = 0; i < pSrcFrmFmts->size(); ++i)
+            for (size_t i = 0; i < pSrcFrameFormats->size(); ++i)
             {
-                const SwFrmFmt& rSrcFmt = *(*pSrcFrmFmts)[i];
-                const SwFrmFmt& rDestFmt = *(*pDestFrmFmts)[i];
-                const SwNodeIndex* pSrcIdx = rSrcFmt.GetCntnt().GetCntntIdx();
-                const SwNodeIndex* pDestIdx = rDestFmt.GetCntnt().GetCntntIdx();
+                const SwFrameFormat& rSrcFormat = *(*pSrcFrameFormats)[i];
+                const SwFrameFormat& rDestFormat = *(*pDestFrameFormats)[i];
+                const SwNodeIndex* pSrcIdx = rSrcFormat.GetContent().GetContentIdx();
+                const SwNodeIndex* pDestIdx = rDestFormat.GetContent().GetContentIdx();
                 if (!pSrcIdx && !pDestIdx)
                     continue;
                 if (!pSrcIdx || !pDestIdx)
@@ -1794,8 +1794,8 @@ namespace
                     continue;
                 if (!pSrcNode || !pDestNode)
                     break;
-                aComparisons.push_back(CompareDataPtrPair(CompareDataPtr(new CompareFrmFmtText(rSrcDoc, *pSrcIdx)),
-                                                          CompareDataPtr(new CompareFrmFmtText(rDestDoc, *pDestIdx))));
+                aComparisons.push_back(CompareDataPtrPair(CompareDataPtr(new CompareFrameFormatText(rSrcDoc, *pSrcIdx)),
+                                                          CompareDataPtr(new CompareFrameFormatText(rDestDoc, *pDestIdx))));
             }
         }
         return aComparisons;
@@ -1894,8 +1894,8 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
     SwPosition aPos( rDstNd );
 
     const SwPosition* pStt = rSrcRedl.Start();
-    if( rDstNd.IsCntntNode() )
-        aPos.nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(&rDstNd)), pStt->nContent.GetIndex() );
+    if( rDstNd.IsContentNode() )
+        aPos.nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(&rDstNd)), pStt->nContent.GetIndex() );
     pDestRedl = new SwRangeRedline( rSrcRedl.GetRedlineData(), aPos );
 
     if( nsRedlineType_t::REDLINE_DELETE == pDestRedl->GetType() )
@@ -1908,7 +1908,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
         pDestRedl->SetMark();
         pDestRedl->GetPoint()->nNode += pEnd->nNode.GetIndex() -
                                         pStt->nNode.GetIndex();
-        pDestRedl->GetPoint()->nContent.Assign( pDestRedl->GetCntntNode(),
+        pDestRedl->GetPoint()->nContent.Assign( pDestRedl->GetContentNode(),
                                                 pEnd->nContent.GetIndex() );
     }
 }
@@ -1938,7 +1938,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
         pDestRedl->SetMark();
         ++aSaveNd;
         pDestRedl->GetMark()->nNode = aSaveNd;
-        pDestRedl->GetMark()->nContent.Assign( aSaveNd.GetNode().GetCntntNode(),
+        pDestRedl->GetMark()->nContent.Assign( aSaveNd.GetNode().GetContentNode(),
                                                 nSaveCnt );
 
         if( pLastDestRedline && *pLastDestRedline->GetPoint() == *pDestRedl->GetPoint() )
@@ -1956,10 +1956,10 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
         if( !pDoc->getIDocumentRedlineAccess().GetRedline( *pDStt, &n ) && n )
             --n;
 
-        const SwRedlineTbl& rRedlineTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        for( ; n < rRedlineTbl.size(); ++n )
+        const SwRedlineTable& rRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        for( ; n < rRedlineTable.size(); ++n )
         {
-            SwRangeRedline* pRedl = rRedlineTbl[ n ];
+            SwRangeRedline* pRedl = rRedlineTable[ n ];
             SwPosition* pRStt = pRedl->Start(),
                       * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark()
                                                            : pRedl->GetPoint();
@@ -1980,7 +1980,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
 
                 case POS_COLLIDE_END:
                 case POS_BEFORE:
-                    n = rRedlineTbl.size();
+                    n = rRedlineTable.size();
                     break;
 
                 case POS_OUTSIDE:
@@ -2073,12 +2073,12 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
 
         // look for all insert redlines from the SourceDoc and determine their position in the DestDoc
         std::list<SaveMergeRedline> vRedlines;
-        const SwRedlineTbl& rSrcRedlTbl = rSrcDoc.getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rSrcRedlTable = rSrcDoc.getIDocumentRedlineAccess().GetRedlineTable();
         sal_uLong nEndOfExtra = rSrcDoc.GetNodes().GetEndOfExtras().GetIndex();
         sal_uLong nMyEndOfExtra = GetNodes().GetEndOfExtras().GetIndex();
-        for( SwRedlineTbl::size_type n = 0; n < rSrcRedlTbl.size(); ++n )
+        for( SwRedlineTable::size_type n = 0; n < rSrcRedlTable.size(); ++n )
         {
-            const SwRangeRedline* pRedl = rSrcRedlTbl[ n ];
+            const SwRangeRedline* pRedl = rSrcRedlTable[ n ];
             sal_uLong nNd = pRedl->GetPoint()->nNode.GetIndex();
             RedlineType_t eType = pRedl->GetType();
             if( nEndOfExtra < nNd &&
@@ -2140,17 +2140,17 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
         return false;
     }
 
-    const SwTxtNode *pTxtNd1 = static_cast<const SwCompareLine*>( rData1.GetLine( nFirst1 + nIdx1 ) )->GetNode().GetTxtNode();
-    const SwTxtNode *pTxtNd2 = static_cast<const SwCompareLine*>( rData2.GetLine( nFirst2 + nIdx2 ) )->GetNode().GetTxtNode();
+    const SwTextNode *pTextNd1 = static_cast<const SwCompareLine*>( rData1.GetLine( nFirst1 + nIdx1 ) )->GetNode().GetTextNode();
+    const SwTextNode *pTextNd2 = static_cast<const SwCompareLine*>( rData2.GetLine( nFirst2 + nIdx2 ) )->GetNode().GetTextNode();
 
-    if( !pTxtNd1 || !pTxtNd2
-        || ( CmpOptions.bUseRsid && !pTxtNd1->CompareParRsid( *pTxtNd2 ) ) )
+    if( !pTextNd1 || !pTextNd2
+        || ( CmpOptions.bUseRsid && !pTextNd1->CompareParRsid( *pTextNd2 ) ) )
     {
         return false;
     }
 
-    const sal_Int32 nPar1Len = pTxtNd1->Len();
-    const sal_Int32 nPar2Len = pTxtNd2->Len();
+    const sal_Int32 nPar1Len = pTextNd1->Len();
+    const sal_Int32 nPar2Len = pTextNd2->Len();
 
     if( std::min( nPar1Len, nPar2Len ) * 3 < std::max( nPar1Len, nPar2Len ) )
     {
@@ -2176,13 +2176,13 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
     for( i = 0; i < nBorderLen; i++ )
     {
-        nHash = nHash*nMul + pTxtNd1->GetTxt()[i];
+        nHash = nHash*nMul + pTextNd1->GetText()[i];
     }
     aHashes.insert( nHash );
     for( ; i < nPar1Len; i++ )
     {
-        nHash = nHash - nPow*pTxtNd1->GetTxt()[ i - nBorderLen ];
-        nHash = nHash*nMul + pTxtNd1->GetTxt()[ i ];
+        nHash = nHash - nPow*pTextNd1->GetText()[ i - nBorderLen ];
+        nHash = nHash*nMul + pTextNd1->GetText()[ i ];
 
         aHashes.insert( nHash );
     }
@@ -2190,7 +2190,7 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     nHash = 0;
     for( i = 0; i < nBorderLen; i++ )
     {
-        nHash = nHash*nMul + pTxtNd2->GetTxt()[ i ];
+        nHash = nHash*nMul + pTextNd2->GetText()[ i ];
     }
 
     if( aHashes.find( nHash ) != aHashes.end() )
@@ -2200,8 +2200,8 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
 
     for( ; i < nPar2Len; i++ )
     {
-        nHash = nHash - nPow*pTxtNd2->GetTxt()[ i - nBorderLen ];
-        nHash = nHash*nMul + pTxtNd2->GetTxt()[ i ];
+        nHash = nHash - nPow*pTextNd2->GetText()[ i - nBorderLen ];
+        nHash = nHash*nMul + pTextNd2->GetText()[ i ];
         if( aHashes.find( nHash ) != aHashes.end() )
         {
             return true;
@@ -2219,19 +2219,19 @@ bool CharArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
 
     return ( !CmpOptions.bUseRsid
-            || pTxtNd1->CompareRsid(  *pTxtNd2, nIdx1 + 1, nIdx2 + 1 ) )
-            && pTxtNd1->GetTxt()[ nIdx1 ] == pTxtNd2->GetTxt()[ nIdx2 ];
+            || pTextNd1->CompareRsid(  *pTextNd2, nIdx1 + 1, nIdx2 + 1 ) )
+            && pTextNd1->GetText()[ nIdx1 ] == pTextNd2->GetText()[ nIdx2 ];
 }
 
-WordArrayComparator::WordArrayComparator( const SwTxtNode *pNode1,
-                                            const SwTxtNode *pNode2 )
-    : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
+WordArrayComparator::WordArrayComparator( const SwTextNode *pNode1,
+                                            const SwTextNode *pNode2 )
+    : pTextNd1( pNode1 ), pTextNd2( pNode2 )
 {
-    pPos1 = new int[ pTxtNd1->GetTxt().getLength() + 1 ];
-    pPos2 = new int[ pTxtNd2->GetTxt().getLength() + 1 ];
+    pPos1 = new int[ pTextNd1->GetText().getLength() + 1 ];
+    pPos2 = new int[ pTextNd2->GetText().getLength() + 1 ];
 
-    CalcPositions( pPos1, pTxtNd1, nCnt1 );
-    CalcPositions( pPos2, pTxtNd2, nCnt2 );
+    CalcPositions( pPos1, pTextNd1, nCnt1 );
+    CalcPositions( pPos2, pTextNd2, nCnt2 );
 }
 
 WordArrayComparator::~WordArrayComparator()
@@ -2249,9 +2249,9 @@ bool WordArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
     for( int i = 0; i < nLen; i++)
     {
-        if( pTxtNd1->GetTxt()[ pPos1[ nIdx1 ] + i ]
-            != pTxtNd2->GetTxt()[ pPos2[ nIdx2 ] + i ]
-            || ( CmpOptions.bUseRsid && !pTxtNd1->CompareRsid( *pTxtNd2,
+        if( pTextNd1->GetText()[ pPos1[ nIdx1 ] + i ]
+            != pTextNd2->GetText()[ pPos2[ nIdx2 ] + i ]
+            || ( CmpOptions.bUseRsid && !pTextNd1->CompareRsid( *pTextNd2,
                                 pPos1[ nIdx1 ] + i, pPos2[ nIdx2 ] + i ) ) )
         {
             return false;
@@ -2277,8 +2277,8 @@ int WordArrayComparator::GetCharSequence( const int *pWordLcs1,
             pSubseq1[ nLen ] = pPos1[ pWordLcs1[i] ] + j;
             pSubseq2[ nLen ] = pPos2[ pWordLcs2[i] ] + j;
 
-            if( pTxtNd1->GetTxt()[ pPos1[ pWordLcs1[i] ] + j ]
-             != pTxtNd2->GetTxt()[ pPos2[ pWordLcs2[i] ] + j ] )
+            if( pTextNd1->GetText()[ pPos1[ pWordLcs1[i] ] + j ]
+             != pTextNd2->GetText()[ pPos2[ pWordLcs2[i] ] + j ] )
             {
                 nLen -= j;
                 break;
@@ -2290,15 +2290,15 @@ int WordArrayComparator::GetCharSequence( const int *pWordLcs1,
     return nLen;
 }
 
-void WordArrayComparator::CalcPositions( int *pPos, const SwTxtNode *pTxtNd,
+void WordArrayComparator::CalcPositions( int *pPos, const SwTextNode *pTextNd,
                                          int &nCnt )
 {
     nCnt = -1;
-    for (int i = 0; i <= pTxtNd->GetTxt().getLength(); ++i)
+    for (int i = 0; i <= pTextNd->GetText().getLength(); ++i)
     {
-        if (i == 0 || i == pTxtNd->GetTxt().getLength()
-                    || !isalnum( pTxtNd->GetTxt()[ i - 1 ])
-                    || !isalnum( pTxtNd->GetTxt()[ i ]))
+        if (i == 0 || i == pTextNd->GetText().getLength()
+                    || !isalnum( pTextNd->GetText()[ i - 1 ])
+                    || !isalnum( pTextNd->GetText()[ i ]))
         { // Begin new word
             nCnt++;
             pPos[ nCnt ] = i;
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 76aae573d962..dd260292d5bd 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -117,13 +117,13 @@ void PaMCorrAbs( const SwPaM& rRange,
             }
 
             if( pCrsrShell->IsTableMode() )
-                lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCrsrShell->GetTblCrs()), aStart, aEnd, aNewPos );
+                lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCrsrShell->GetTableCrs()), aStart, aEnd, aNewPos );
         }
     }
     {
-        SwUnoCrsrTbl& rTbl = const_cast<SwUnoCrsrTbl&>(pDoc->GetUnoCrsrTbl());
+        SwUnoCrsrTable& rTable = const_cast<SwUnoCrsrTable&>(pDoc->GetUnoCrsrTable());
 
-        for( SwUnoCrsrTbl::iterator it = rTbl.begin(); it != rTbl.end(); ++it )
+        for( SwUnoCrsrTable::iterator it = rTable.begin(); it != rTable.end(); ++it )
         {
             SwUnoCrsr *const pUnoCursor = *it;
 
@@ -142,11 +142,11 @@ void PaMCorrAbs( const SwPaM& rRange,
                 bChange |= lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
             }
 
-            SwUnoTableCrsr *const pUnoTblCrsr =
+            SwUnoTableCrsr *const pUnoTableCrsr =
                 dynamic_cast<SwUnoTableCrsr *>(*it);
-            if( pUnoTblCrsr )
+            if( pUnoTableCrsr )
             {
-                for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+                for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
                 {
                     bChange |=
                         lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
@@ -170,27 +170,27 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
     const sal_Int32 nOffset,
     bool bMoveCrsr)
 {
-    SwCntntNode *const pCntntNode( rOldNode.GetNode().GetCntntNode() );
+    SwContentNode *const pContentNode( rOldNode.GetNode().GetContentNode() );
     SwPaM const aPam(rOldNode, 0,
-                     rOldNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                     rOldNode, (pContentNode) ? pContentNode->Len() : 0);
     SwPosition aNewPos(rNewPos);
     aNewPos.nContent += nOffset;
 
     getIDocumentMarkAccess()->correctMarksAbsolute(rOldNode, rNewPos, nOffset);
     // fix redlines
     {
-        SwRedlineTbl& rTbl = getIDocumentRedlineAccess().GetRedlineTbl();
-        for (SwRedlineTbl::size_type n = 0; n < rTbl.size(); )
+        SwRedlineTable& rTable = getIDocumentRedlineAccess().GetRedlineTable();
+        for (SwRedlineTable::size_type n = 0; n < rTable.size(); )
         {
             // is on position ??
-            SwRangeRedline *const pRedline( rTbl[ n ] );
+            SwRangeRedline *const pRedline( rTable[ n ] );
             bool const bChanged =
                 lcl_PaMCorrAbs(*pRedline, *aPam.Start(), *aPam.End(), aNewPos);
             // clean up empty redlines: docredln.cxx asserts these as invalid
             if (bChanged && (*pRedline->GetPoint() == *pRedline->GetMark())
                          && (pRedline->GetContentIdx() == NULL))
             {
-                rTbl.DeleteAndDestroy(n);
+                rTable.DeleteAndDestroy(n);
             }
             else
             {
@@ -198,7 +198,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
             }
         }
 
-        // To-Do - need to add here 'SwExtraRedlineTbl' also ?
+        // To-Do - need to add here 'SwExtraRedlineTable' also ?
     }
 
     if(bMoveCrsr)
@@ -232,9 +232,9 @@ void SwDoc::CorrAbs(
 
     if(bMoveCrsr)
     {
-        SwCntntNode *const pCntntNode( rEndNode.GetNode().GetCntntNode() );
+        SwContentNode *const pContentNode( rEndNode.GetNode().GetContentNode() );
         SwPaM const aPam(rStartNode, 0,
-                         rEndNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                         rEndNode, (pContentNode) ? pContentNode->Len() : 0);
         ::PaMCorrAbs(aPam, rNewPos);
     }
 }
@@ -271,23 +271,23 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
             }
 
             if( pCrsrShell->IsTableMode() )
-                lcl_PaMCorrRel1( pCrsrShell->GetTblCrs(), pOldNode, aNewPos, nCntIdx );
+                lcl_PaMCorrRel1( pCrsrShell->GetTableCrs(), pOldNode, aNewPos, nCntIdx );
        }
     }
     {
-        SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
-        for( SwUnoCrsrTbl::iterator it = rTbl.begin(); it != rTbl.end(); ++it )
+        SwUnoCrsrTable& rTable = (SwUnoCrsrTable&)pDoc->GetUnoCrsrTable();
+        for( SwUnoCrsrTable::iterator it = rTable.begin(); it != rTable.end(); ++it )
         {
             for(SwPaM& rPaM : (*it)->GetRingContainer())
             {
                 lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
             }
 
-            SwUnoTableCrsr* pUnoTblCrsr =
+            SwUnoTableCrsr* pUnoTableCrsr =
                 dynamic_cast<SwUnoTableCrsr*>(*it);
-            if( pUnoTblCrsr )
+            if( pUnoTableCrsr )
             {
-                for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+                for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
                 {
                     lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
                 }
@@ -304,15 +304,15 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
     getIDocumentMarkAccess()->correctMarksRelative(rOldNode, rNewPos, nOffset);
 
     { // fix the Redlines
-        SwRedlineTbl& rTbl = getIDocumentRedlineAccess().GetRedlineTbl();
+        SwRedlineTable& rTable = getIDocumentRedlineAccess().GetRedlineTable();
         SwPosition aNewPos(rNewPos);
-        for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+        for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
         {
             // lies on the position ??
-            lcl_PaMCorrRel1( rTbl[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() + nOffset );
+            lcl_PaMCorrRel1( rTable[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() + nOffset );
         }
 
-        // To-Do - need to add here 'SwExtraRedlineTbl' also ?
+        // To-Do - need to add here 'SwExtraRedlineTable' also ?
     }
 
     if(bMoveCrsr)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index fe6023b893ce..e24c4fa32279 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -62,18 +62,18 @@
 
 using namespace com::sun::star;
 
-static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
-                                SwFrmFmt &rFmt1,
-                                SwFrmFmt &rFmt2,
-                                SwFrmFmt &rFmt3,
-                                SwFrmFmt &rFmt4)
+static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId,
+                                SwFrameFormat &rFormat1,
+                                SwFrameFormat &rFormat2,
+                                SwFrameFormat &rFormat3,
+                                SwFrameFormat &rFormat4)
 {
     // --> #i41075# Printer on demand
     // This function does not require a printer anymore.
     // The default page size is obtained from the application
     //locale
 
-    SwFmtFrmSize aFrmSize( ATT_FIX_SIZE );
+    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE );
     const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();
     aFrmSize.SetSize( aPhysSize );
 
@@ -87,7 +87,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
     // In the long term, this needs to be changed to always keep the
     // margins from the page desc.
     sal_Int32 nMinTop, nMinBottom, nMinLeft, nMinRight;
-    if( RES_POOLPAGE_HTML == nPoolFmtId )
+    if( RES_POOLPAGE_HTML == nPoolFormatId )
     {
         nMinRight = nMinTop = nMinBottom = GetMetricVal( CM_1 );
         nMinLeft = nMinRight * 2;
@@ -111,24 +111,24 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
     aLR.SetRight( nMinRight );
     aLR.SetLeft( nMinLeft );
 
-    rFmt1.SetFmtAttr( aFrmSize );
-    rFmt1.SetFmtAttr( aLR );
-    rFmt1.SetFmtAttr( aUL );
+    rFormat1.SetFormatAttr( aFrmSize );
+    rFormat1.SetFormatAttr( aLR );
+    rFormat1.SetFormatAttr( aUL );
 
-    rFmt2.SetFmtAttr( aFrmSize );
-    rFmt2.SetFmtAttr( aLR );
-    rFmt2.SetFmtAttr( aUL );
+    rFormat2.SetFormatAttr( aFrmSize );
+    rFormat2.SetFormatAttr( aLR );
+    rFormat2.SetFormatAttr( aUL );
 
-    rFmt3.SetFmtAttr( aFrmSize );
-    rFmt3.SetFmtAttr( aLR );
-    rFmt3.SetFmtAttr( aUL );
+    rFormat3.SetFormatAttr( aFrmSize );
+    rFormat3.SetFormatAttr( aLR );
+    rFormat3.SetFormatAttr( aUL );
 
-    rFmt4.SetFmtAttr( aFrmSize );
-    rFmt4.SetFmtAttr( aLR );
-    rFmt4.SetFmtAttr( aUL );
+    rFormat4.SetFormatAttr( aFrmSize );
+    rFormat4.SetFormatAttr( aLR );
+    rFormat4.SetFormatAttr( aUL );
 }
 
-static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
+static void lcl_DescSetAttr( const SwFrameFormat &rSource, SwFrameFormat &rDest,
                          const bool bPage = true )
 {
     // We should actually use ItemSet's Intersect here, but that doesn't work
@@ -169,7 +169,7 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
                     // All in aIdArr except from RES_HEADER_FOOTER_EAT_SPACING
                     case RES_HEADER_FOOTER_EAT_SPACING:
                     //UUUU take out SvxBrushItem; it's the result of the fallback
-                    // at SwFmt::GetItemState and not really in state SfxItemState::SET
+                    // at SwFormat::GetItemState and not really in state SfxItemState::SET
                     case RES_BACKGROUND:
                         bExecuteId = false;
                         break;
@@ -196,25 +196,25 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
             {
                 if (SfxItemState::SET == rSource.GetItemState(nId, false, &pItem))
                 {
-                    rDest.SetFmtAttr(*pItem);
+                    rDest.SetFormatAttr(*pItem);
                 }
                 else
                 {
-                    rDest.ResetFmtAttr(nId);
+                    rDest.ResetFormatAttr(nId);
                 }
             }
         }
     }
 
     // Transmit pool and help IDs too
-    rDest.SetPoolFmtId( rSource.GetPoolFmtId() );
+    rDest.SetPoolFormatId( rSource.GetPoolFormatId() );
     rDest.SetPoolHelpId( rSource.GetPoolHelpId() );
     rDest.SetPoolHlpFileId( rSource.GetPoolHlpFileId() );
 }
 
 namespace
 {
-    SwFrmFmt& getFrmFmt(SwPageDesc &rDesc, bool bLeft, bool bFirst)
+    SwFrameFormat& getFrameFormat(SwPageDesc &rDesc, bool bLeft, bool bFirst)
     {
         if (bFirst)
         {
@@ -225,20 +225,20 @@ namespace
         return rDesc.GetLeft();
     }
 
-    const SwFrmFmt& getConstFrmFmt(const SwPageDesc &rDesc, bool bLeft, bool bFirst)
+    const SwFrameFormat& getConstFrameFormat(const SwPageDesc &rDesc, bool bLeft, bool bFirst)
     {
-        return getFrmFmt(const_cast<SwPageDesc&>(rDesc), bLeft, bFirst);
+        return getFrameFormat(const_cast<SwPageDesc&>(rDesc), bLeft, bFirst);
     }
 }
 
-void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst)
+void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst)
 {
     assert(bLeft || bFirst);
-    SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
+    SwFrameFormat& rDescFrameFormat = getFrameFormat(rDesc, bLeft, bFirst);
     if (bFirst && bLeft)
     {
         // special case: always shared with something
-        rDescFrmFmt.SetFmtAttr( rChged.IsFirstShared()
+        rDescFrameFormat.SetFormatAttr( rChged.IsFirstShared()
                 ? rDesc.GetLeft().GetHeader()
                 : rDesc.GetFirstMaster().GetHeader());
     }
@@ -246,72 +246,72 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
          || !rHead.IsActive())
     {
         // Left or first shares the header with the Master.
-        rDescFrmFmt.SetFmtAttr( rDesc.GetMaster().GetHeader() );
+        rDescFrameFormat.SetFormatAttr( rDesc.GetMaster().GetHeader() );
     }
     else if ( rHead.IsActive() )
     {   // Left or first gets its own header if the Format doesn't alrady have one.
         // If it already has one and it points to the same Section as the
         // Right one, it needs to get an own Header.
         // The content is evidently copied.
-        const SwFmtHeader &rFmtHead = rDescFrmFmt.GetHeader();
-        if ( !rFmtHead.IsActive() )
+        const SwFormatHeader &rFormatHead = rDescFrameFormat.GetHeader();
+        if ( !rFormatHead.IsActive() )
         {
-            SwFmtHeader aHead( getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_HEADERL, 0 ) );
-            rDescFrmFmt.SetFmtAttr( aHead );
+            SwFormatHeader aHead( getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_HEADERL, 0 ) );
+            rDescFrameFormat.SetFormatAttr( aHead );
             // take over additional attributes (margins, borders ...)
-            ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), false);
+            ::lcl_DescSetAttr( *rHead.GetHeaderFormat(), *aHead.GetHeaderFormat(), false);
         }
         else
         {
-            const SwFrmFmt *pRight = rHead.GetHeaderFmt();
-            const SwFmtCntnt &aRCnt = pRight->GetCntnt();
-            const SwFmtCntnt &aCnt = rFmtHead.GetHeaderFmt()->GetCntnt();
+            const SwFrameFormat *pRight = rHead.GetHeaderFormat();
+            const SwFormatContent &aRCnt = pRight->GetContent();
+            const SwFormatContent &aCnt = rFormatHead.GetHeaderFormat()->GetContent();
 
-            if (!aCnt.GetCntntIdx())
+            if (!aCnt.GetContentIdx())
             {
-                const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
-                rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
+                const SwFrameFormat& rChgedFrameFormat = getConstFrameFormat(rChged, bLeft, bFirst);
+                rDescFrameFormat.SetFormatAttr( rChgedFrameFormat.GetHeader() );
             }
-            else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) ||
-                // The CntntIdx is _always_ different when called from
+            else if ((*aRCnt.GetContentIdx() == *aCnt.GetContentIdx()) ||
+                // The ContentIdx is _always_ different when called from
                 // SwDocStyleSheet::SetItemSet, because it deep-copies the
                 // PageDesc.  So check if it was previously shared.
                  ((bFirst) ? rDesc.IsFirstShared() : rDesc.IsHeaderShared()))
             {
-                SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(),
+                SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(),
                         (bFirst) ? "First header" : "Left header",
-                                                GetDfltFrmFmt() );
-                ::lcl_DescSetAttr( *pRight, *pFmt, false );
+                                                GetDfltFrameFormat() );
+                ::lcl_DescSetAttr( *pRight, *pFormat, false );
                 // The section which the right header attribute is pointing
                 // is copied, and the Index to the StartNode is set to
                 // the left or first header attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwHeaderStartNode );
-                SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
-                            *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
+                SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
+                            *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
                 GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
-                pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ) );
-                rDescFrmFmt.SetFmtAttr( SwFmtHeader( pFmt ) );
+                pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
+                rDescFrameFormat.SetFormatAttr( SwFormatHeader( pFormat ) );
             }
             else
                 ::lcl_DescSetAttr( *pRight,
-                               *const_cast<SwFrmFmt*>(rFmtHead.GetHeaderFmt()), false );
+                               *const_cast<SwFrameFormat*>(rFormatHead.GetHeaderFormat()), false );
         }
     }
 }
 
-void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst)
+void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst)
 {
     assert(bLeft || bFirst);
-    SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
+    SwFrameFormat& rDescFrameFormat = getFrameFormat(rDesc, bLeft, bFirst);
     if (bFirst && bLeft)
     {
         // special case: always shared with something
-        rDescFrmFmt.SetFmtAttr( rChged.IsFirstShared()
+        rDescFrameFormat.SetFormatAttr( rChged.IsFirstShared()
                 ? rDesc.GetLeft().GetFooter()
                 : rDesc.GetFirstMaster().GetFooter());
     }
@@ -319,59 +319,59 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
         || !rFoot.IsActive())
     {
         // Left or first shares the Header with the Master.
-        rDescFrmFmt.SetFmtAttr( rDesc.GetMaster().GetFooter() );
+        rDescFrameFormat.SetFormatAttr( rDesc.GetMaster().GetFooter() );
     }
     else if ( rFoot.IsActive() )
     {   // Left or first gets its own Footer if the Format does not already have one.
         // If the Format already has a Footer and it points to the same section as the Right one,
         // it needs to get an own one.
         // The content is evidently copied.
-        const SwFmtFooter &rFmtFoot = rDescFrmFmt.GetFooter();
-        if ( !rFmtFoot.IsActive() )
+        const SwFormatFooter &rFormatFoot = rDescFrameFormat.GetFooter();
+        if ( !rFormatFoot.IsActive() )
         {
-            SwFmtFooter aFoot( getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
-            rDescFrmFmt.SetFmtAttr( aFoot );
+            SwFormatFooter aFoot( getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_FOOTER, 0 ) );
+            rDescFrameFormat.SetFormatAttr( aFoot );
             // Take over additional attributes (margins, borders ...).
-            ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), false);
+            ::lcl_DescSetAttr( *rFoot.GetFooterFormat(), *aFoot.GetFooterFormat(), false);
         }
         else
         {
-            const SwFrmFmt *pRight = rFoot.GetFooterFmt();
-            const SwFmtCntnt &aRCnt = pRight->GetCntnt();
-            const SwFmtCntnt &aLCnt = rFmtFoot.GetFooterFmt()->GetCntnt();
-            if( !aLCnt.GetCntntIdx() )
+            const SwFrameFormat *pRight = rFoot.GetFooterFormat();
+            const SwFormatContent &aRCnt = pRight->GetContent();
+            const SwFormatContent &aLCnt = rFormatFoot.GetFooterFormat()->GetContent();
+            if( !aLCnt.GetContentIdx() )
             {
-                const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
-                rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() );
+                const SwFrameFormat& rChgedFrameFormat = getConstFrameFormat(rChged, bLeft, bFirst);
+                rDescFrameFormat.SetFormatAttr( rChgedFrameFormat.GetFooter() );
             }
-            else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) ||
-                // The CntntIdx is _always_ different when called from
+            else if ((*aRCnt.GetContentIdx() == *aLCnt.GetContentIdx()) ||
+                // The ContentIdx is _always_ different when called from
                 // SwDocStyleSheet::SetItemSet, because it deep-copies the
                 // PageDesc.  So check if it was previously shared.
                  ((bFirst) ? rDesc.IsFirstShared() : rDesc.IsFooterShared()))
             {
-                SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(),
+                SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(),
                         (bFirst) ? "First footer" : "Left footer",
-                                                GetDfltFrmFmt() );
-                ::lcl_DescSetAttr( *pRight, *pFmt, false );
+                                                GetDfltFrameFormat() );
+                ::lcl_DescSetAttr( *pRight, *pFormat, false );
                 // The section to which the right footer attribute is pointing
                 // is copied, and the Index to the StartNode is set to
                 // the left footer attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwFooterStartNode );
-                SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
-                            *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
+                SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
+                            *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
                 GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
-                pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ) );
-                rDescFrmFmt.SetFmtAttr( SwFmtFooter( pFmt ) );
+                pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
+                rDescFrameFormat.SetFormatAttr( SwFormatFooter( pFormat ) );
             }
             else
                 ::lcl_DescSetAttr( *pRight,
-                               *const_cast<SwFrmFmt*>(rFmtFoot.GetFooterFmt()), false );
+                               *const_cast<SwFrameFormat*>(rFormatFoot.GetFooterFormat()), false );
         }
     }
 }
@@ -409,17 +409,17 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     {
         rDesc.SetNumType( rChged.GetNumType() );
         // Notify page number fields that NumFormat has changed
-        getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
-        getIDocumentFieldsAccess().GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
+        getIDocumentFieldsAccess().GetSysFieldType( RES_PAGENUMBERFLD )->UpdateFields();
+        getIDocumentFieldsAccess().GetSysFieldType( RES_REFPAGEGETFLD )->UpdateFields();
 
         // If the numbering scheme has changed we could have QuoVadis/ErgoSum texts
         // that refer to a changed page, so we invalidate foot notes.
-        SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-        for( SwFtnIdxs::size_type nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+        SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+        for( SwFootnoteIdxs::size_type nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
         {
-            SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+            SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
         }
     }
 
@@ -430,35 +430,35 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     bool bHeaderFooterChanged = false;
 
     // Synch header.
-    const SwFmtHeader &rHead = rChged.GetMaster().GetHeader();
+    const SwFormatHeader &rHead = rChged.GetMaster().GetHeader();
     if (undoGuard.UndoWasEnabled())
     {
         // #i46909# no undo if header or footer changed
         // Did something change in the nodes?
-        const SwFmtHeader &rOldHead = rDesc.GetMaster().GetHeader();
+        const SwFormatHeader &rOldHead = rDesc.GetMaster().GetHeader();
         bHeaderFooterChanged |=
             ( rHead.IsActive() != rOldHead.IsActive() ||
               rChged.IsHeaderShared() != rDesc.IsHeaderShared() ||
               rChged.IsFirstShared() != rDesc.IsFirstShared() );
     }
-    rDesc.GetMaster().SetFmtAttr( rHead );
+    rDesc.GetMaster().SetFormatAttr( rHead );
     CopyMasterHeader(rChged, rHead, rDesc, true, false); // Copy left header
     CopyMasterHeader(rChged, rHead, rDesc, false, true); // Copy first master
     CopyMasterHeader(rChged, rHead, rDesc, true, true);  // Copy first left
     rDesc.ChgHeaderShare( rChged.IsHeaderShared() );
 
     // Synch Footer.
-    const SwFmtFooter &rFoot = rChged.GetMaster().GetFooter();
+    const SwFormatFooter &rFoot = rChged.GetMaster().GetFooter();
     if (undoGuard.UndoWasEnabled())
     {
         // #i46909# no undo if header or footer changed
         // Did something change in the Nodes?
-        const SwFmtFooter &rOldFoot = rDesc.GetMaster().GetFooter();
+        const SwFormatFooter &rOldFoot = rDesc.GetMaster().GetFooter();
         bHeaderFooterChanged |=
             ( rFoot.IsActive() != rOldFoot.IsActive() ||
               rChged.IsFooterShared() != rDesc.IsFooterShared() );
     }
-    rDesc.GetMaster().SetFmtAttr( rFoot );
+    rDesc.GetMaster().SetFormatAttr( rFoot );
     CopyMasterFooter(rChged, rFoot, rDesc, true, false); // Copy left footer
     CopyMasterFooter(rChged, rFoot, rDesc, false, true); // Copy first master
     CopyMasterFooter(rChged, rFoot, rDesc, true, true);  // Copy first left
@@ -470,7 +470,7 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
         rDesc.SetName( rChged.GetName() );
 
     // A RegisterChange is triggered, if necessary
-    rDesc.SetRegisterFmtColl( rChged.GetRegisterFmtColl() );
+    rDesc.SetRegisterFormatColl( rChged.GetRegisterFormatColl() );
 
     // If UseOn or the Follow change, the paragraphs need to know about it.
     bool bUseOn  = false;
@@ -511,9 +511,9 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     ::lcl_DescSetAttr( rChged.GetFirstLeft(), rDesc.GetFirstLeft() );
 
     // If the FootnoteInfo changes, the pages are triggered.
-    if( !(rDesc.GetFtnInfo() == rChged.GetFtnInfo()) )
+    if( !(rDesc.GetFootnoteInfo() == rChged.GetFootnoteInfo()) )
     {
-        rDesc.SetFtnInfo( rChged.GetFtnInfo() );
+        rDesc.SetFootnoteInfo( rChged.GetFootnoteInfo() );
         sw::PageFootnoteHint aHint;
         rDesc.GetMaster().CallSwClientNotify(aHint);
         rDesc.GetLeft().CallSwClientNotify(aHint);
@@ -541,11 +541,11 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
 
     //h/f of first-left page must not be unique but same as first master or left
     assert((rDesc.IsFirstShared())
-        ? rDesc.GetFirstLeft().GetHeader().GetHeaderFmt() == rDesc.GetLeft().GetHeader().GetHeaderFmt()
-        : rDesc.GetFirstLeft().GetHeader().GetHeaderFmt() == rDesc.GetFirstMaster().GetHeader().GetHeaderFmt());
+        ? rDesc.GetFirstLeft().GetHeader().GetHeaderFormat() == rDesc.GetLeft().GetHeader().GetHeaderFormat()
+        : rDesc.GetFirstLeft().GetHeader().GetHeaderFormat() == rDesc.GetFirstMaster().GetHeader().GetHeaderFormat());
     assert((rDesc.IsFirstShared())
-        ? rDesc.GetFirstLeft().GetFooter().GetFooterFmt() == rDesc.GetLeft().GetFooter().GetFooterFmt()
-        : rDesc.GetFirstLeft().GetFooter().GetFooterFmt() == rDesc.GetFirstMaster().GetFooter().GetFooterFmt());
+        ? rDesc.GetFirstLeft().GetFooter().GetFooterFormat() == rDesc.GetLeft().GetFooter().GetFooterFormat()
+        : rDesc.GetFirstLeft().GetFooter().GetFooterFormat() == rDesc.GetFirstMaster().GetFooter().GetFooterFormat());
 }
 
 /// All descriptors whose Follow point to the to-be-deleted have to be adapted.
@@ -560,13 +560,13 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
     pDel->CallSwClientNotify( aHint );
 
     bool bHasLayout = getIDocumentLayoutAccess().HasLayout();
-    if ( mpFtnInfo->DependsOn( pDel ) )
+    if ( mpFootnoteInfo->DependsOn( pDel ) )
     {
-        mpFtnInfo->ChgPageDesc( &maPageDescs[0] );
+        mpFootnoteInfo->ChgPageDesc( &maPageDescs[0] );
         if ( bHasLayout )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), false));
         }
     }
     else if ( mpEndNoteInfo->DependsOn( pDel ) )
@@ -575,7 +575,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
         if ( bHasLayout )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), true));
         }
     }
 
@@ -646,25 +646,25 @@ SwPageDesc* SwDoc::MakePageDesc(const OUString &rName, const SwPageDesc *pCpy,
         pNew->SetName( rName );
         if( rName != pCpy->GetName() )
         {
-            pNew->SetPoolFmtId( USHRT_MAX );
+            pNew->SetPoolFormatId( USHRT_MAX );
             pNew->SetPoolHelpId( USHRT_MAX );
             pNew->SetPoolHlpFileId( UCHAR_MAX );
         }
     }
     else
     {
-        pNew = new SwPageDesc( rName, GetDfltFrmFmt(), this );
+        pNew = new SwPageDesc( rName, GetDfltFrameFormat(), this );
         // Set the default page format.
-        lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft(), pNew->GetFirstMaster(), pNew->GetFirstLeft() );
+        lcl_DefaultPageFormat( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft(), pNew->GetFirstMaster(), pNew->GetFirstLeft() );
 
         SvxFrameDirection aFrameDirection = bRegardLanguage ?
             GetDefaultFrameDirection(GetAppLanguage())
             : FRMDIR_HORI_LEFT_TOP;
 
-        pNew->GetMaster().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetFirstMaster().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetFirstLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetMaster().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetLeft().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetFirstMaster().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetFirstLeft().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
     }
     maPageDescs.push_back( pNew );
 
@@ -722,7 +722,7 @@ void SwDoc::PrtOLENotify( bool bAll )
 
         mbOLEPrtNotifyPending = mbAllOLENotify = false;
 
-        SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), !bAll );
+        SwOLENodes *pNodes = SwContentNode::CreateOLENodesArray( *GetDfltGrfFormatColl(), !bAll );
         if ( pNodes )
         {
             ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
@@ -779,7 +779,7 @@ IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *, void )
     {
         mbOLEPrtNotifyPending = mbAllOLENotify = false;
 
-        SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), true );
+        SwOLENodes *pNodes = SwContentNode::CreateOLENodesArray( *GetDfltGrfFormatColl(), true );
         if( pNodes )
         {
             ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
@@ -882,17 +882,17 @@ void SwDoc::ChgPageDesc( const OUString & rName, const SwPageDesc & rDesc)
  * know why. This function is meant to check the page descriptors for invalid
  * values.
  */
-void SwDoc::CheckDefaultPageFmt()
+void SwDoc::CheckDefaultPageFormat()
 {
     for ( size_t i = 0; i < GetPageDescCnt(); ++i )
     {
         SwPageDesc& rDesc = GetPageDesc( i );
 
-        SwFrmFmt& rMaster = rDesc.GetMaster();
-        SwFrmFmt& rLeft   = rDesc.GetLeft();
+        SwFrameFormat& rMaster = rDesc.GetMaster();
+        SwFrameFormat& rLeft   = rDesc.GetLeft();
 
-        const SwFmtFrmSize& rMasterSize  = rMaster.GetFrmSize();
-        const SwFmtFrmSize& rLeftSize    = rLeft.GetFrmSize();
+        const SwFormatFrmSize& rMasterSize  = rMaster.GetFrmSize();
+        const SwFormatFrmSize& rLeftSize    = rLeft.GetFrmSize();
 
         const bool bSetSize = LONG_MAX == rMasterSize.GetWidth() ||
                               LONG_MAX == rMasterSize.GetHeight() ||
@@ -900,7 +900,7 @@ void SwDoc::CheckDefaultPageFmt()
                               LONG_MAX == rLeftSize.GetHeight();
 
         if ( bSetSize )
-            lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );
+            lcl_DefaultPageFormat( rDesc.GetPoolFormatId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );
     }
 }
 
@@ -920,13 +920,13 @@ void SwDoc::SetDefaultPageMode(bool bSquaredPageMode)
     {
         SwPageDesc& rDesc = GetPageDesc( i );
 
-        SwFrmFmt& rMaster = rDesc.GetMaster();
-        SwFrmFmt& rLeft = rDesc.GetLeft();
+        SwFrameFormat& rMaster = rDesc.GetMaster();
+        SwFrameFormat& rLeft = rDesc.GetLeft();
 
-        SwTextGridItem aGrid(static_cast<const SwTextGridItem&>(rMaster.GetFmtAttr(RES_TEXTGRID)));
+        SwTextGridItem aGrid(static_cast<const SwTextGridItem&>(rMaster.GetFormatAttr(RES_TEXTGRID)));
         aGrid.SwitchPaperMode( bSquaredPageMode );
-        rMaster.SetFmtAttr(aGrid);
-        rLeft.SetFmtAttr(aGrid);
+        rMaster.SetFormatAttr(aGrid);
+        rLeft.SetFormatAttr(aGrid);
     }
 }
 
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 5324063eec6c..85dd7b2d102f 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star::linguistic2;
  * Used for a newly formed group object <SwDoc::GroupSelection(..)>
  * and the members of a destroyed group <SwDoc::UnGroupSelection(..)>
  */
-static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
+static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat,
                                 const SdrObject& _rSdrObj )
 {
     const SwContact* pContact = GetUserCall( &_rSdrObj );
@@ -90,8 +90,8 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
     {
         const SwFrm* pAnchorFrm = pContact->GetAnchoredObj( &_rSdrObj )->GetAnchorFrm();
         OSL_ENSURE( !pAnchorFrm ||
-                !pAnchorFrm->IsTxtFrm() ||
-                !static_cast<const SwTxtFrm*>(pAnchorFrm)->IsFollow(),
+                !pAnchorFrm->IsTextFrm() ||
+                !static_cast<const SwTextFrm*>(pAnchorFrm)->IsFollow(),
                 "<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow. Please inform OD." );
         bool bVert = false;
         bool bR2L = false;
@@ -111,7 +111,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
             // If no anchor frame exist - e.g. because no layout exists - the
             // default layout direction is taken.
             const SvxFrameDirectionItem* pDirItem =
-                static_cast<const SvxFrameDirectionItem*>(&(_pFrmFmt->GetAttrSet().GetPool()->GetDefaultItem( RES_FRAMEDIR )));
+                static_cast<const SvxFrameDirectionItem*>(&(_pFrameFormat->GetAttrSet().GetPool()->GetDefaultItem( RES_FRAMEDIR )));
             switch ( pDirItem->GetValue() )
             {
                 case FRMDIR_VERT_TOP_LEFT:
@@ -173,10 +173,10 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
         }
     }
 
-    _pFrmFmt->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-    _pFrmFmt->SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+    _pFrameFormat->SetFormatAttr( SwFormatHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+    _pFrameFormat->SetFormatAttr( SwFormatVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
     // #i44334#, #i44681# - positioning attributes already set
-    _pFrmFmt->PosAttrSet();
+    _pFrameFormat->PosAttrSet();
     // #i34750# - keep current object rectangle for  drawing
     // objects. The object rectangle is used on events from the drawing layer
     // to adjust the positioning attributes - see <SwDrawContact::_Changed(..)>.
@@ -205,11 +205,11 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
     SwDrawContact* pNewContact = 0;
     if( bNoGroup )
     {
-        SwDrawFrmFmt *pFmt = 0L;
+        SwDrawFrameFormat *pFormat = 0L;
 
         // Revoke anchor attribute.
         SwDrawContact *pMyContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-        const SwFmtAnchor aAnch( pMyContact->GetFmt()->GetAnchor() );
+        const SwFormatAnchor aAnch( pMyContact->GetFormat()->GetAnchor() );
 
         SwUndoDrawGroup *const pUndo = (!GetIDocumentUndoRedo().DoesUndo())
                                  ? 0
@@ -236,15 +236,15 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
                     "<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
 #endif
 
-            pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+            pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
             // Deletes itself!
             pContact->Changed(*pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
             pObj->SetUserCall( 0 );
 
             if( pUndo )
-                pUndo->AddObj( i, pFmt, pObj );
+                pUndo->AddObj( i, pFormat, pObj );
             else
-                DelFrmFmt( pFmt );
+                DelFrameFormat( pFormat );
 
             // #i45952# - re-introduce position normalization of group member
             // objects, because its anchor position is cleared, when they are
@@ -254,18 +254,18 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             pObj->NbcMove( Size( aAnchorPos.getX(), aAnchorPos.getY() ) );
         }
 
-        pFmt = MakeDrawFrmFmt( OUString("DrawObject"),
-                                GetDfltFrmFmt() );
-        pFmt->SetFmtAttr( aAnch );
+        pFormat = MakeDrawFrameFormat( OUString("DrawObject"),
+                                GetDfltFrameFormat() );
+        pFormat->SetFormatAttr( aAnch );
         // #i36010# - set layout direction of the position
-        pFmt->SetPositionLayoutDir(
+        pFormat->SetPositionLayoutDir(
             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
 
         rDrawView.GroupMarked();
         OSL_ENSURE( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
 
         SdrObject* pNewGroupObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-        pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
+        pNewContact = new SwDrawContact( pFormat, pNewGroupObj );
         // #i35635#
         pNewContact->MoveObjToVisibleLayer( pNewGroupObj );
         pNewContact->ConnectToLayout();
@@ -274,12 +274,12 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
         if ( !bGroupMembersNotPositioned )
         {
             // #i26791# - Adjust positioning and alignment attributes.
-            lcl_AdjustPositioningAttr( pFmt, *pNewGroupObj );
+            lcl_AdjustPositioningAttr( pFormat, *pNewGroupObj );
         }
 
         if( pUndo )
         {
-            pUndo->SetGroupFmt( pFmt );
+            pUndo->SetGroupFormat( pFormat );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
     }
@@ -310,22 +310,22 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
     SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
 
     const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
-    std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >* pFmtsAndObjs( 0L );
+    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > >* pFormatsAndObjs( 0L );
     const size_t nMarkCount( rMrkList.GetMarkCount() );
     if ( nMarkCount )
     {
-        pFmtsAndObjs = new std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >[nMarkCount];
+        pFormatsAndObjs = new std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > >[nMarkCount];
         SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
         if( !pMyObj->GetUpGroup() )
         {
-            OUString sDrwFmtNm("DrawObject");
+            OUString sDrwFormatNm("DrawObject");
             for ( size_t i = 0; i < nMarkCount; ++i )
             {
                 SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
                 if ( pObj->IsA( TYPE(SdrObjGroup) ) )
                 {
                     SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-                    SwFmtAnchor aAnch( pContact->GetFmt()->GetAnchor() );
+                    SwFormatAnchor aAnch( pContact->GetFormat()->GetAnchor() );
                     SdrObjList *pLst = static_cast<SdrObjGroup*>(pObj)->GetSubList();
 
                     SwUndoDrawUnGroup* pUndo = 0;
@@ -338,16 +338,16 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
                     for ( size_t i2 = 0; i2 < pLst->GetObjCount(); ++i2 )
                     {
                         SdrObject* pSubObj = pLst->GetObj( i2 );
-                        SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm,
-                                                            GetDfltFrmFmt() );
-                        pFmt->SetFmtAttr( aAnch );
+                        SwDrawFrameFormat *pFormat = MakeDrawFrameFormat( sDrwFormatNm,
+                                                            GetDfltFrameFormat() );
+                        pFormat->SetFormatAttr( aAnch );
                         // #i36010# - set layout direction of the position
-                        pFmt->SetPositionLayoutDir(
+                        pFormat->SetPositionLayoutDir(
                             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
-                        pFmtsAndObjs[i].push_back( std::pair< SwDrawFrmFmt*, SdrObject* >( pFmt, pSubObj ) );
+                        pFormatsAndObjs[i].push_back( std::pair< SwDrawFrameFormat*, SdrObject* >( pFormat, pSubObj ) );
 
                         if( bUndo )
-                            pUndo->AddObj( static_cast<sal_uInt16>(i2), pFmt );
+                            pUndo->AddObj( static_cast<sal_uInt16>(i2), pFormat );
                     }
                 }
             }
@@ -365,24 +365,24 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        while ( pFmtsAndObjs[i].size() > 0 )
+        while ( pFormatsAndObjs[i].size() > 0 )
         {
-            SwDrawFrmFmt* pFmt( pFmtsAndObjs[i].back().first );
-            SdrObject* pObj( pFmtsAndObjs[i].back().second );
-            pFmtsAndObjs[i].pop_back();
+            SwDrawFrameFormat* pFormat( pFormatsAndObjs[i].back().first );
+            SdrObject* pObj( pFormatsAndObjs[i].back().second );
+            pFormatsAndObjs[i].pop_back();
 
-            SwDrawContact* pContact = new SwDrawContact( pFmt, pObj );
+            SwDrawContact* pContact = new SwDrawContact( pFormat, pObj );
             pContact->MoveObjToVisibleLayer( pObj );
             pContact->ConnectToLayout();
-            lcl_AdjustPositioningAttr( pFmt, *pObj );
+            lcl_AdjustPositioningAttr( pFormat, *pObj );
 
             if ( bUndo )
             {
-                pUndo->AddFmtAndObj( pFmt, pObj );
+                pUndo->AddFormatAndObj( pFormat, pObj );
             }
         }
     }
-    delete [] pFmtsAndObjs;
+    delete [] pFormatsAndObjs;
 }
 
 bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
@@ -399,11 +399,11 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
             SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
             if( pObj->ISA(SwVirtFlyDrawObj) )
             {
-                SwFlyFrmFmt* pFrmFmt =
-                    static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFmt();
-                if( pFrmFmt )
+                SwFlyFrameFormat* pFrameFormat =
+                    static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFormat();
+                if( pFrameFormat )
                 {
-                    getIDocumentLayoutAccess().DelLayoutFmt( pFrmFmt );
+                    getIDocumentLayoutAccess().DelLayoutFormat( pFrameFormat );
                     bDelMarked = false;
                 }
             }
@@ -415,13 +415,13 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
             if( !pObj->ISA(SwVirtFlyDrawObj) )
             {
                 SwDrawContact *pC = static_cast<SwDrawContact*>(GetUserCall(pObj));
-                SwDrawFrmFmt *pFrmFmt = static_cast<SwDrawFrmFmt*>(pC->GetFmt());
-                if( pFrmFmt &&
-                    FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+                SwDrawFrameFormat *pFrameFormat = static_cast<SwDrawFrameFormat*>(pC->GetFormat());
+                if( pFrameFormat &&
+                    FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
                 {
                     rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), true );
                     --i;
-                    getIDocumentLayoutAccess().DelLayoutFmt( pFrmFmt );
+                    getIDocumentLayoutAccess().DelLayoutFormat( pFrameFormat );
                 }
             }
         }
@@ -444,7 +444,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                     SwDrawContact *pContact = static_cast<SwDrawContact*>(pObj->GetUserCall());
                     if( pContact ) // of course not for grouped objects
                     {
-                        SwDrawFrmFmt *pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+                        SwDrawFrameFormat *pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
                         // before delete of selection is performed, marked
                         // <SwDrawVirtObj>-objects have to be replaced by its
                         // reference objects.  Thus, assert, if a
@@ -458,9 +458,9 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                         pObj->SetUserCall( 0 );
 
                         if( pUndo )
-                            pUndo->AddObj( i, pFmt, rMark );
+                            pUndo->AddObj( i, pFormat, rMark );
                         else
-                            DelFrmFmt( pFmt );
+                            DelFrameFormat( pFormat );
                     }
                 }
 
@@ -479,34 +479,34 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
     return bCallBase;
 }
 
-_ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
+_ZSortFly::_ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn,
                       sal_uInt32 nArrOrdNum )
-    : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
+    : pFormat( pFrameFormat ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
 {
     // #i11176#
     // This also needs to work when no layout exists. Thus, for
     // FlyFrames an alternative method is used now in that case.
-    if( RES_FLYFRMFMT == pFmt->Which() )
+    if( RES_FLYFRMFMT == pFormat->Which() )
     {
-        if( pFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )
+        if( pFormat->getIDocumentLayoutAccess()->GetCurrentViewShell() )
         {
             // See if there is an SdrObject for it
-            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>( *pFrmFmt ).First();
+            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>( *pFrameFormat ).First();
             if( pFly )
                 nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
         }
         else
         {
             // See if there is an SdrObject for it
-            SwFlyDrawContact* pContact = SwIterator<SwFlyDrawContact,SwFmt>( *pFrmFmt ).First();
+            SwFlyDrawContact* pContact = SwIterator<SwFlyDrawContact,SwFormat>( *pFrameFormat ).First();
             if( pContact )
                 nOrdNum = pContact->GetMaster()->GetOrdNum();
         }
     }
-    else if( RES_DRAWFRMFMT == pFmt->Which() )
+    else if( RES_DRAWFRMFMT == pFormat->Which() )
     {
         // See if there is an SdrObject for it
-        SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>( *pFrmFmt ).First();
+        SwDrawContact* pContact = SwIterator<SwDrawContact,SwFormat>( *pFrameFormat ).First();
         if( pContact )
             nOrdNum = pContact->GetMaster()->GetOrdNum();
     }
@@ -557,25 +557,25 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                 break;
             }
 
-            sal_uInt16 nChrFmt;
+            sal_uInt16 nChrFormat;
 
             if (IsVisitedURL(static_cast<const SvxURLField*>(pField)->GetURL()))
-                nChrFmt = RES_POOLCHR_INET_VISIT;
+                nChrFormat = RES_POOLCHR_INET_VISIT;
             else
-                nChrFmt = RES_POOLCHR_INET_NORMAL;
+                nChrFormat = RES_POOLCHR_INET_NORMAL;
 
-            SwFmt *pFmt = getIDocumentStylePoolAccess().GetCharFmtFromPool(nChrFmt);
+            SwFormat *pFormat = getIDocumentStylePoolAccess().GetCharFormatFromPool(nChrFormat);
 
             Color aColor(COL_LIGHTBLUE);
-            if (pFmt)
-                aColor = pFmt->GetColor().GetValue();
+            if (pFormat)
+                aColor = pFormat->GetColor().GetValue();
 
-            pInfo->SetTxtColor(aColor);
+            pInfo->SetTextColor(aColor);
         }
         else if (pField && pField->ISA(SdrMeasureField))
         {
             // Measure field
-            pInfo->ClearFldColor();
+            pInfo->ClearFieldColor();
         }
         else if ( pField && pField->ISA(SvxExtTimeField))
         {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index a83eb030d0fd..8bc9e088da7f 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -60,7 +60,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
     {
         // create new anchor
         _SaveFly& rSave = rArr[n];
-        SwFrmFmt* pFmt = rSave.pFrmFmt;
+        SwFrameFormat* pFormat = rSave.pFrameFormat;
 
         if( rSave.bInsertPosition )
         {
@@ -73,34 +73,34 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
             aPos.nNode = rSttIdx.GetIndex() + rSave.nNdDiff;
 
         aPos.nContent.Assign( 0, 0 );
-        SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+        SwFormatAnchor aAnchor( pFormat->GetAnchor() );
         aAnchor.SetAnchor( &aPos );
-        pFmt->GetDoc()->GetSpzFrmFmts()->push_back( pFmt );
-        pFmt->SetFmtAttr( aAnchor );
-        SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
-        if( pCNd && pCNd->getLayoutFrm( pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) )
-            pFmt->MakeFrms();
+        pFormat->GetDoc()->GetSpzFrameFormats()->push_back( pFormat );
+        pFormat->SetFormatAttr( aAnchor );
+        SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
+        if( pCNd && pCNd->getLayoutFrm( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) )
+            pFormat->MakeFrms();
     }
 }
 
 void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
 {
-    SwFrmFmts& rFmts = *rRg.aStart.GetNode().GetDoc()->GetSpzFrmFmts();
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    SwFrameFormats& rFormats = *rRg.aStart.GetNode().GetDoc()->GetSpzFrameFormats();
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        SwFrmFmt *const pFmt = rFmts[n];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwFrameFormat *const pFormat = rFormats[n];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
             rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
         {
             _SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
-                            pFmt, false );
+                            pFormat, false );
             rArr.push_back( aSave );
-            pFmt->DelFrms();
-            rFmts.erase( rFmts.begin() + n-- );
+            pFormat->DelFrms();
+            rFormats.erase( rFormats.begin() + n-- );
         }
     }
 }
@@ -108,35 +108,35 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
 void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                        _SaveFlyArr& rArr, bool bMoveAllFlys )
 {
-    SwFrmFmts& rFmts = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrmFmts();
-    SwFrmFmt* pFmt;
-    const SwFmtAnchor* pAnchor;
+    SwFrameFormats& rFormats = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrameFormats();
+    SwFrameFormat* pFormat;
+    const SwFormatAnchor* pAnchor;
 
     const SwPosition* pPos = rPam.Start();
     const SwNodeIndex& rSttNdIdx = pPos->nNode;
-    short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsCntntNode() &&
+    short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsContentNode() &&
                     pPos->nContent.GetIndex()) ? 1 : 0;
 
     pPos = rPam.GetPoint() == pPos ? rPam.GetMark() : rPam.GetPoint();
     const SwNodeIndex& rEndNdIdx = pPos->nNode;
-    short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsCntntNode() &&
-                pPos->nContent == rEndNdIdx.GetNode().GetCntntNode()->Len() ))
+    short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsContentNode() &&
+                pPos->nContent == rEndNdIdx.GetNode().GetContentNode()->Len() ))
                     ? 0 : 1;
 
-    const SwNodeIndex* pCntntIdx;
+    const SwNodeIndex* pContentIdx;
 
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        pFmt = (SwFrmFmt*)rFmts[n];
-        pAnchor = &pFmt->GetAnchor();
-        const SwPosition* pAPos = pAnchor->GetCntntAnchor();
+        pFormat = (SwFrameFormat*)rFormats[n];
+        pAnchor = &pFormat->GetAnchor();
+        const SwPosition* pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
-            // do not move if the InsPos is in the CntntArea of the Fly
-            ( 0 == ( pCntntIdx = pFmt->GetCntnt().GetCntntIdx() ) ||
-              !( *pCntntIdx < rInsPos &&
-                rInsPos < pCntntIdx->GetNode().EndOfSectionIndex() )) )
+            // do not move if the InsPos is in the ContentArea of the Fly
+            ( 0 == ( pContentIdx = pFormat->GetContent().GetContentIdx() ) ||
+              !( *pContentIdx < rInsPos &&
+                rInsPos < pContentIdx->GetNode().EndOfSectionIndex() )) )
         {
             bool bInsPos = false;
 
@@ -148,9 +148,9 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                 {
                     // Only attach an anchor to the beginning or end
                     SwPosition aPos( rSttNdIdx );
-                    SwFmtAnchor aAnchor( *pAnchor );
+                    SwFormatAnchor aAnchor( *pAnchor );
                     aAnchor.SetAnchor( &aPos );
-                    pFmt->SetFmtAttr( aAnchor );
+                    pFormat->SetFormatAttr( aAnchor );
                 }
             }
             else if( ( rSttNdIdx.GetIndex() + nSttOff <= pAPos->nNode.GetIndex()
@@ -159,10 +159,10 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
 
             {
                 _SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(),
-                                pFmt, bInsPos );
+                                pFormat, bInsPos );
                 rArr.push_back( aSave );
-                pFmt->DelFrms();
-                rFmts.erase( rFmts.begin() + n-- );
+                pFormat->DelFrms();
+                rFormats.erase( rFormats.begin() + n-- );
             }
         }
     }
@@ -176,12 +176,12 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
     const bool bDelFwrd = rMkNdIdx.GetIndex() <= rPtNdIdx.GetIndex();
 
     SwDoc* pDoc = rMkNdIdx.GetNode().GetDoc();
-    SwFrmFmts& rTbl = *pDoc->GetSpzFrmFmts();
-    for ( auto i = rTbl.size(); i; )
+    SwFrameFormats& rTable = *pDoc->GetSpzFrameFormats();
+    for ( auto i = rTable.size(); i; )
     {
-        SwFrmFmt *pFmt = rTbl[--i];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-        SwPosition const*const pAPos = rAnch.GetCntntAnchor();
+        SwFrameFormat *pFormat = rTable[--i];
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
+        SwPosition const*const pAPos = rAnch.GetContentAnchor();
         if (pAPos &&
             ((rAnch.GetAnchorId() == FLY_AT_PARA) ||
              (rAnch.GetAnchorId() == FLY_AT_CHAR)) &&
@@ -192,32 +192,32 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
             // Only move the Anchor??
             if( rPtNdIdx == pAPos->nNode )
             {
-                SwFmtAnchor aAnch( pFmt->GetAnchor() );
+                SwFormatAnchor aAnch( pFormat->GetAnchor() );
                 SwPosition aPos( rMkNdIdx );
                 aAnch.SetAnchor( &aPos );
-                pFmt->SetFmtAttr( aAnch );
+                pFormat->SetFormatAttr( aAnch );
             }
             else
             {
                 // If the Fly is deleted, all Flys in it's content have to be deleted too.
-                const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() )
+                const SwFormatContent &rContent = pFormat->GetContent();
+                if( rContent.GetContentIdx() )
                 {
-                    DelFlyInRange( *rCntnt.GetCntntIdx(),
-                                    SwNodeIndex( *rCntnt.GetCntntIdx()->
+                    DelFlyInRange( *rContent.GetContentIdx(),
+                                    SwNodeIndex( *rContent.GetContentIdx()->
                                             GetNode().EndOfSectionNode() ));
                     // Position could have been moved!
-                    if( i > rTbl.size() )
-                        i = rTbl.size();
-                    else if( pFmt != rTbl[i] )
-                        i = rTbl.GetPos( pFmt );
+                    if( i > rTable.size() )
+                        i = rTable.size();
+                    else if( pFormat != rTable[i] )
+                        i = rTable.GetPos( pFormat );
                 }
 
-                pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
 
-                // DelLayoutFmt can also trigger the deletion of objects.
-                if( i > rTbl.size() )
-                    i = rTbl.size();
+                // DelLayoutFormat can also trigger the deletion of objects.
+                if( i > rTable.size() )
+                    i = rTable.size();
             }
         }
     }
@@ -228,19 +228,19 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
 // From now on this class saves the redline positions of all redlines which ends exact at the
 // insert position (node _and_ content index)
 _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt )
-    : pSavArr( 0 ), pSavIdx( 0 ), nSavCntnt( nCnt )
+    : pSavArr( 0 ), pSavIdx( 0 ), nSavContent( nCnt )
 {
     SwNode& rNd = rInsIdx.GetNode();
     SwDoc* pDest = rNd.GetDoc();
-    if( !pDest->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pDest->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         sal_uInt16 nFndPos;
         const SwPosition* pEnd;
-        SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetCntntNode(), nCnt ));
+        SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetContentNode(), nCnt ));
         pDest->getIDocumentRedlineAccess().GetRedline( aSrcPos, &nFndPos );
         const SwRangeRedline* pRedl;
         while( nFndPos--
-              && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTbl()[ nFndPos ] )->End() ) == aSrcPos
+              && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTable()[ nFndPos ] )->End() ) == aSrcPos
               && *pRedl->Start() < aSrcPos )
         {
             if( !pSavArr )
@@ -262,12 +262,12 @@ _SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore()
 void _SaveRedlEndPosForRestore::_Restore()
 {
     ++(*pSavIdx);
-    SwCntntNode* pNode = pSavIdx->GetNode().GetCntntNode();
+    SwContentNode* pNode = pSavIdx->GetNode().GetContentNode();
     // If there's no content node at the remembered position, we will not restore the old position
     // This may happen if a table (or section?) will be inserted.
     if( pNode )
     {
-        SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavCntnt ));
+        SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavContent ));
         for( auto n = pSavArr->size(); n; )
             *(*pSavArr)[ --n ] = aPos;
     }
@@ -292,29 +292,29 @@ static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
     return pResult;
 }
 
-void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev )
+void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev )
 {
-    rJoinTxt = false;
+    rJoinText = false;
     rJoinPrev = false;
     if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
     {
         const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
-        SwTxtNode *pSttNd = pStt->nNode.GetNode().GetTxtNode();
+        SwTextNode *pSttNd = pStt->nNode.GetNode().GetTextNode();
         if( pSttNd )
         {
-            SwTxtNode *pEndNd = pEnd->nNode.GetNode().GetTxtNode();
-            rJoinTxt = 0 != pEndNd;
-            if( rJoinTxt )
+            SwTextNode *pEndNd = pEnd->nNode.GetNode().GetTextNode();
+            rJoinText = 0 != pEndNd;
+            if( rJoinText )
             {
                 bool bExchange = pStt == rPam.GetPoint();
                 if( !pStt->nContent.GetIndex() &&
-                    pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex())
+                    pEndNd->GetText().getLength() != pEnd->nContent.GetIndex())
                     bExchange = !bExchange;
                 if( bExchange )
                     rPam.Exchange();
                 rJoinPrev = rPam.GetPoint() == pStt;
                 OSL_ENSURE( !pStt->nContent.GetIndex() &&
-                    pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex()
+                    pEndNd->GetText().getLength() != pEnd->nContent.GetIndex()
                     ? rPam.GetPoint()->nNode < rPam.GetMark()->nNode
                     : rPam.GetPoint()->nNode > rPam.GetMark()->nNode,
                     "sw_GetJoinFlags");
@@ -326,11 +326,11 @@ void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev )
 bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
 {
     SwNodeIndex aIdx( rPam.GetPoint()->nNode );
-    SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
+    SwTextNode *pTextNd = aIdx.GetNode().GetTextNode();
     SwNodeIndex aOldIdx( aIdx );
-    SwTxtNode *pOldTxtNd = pTxtNd;
+    SwTextNode *pOldTextNd = pTextNd;
 
-    if( pTxtNd && pTxtNd->CanJoinNext( &aIdx ) )
+    if( pTextNd && pTextNd->CanJoinNext( &aIdx ) )
     {
         SwDoc* pDoc = rPam.GetDoc();
         if( bJoinPrev )
@@ -349,24 +349,24 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
                 // There, we copy the AUTO PageBreak from the GetMarkNode!
 
                 /* The GetMarkNode */
-                if( ( pTxtNd = aIdx.GetNode().GetTxtNode())->HasSwAttrSet() )
+                if( ( pTextNd = aIdx.GetNode().GetTextNode())->HasSwAttrSet() )
                 {
                     const SfxPoolItem* pItem;
-                    if( SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState(
+                    if( SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState(
                         RES_BREAK, false, &pItem ) )
-                        pTxtNd->ResetAttr( RES_BREAK );
-                    if( pTxtNd->HasSwAttrSet() &&
-                        SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState(
+                        pTextNd->ResetAttr( RES_BREAK );
+                    if( pTextNd->HasSwAttrSet() &&
+                        SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState(
                         RES_PAGEDESC, false, &pItem ) )
-                        pTxtNd->ResetAttr( RES_PAGEDESC );
+                        pTextNd->ResetAttr( RES_PAGEDESC );
                 }
 
                 /* The PointNode */
-                if( pOldTxtNd->HasSwAttrSet() )
+                if( pOldTextNd->HasSwAttrSet() )
                 {
                     const SfxPoolItem* pItem;
                     SfxItemSet aSet( pDoc->GetAttrPool(), aBreakSetRange );
-                    const SfxItemSet* pSet = pOldTxtNd->GetpSwAttrSet();
+                    const SfxItemSet* pSet = pOldTextNd->GetpSwAttrSet();
                     if( SfxItemState::SET == pSet->GetItemState( RES_BREAK,
                         false, &pItem ) )
                         aSet.Put( *pItem );
@@ -374,28 +374,28 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
                         false, &pItem ) )
                         aSet.Put( *pItem );
                     if( aSet.Count() )
-                        pTxtNd->SetAttr( aSet );
+                        pTextNd->SetAttr( aSet );
                 }
-                pOldTxtNd->FmtToTxtAttr( pTxtNd );
+                pOldTextNd->FormatToTextAttr( pTextNd );
 
-                const std::shared_ptr< sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-                pCntntStore->Save( pDoc, aOldIdx.GetIndex(), pOldTxtNd->Len() );
+                const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+                pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() );
 
-                SwIndex aAlphaIdx(pTxtNd);
-                pOldTxtNd->CutText( pTxtNd, aAlphaIdx, SwIndex(pOldTxtNd),
-                                    pOldTxtNd->Len() );
+                SwIndex aAlphaIdx(pTextNd);
+                pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd),
+                                    pOldTextNd->Len() );
                 SwPosition aAlphaPos( aIdx, aAlphaIdx );
                 pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, true );
 
                 // move all Bookmarks/TOXMarks
-                if( !pCntntStore->Empty() )
-                    pCntntStore->Restore( pDoc, aIdx.GetIndex() );
+                if( !pContentStore->Empty() )
+                    pContentStore->Restore( pDoc, aIdx.GetIndex() );
 
                 // If the passed PaM is not in the Crsr ring,
                 // treat it separately (e.g. when it's being called from AutoFormat)
-                if( pOldTxtNd == rPam.GetBound( true ).nContent.GetIdxReg() )
+                if( pOldTextNd == rPam.GetBound( true ).nContent.GetIdxReg() )
                     rPam.GetBound( true ) = aAlphaPos;
-                if( pOldTxtNd == rPam.GetBound( false ).nContent.GetIdxReg() )
+                if( pOldTextNd == rPam.GetBound( false ).nContent.GetIdxReg() )
                     rPam.GetBound( false ) = aAlphaPos;
             }
             // delete the Node, at last!
@@ -403,33 +403,33 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
         }
         else
         {
-            SwTxtNode* pDelNd = aIdx.GetNode().GetTxtNode();
-            if( pTxtNd->Len() )
-                pDelNd->FmtToTxtAttr( pTxtNd );
+            SwTextNode* pDelNd = aIdx.GetNode().GetTextNode();
+            if( pTextNd->Len() )
+                pDelNd->FormatToTextAttr( pTextNd );
             else
             {
                 /* This case was missed:
 
-                   <something></something>   <-- pTxtNd
+                   <something></something>   <-- pTextNd
                    <other>ccc</other>        <-- pDelNd
 
                    <something> and <other> are paragraph
                    attributes. The attribute <something> stayed if not
                    overwritten by an attribute in "ccc". Fixed by
                    first resetting all character attributes in first
-                   paragraph (pTxtNd).
+                   paragraph (pTextNd).
                 */
                 std::vector<sal_uInt16> * pShorts =
-                    lcl_RangesToVector(aCharFmtSetRange);
-                pTxtNd->ResetAttr(*pShorts);
+                    lcl_RangesToVector(aCharFormatSetRange);
+                pTextNd->ResetAttr(*pShorts);
                 delete pShorts;
 
                 if( pDelNd->HasSwAttrSet() )
                 {
                     // only copy the character attributes
-                    SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFmtSetRange );
+                    SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFormatSetRange );
                     aTmpSet.Put( *pDelNd->GetpSwAttrSet() );
-                    pTxtNd->SetAttr( aTmpSet );
+                    pTextNd->SetAttr( aTmpSet );
                 }
             }
 
@@ -437,25 +437,25 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
             // #i100466# adjust given <rPam>, if it does not belong to the cursors
             if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() )
             {
-                rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+                rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) );
             }
             if( pDelNd == rPam.GetBound( false ).nContent.GetIdxReg() )
             {
-                rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+                rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) );
             }
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
         return true;
     }
     else return false;
 }
 
-static void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult,
+static void lcl_syncGrammarError( SwTextNode &rTextNode, linguistic2::ProofreadingResult& rResult,
     const ModelToViewHelper &rConversionMap )
 {
-    if( rTxtNode.IsGrammarCheckDirty() )
+    if( rTextNode.IsGrammarCheckDirty() )
         return;
-    SwGrammarMarkUp* pWrong = rTxtNode.GetGrammarCheck();
+    SwGrammarMarkUp* pWrong = rTextNode.GetGrammarCheck();
     linguistic2::SingleProofreadingError* pArray = rResult.aErrors.getArray();
     sal_uInt16 j = 0;
     if( pWrong )
@@ -486,13 +486,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
     SwSpellArgs      *pSpellArgs = 0;
     if (pConvArgs)
     {
-        pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent);
-        pConvArgs->SetEnd(  pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent );
+        pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent);
+        pConvArgs->SetEnd(  pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent );
     }
     else
         pSpellArgs = new SwSpellArgs( xSpeller,
-                            pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent,
-                            pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent,
+                            pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent,
+                            pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent,
                             bGrammarCheck );
 
     sal_uLong nCurrNd = pSttPos->nNode.GetIndex();
@@ -501,7 +501,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
     uno::Any aRet;
     if( nCurrNd <= nEndNd )
     {
-        SwCntntFrm* pCntFrm;
+        SwContentFrm* pCntFrm;
         bool bGoOn = true;
         while( bGoOn )
         {
@@ -509,14 +509,14 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
             switch( pNd->GetNodeType() )
             {
             case ND_TEXTNODE:
-                if( 0 != ( pCntFrm = pNd->GetTxtNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) )
+                if( 0 != ( pCntFrm = pNd->GetTextNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) )
                 {
                     // skip protected and hidden Cells and Flys
                     if( pCntFrm->IsProtected() )
                     {
                         nCurrNd = pNd->EndOfSectionIndex();
                     }
-                    else if( !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+                    else if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
                     {
                         if( pPageCnt && *pPageCnt && pPageSt )
                         {
@@ -543,7 +543,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             // if grammar checking starts inside of a sentence the start position has to be adjusted
                             if( nBeginGrammarCheck )
                             {
-                                SwIndex aStartIndex( dynamic_cast< SwTxtNode* >( pNd ), nBeginGrammarCheck );
+                                SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck );
                                 SwPosition aStart( *pNd, aStartIndex );
                                 SwCursor aCrsr(aStart, 0, false);
                                 SwPosition aOrigPos = *aCrsr.GetPoint();
@@ -555,13 +555,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             }
                             nEndGrammarCheck = (pSpellArgs->pEndNode == pNd)
                                 ? pSpellArgs->pEndIdx->GetIndex()
-                                : pNd->GetTxtNode()
-                                    ->GetTxt().getLength();
+                                : pNd->GetTextNode()
+                                    ->GetText().getLength();
                         }
 
-                        sal_Int32 nSpellErrorPosition = pNd->GetTxtNode()->GetTxt().getLength();
-                        if( (!pConvArgs && pNd->GetTxtNode()->Spell( pSpellArgs )) ||
-                            ( pConvArgs && pNd->GetTxtNode()->Convert( *pConvArgs )))
+                        sal_Int32 nSpellErrorPosition = pNd->GetTextNode()->GetText().getLength();
+                        if( (!pConvArgs && pNd->GetTextNode()->Spell( pSpellArgs )) ||
+                            ( pConvArgs && pNd->GetTextNode()->Convert( *pConvArgs )))
                         {
                             // Cancel and remember position
                             pSttPos->nNode = nCurrNd;
@@ -580,11 +580,11 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             {
                                 uno::Reference< lang::XComponent > xDoc( GetDocShell()->GetBaseModel(), uno::UNO_QUERY );
                                 // Expand the string:
-                                const ModelToViewHelper aConversionMap(*pNd->GetTxtNode());
+                                const ModelToViewHelper aConversionMap(*pNd->GetTextNode());
                                 OUString aExpandText = aConversionMap.getViewText();
 
                                 // get XFlatParagraph to use...
-                                uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTxtNode(), aExpandText, aConversionMap );
+                                uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTextNode(), aExpandText, aConversionMap );
 
                                 // get error position of cursor in XFlatParagraph
                                 linguistic2::ProofreadingResult aResult;
@@ -595,7 +595,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                                     aResult = xGCIterator->checkSentenceAtPosition(
                                             xDoc, xFlatPara, aExpandText, lang::Locale(), nBeginGrammarCheck, -1, -1 );
 
-                                    lcl_syncGrammarError( *pNd->GetTxtNode(), aResult, aConversionMap );
+                                    lcl_syncGrammarError( *pNd->GetTextNode(), aResult, aConversionMap );
 
                                     // get suggestions to use for the specific error position
                                     nGrammarErrors = aResult.aErrors.getLength();
@@ -615,10 +615,10 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                                     nCurrNd = pNd->GetIndex();
                                     pSttPos->nNode = nCurrNd;
                                     pEndPos->nNode = nCurrNd;
-                                    pSpellArgs->pStartNode = pNd->GetTxtNode();
-                                    pSpellArgs->pEndNode = pNd->GetTxtNode();
-                                    pSpellArgs->pStartIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos );
-                                    pSpellArgs->pEndIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos );
+                                    pSpellArgs->pStartNode = pNd->GetTextNode();
+                                    pSpellArgs->pEndNode = pNd->GetTextNode();
+                                    pSpellArgs->pStartIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos );
+                                    pSpellArgs->pEndIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos );
                                     nCurrNd = nEndNd;
                                 }
                             }
@@ -693,12 +693,12 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos,
     nNode = pPoint->nNode.GetIndex();
 
     // Set start
-    pStart = pPoint->nNode.GetNode().GetTxtNode();
+    pStart = pPoint->nNode.GetNode().GetTextNode();
     nPamStart = pPoint->nContent.GetIndex();
 
     // Set End and Length
     const SwPosition *pMark = pPam->GetMark();
-    pEnd = pMark->nNode.GetNode().GetTxtNode();
+    pEnd = pMark->nNode.GetNode().GetTextNode();
     nPamLen = pMark->nContent.GetIndex();
     if( pPoint->nNode == pMark->nNode )
         nPamLen = nPamLen - pPoint->nContent.GetIndex();
@@ -717,9 +717,9 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
     else
     {
         pPam->GetPoint()->nNode = nNode;
-        pPam->GetPoint()->nContent.Assign( pNode->GetCntntNode(), nWordStart );
+        pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), nWordStart );
         pPam->GetMark()->nNode = nNode;
-        pPam->GetMark()->nContent.Assign( pNode->GetCntntNode(),
+        pPam->GetMark()->nContent.Assign( pNode->GetContentNode(),
                                           nWordStart + nWordLen );
         OSL_ENSURE( nNode == pNode->GetIndex(),
                 "SwHyphArgs::SetPam: Pam disaster" );
@@ -730,12 +730,12 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
 static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
 {
     // Hyphenate returns true if there is a hyphenation point and sets pPam
-    SwTxtNode *pNode = rpNd->GetTxtNode();
+    SwTextNode *pNode = rpNd->GetTextNode();
     SwHyphArgs *pHyphArgs = static_cast<SwHyphArgs*>(pArgs);
     if( pNode )
     {
-        SwCntntFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
-        if( pCntFrm && !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+        SwContentFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+        if( pCntFrm && !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
         {
             sal_uInt16 *pPageSt = pHyphArgs->GetPageSt();
             sal_uInt16 *pPageCnt = pHyphArgs->GetPageCnt();
@@ -808,7 +808,7 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
     const sal_Int32 nSttCnt = pStt->nContent.GetIndex();
     const sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
-    const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     if( pStt == pEnd && pTNd )                  // no region ?
     {
         // do nothing
@@ -822,14 +822,14 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
         {
             ++aIdx;
             if( pTNd )
-                pTNd->CountWords( rStat, nSttCnt, pTNd->GetTxt().getLength() );
+                pTNd->CountWords( rStat, nSttCnt, pTNd->GetText().getLength() );
         }
 
         for( ; aIdx.GetIndex() < nEndNd; ++aIdx )
-            if( 0 != ( pTNd = aIdx.GetNode().GetTxtNode() ))
-                pTNd->CountWords( rStat, 0, pTNd->GetTxt().getLength() );
+            if( 0 != ( pTNd = aIdx.GetNode().GetTextNode() ))
+                pTNd->CountWords( rStat, 0, pTNd->GetText().getLength() );
 
-        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() ))
+        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() ))
             pTNd->CountWords( rStat, 0, nEndCnt );
     }
     else if( pTNd && nSttCnt < nEndCnt )
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index f3b6fe66679c..88015e375111 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -68,169 +68,169 @@ using namespace ::com::sun::star::uno;
 
 // the StartIndex can be supplied optionally (e.g. if it was queried before - is a virtual
 // method otherwise!)
-_SetGetExpFld::_SetGetExpFld(
+_SetGetExpField::_SetGetExpField(
     const SwNodeIndex& rNdIdx,
-    const SwTxtFld* pFld,
+    const SwTextField* pField,
     const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTFIELD;
-    CNTNT.pTxtFld = pFld;
+    eSetGetExpFieldType = TEXTFIELD;
+    CNTNT.pTextField = pField;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
-    else if( pFld )
-        nCntnt = pFld->GetStart();
+        nContent = pIdx->GetIndex();
+    else if( pField )
+        nContent = pField->GetStart();
     else
-        nCntnt = 0;
+        nContent = 0;
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx,
-                            const SwTxtINetFmt& rINet, const SwIndex* pIdx )
+_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+                            const SwTextINetFormat& rINet, const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTINET;
-    CNTNT.pTxtINet = &rINet;
+    eSetGetExpFieldType = TEXTINET;
+    CNTNT.pTextINet = &rINet;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
+        nContent = pIdx->GetIndex();
     else
-        nCntnt = rINet.GetStart();
+        nContent = rINet.GetStart();
 }
 
 // Extension for Sections:
 // these always have content position 0xffffffff!
 // There is never a field on this, only up to COMPLETE_STRING possible
-_SetGetExpFld::_SetGetExpFld( const SwSectionNode& rSectNd,
+_SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd,
                                 const SwPosition* pPos )
 {
-    eSetGetExpFldType = SECTIONNODE;
+    eSetGetExpFieldType = SECTIONNODE;
     CNTNT.pSection = &rSectNd.GetSection();
 
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
         nNode = rSectNd.GetIndex();
-        nCntnt = 0;
+        nContent = 0;
     }
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwTableBox& rTBox, const SwPosition* pPos )
+_SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos )
 {
-    eSetGetExpFldType = TABLEBOX;
+    eSetGetExpFieldType = TABLEBOX;
     CNTNT.pTBox = &rTBox;
 
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
         nNode = 0;
-        nCntnt = 0;
+        nContent = 0;
         if( rTBox.GetSttNd() )
         {
             SwNodeIndex aIdx( *rTBox.GetSttNd() );
-            const SwCntntNode* pNd = aIdx.GetNode().GetNodes().GoNext( &aIdx );
+            const SwContentNode* pNd = aIdx.GetNode().GetNodes().GoNext( &aIdx );
             if( pNd )
                 nNode = pNd->GetIndex();
         }
     }
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx,
-                                const SwTxtTOXMark& rTOX,
+_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+                                const SwTextTOXMark& rTOX,
                                 const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTTOXMARK;
-    CNTNT.pTxtTOX = &rTOX;
+    eSetGetExpFieldType = TEXTTOXMARK;
+    CNTNT.pTextTOX = &rTOX;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
+        nContent = pIdx->GetIndex();
     else
-        nCntnt = rTOX.GetStart();
+        nContent = rTOX.GetStart();
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwPosition& rPos )
+_SetGetExpField::_SetGetExpField( const SwPosition& rPos )
 {
-    eSetGetExpFldType = CRSRPOS;
+    eSetGetExpFieldType = CRSRPOS;
     CNTNT.pPos = &rPos;
     nNode = rPos.nNode.GetIndex();
-    nCntnt = rPos.nContent.GetIndex();
+    nContent = rPos.nContent.GetIndex();
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwFlyFrmFmt& rFlyFmt,
+_SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat,
                                 const SwPosition* pPos  )
 {
-    eSetGetExpFldType = FLYFRAME;
-    CNTNT.pFlyFmt = &rFlyFmt;
+    eSetGetExpFieldType = FLYFRAME;
+    CNTNT.pFlyFormat = &rFlyFormat;
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
-        const SwFmtCntnt& rCntnt = rFlyFmt.GetCntnt();
-        nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
-        nCntnt = 0;
+        const SwFormatContent& rContent = rFlyFormat.GetContent();
+        nNode = rContent.GetContentIdx()->GetIndex() + 1;
+        nContent = 0;
     }
 }
 
-void _SetGetExpFld::GetPosOfContent( SwPosition& rPos ) const
+void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const
 {
-    const SwNode* pNd = GetNodeFromCntnt();
+    const SwNode* pNd = GetNodeFromContent();
     if( pNd )
-        pNd = pNd->GetCntntNode();
+        pNd = pNd->GetContentNode();
 
     if( pNd )
     {
         rPos.nNode = *pNd;
-        rPos.nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), GetCntPosFromCntnt() );
+        rPos.nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), GetCntPosFromContent() );
     }
     else
     {
         rPos.nNode = nNode;
-        rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), nCntnt );
+        rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), nContent );
     }
 }
 
-void _SetGetExpFld::SetBodyPos( const SwCntntFrm& rFrm )
+void _SetGetExpField::SetBodyPos( const SwContentFrm& rFrm )
 {
     if( !rFrm.IsInDocBody() )
     {
         SwNodeIndex aIdx( *rFrm.GetNode() );
         SwDoc& rDoc = *aIdx.GetNodes().GetDoc();
         SwPosition aPos( aIdx );
-        bool const bResult = ::GetBodyTxtNode( rDoc, aPos, rFrm );
+        bool const bResult = ::GetBodyTextNode( rDoc, aPos, rFrm );
         OSL_ENSURE(bResult, "Where is the field?");
         (void) bResult; // unused in non-debug
         nNode = aPos.nNode.GetIndex();
-        nCntnt = aPos.nContent.GetIndex();
+        nContent = aPos.nContent.GetIndex();
     }
 }
 
-bool _SetGetExpFld::operator==( const _SetGetExpFld& rFld ) const
+bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const
 {
-    return nNode == rFld.nNode
-           && nCntnt == rFld.nCntnt
-           && ( !CNTNT.pTxtFld
-                || !rFld.CNTNT.pTxtFld
-                || CNTNT.pTxtFld == rFld.CNTNT.pTxtFld );
+    return nNode == rField.nNode
+           && nContent == rField.nContent
+           && ( !CNTNT.pTextField
+                || !rField.CNTNT.pTextField
+                || CNTNT.pTextField == rField.CNTNT.pTextField );
 }
 
-bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
+bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const
 {
-    if( nNode < rFld.nNode || ( nNode == rFld.nNode && nCntnt < rFld.nCntnt ))
+    if( nNode < rField.nNode || ( nNode == rField.nNode && nContent < rField.nContent ))
         return true;
-    else if( nNode != rFld.nNode || nCntnt != rFld.nCntnt )
+    else if( nNode != rField.nNode || nContent != rField.nContent )
         return false;
 
-    const SwNode *pFirst = GetNodeFromCntnt(),
-                 *pNext = rFld.GetNodeFromCntnt();
+    const SwNode *pFirst = GetNodeFromContent(),
+                 *pNext = rField.GetNodeFromContent();
 
     // Position is the same: continue only if both field pointers are set!
     if( !pFirst || !pNext )
@@ -241,23 +241,23 @@ bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
     {
         // is one in the table?
         const SwNode *pFirstStt, *pNextStt;
-        const SwTableNode* pTblNd = pFirst->FindTableNode();
-        if( pTblNd )
-            pFirstStt = pTblNd->StartOfSectionNode();
+        const SwTableNode* pTableNd = pFirst->FindTableNode();
+        if( pTableNd )
+            pFirstStt = pTableNd->StartOfSectionNode();
         else
             pFirstStt = pFirst->StartOfSectionNode();
 
-        if( 0 != ( pTblNd = pNext->FindTableNode() ) )
-            pNextStt = pTblNd->StartOfSectionNode();
+        if( 0 != ( pTableNd = pNext->FindTableNode() ) )
+            pNextStt = pTableNd->StartOfSectionNode();
         else
             pNextStt = pNext->StartOfSectionNode();
 
         if( pFirstStt != pNextStt )
         {
-            if( pFirst->IsTxtNode() && pNext->IsTxtNode() &&
+            if( pFirst->IsTextNode() && pNext->IsTextNode() &&
                 ( pFirst->FindFlyStartNode() || pNext->FindFlyStartNode() ))
             {
-                return ::IsFrameBehind( *pNext->GetTxtNode(), nCntnt, *pFirst->GetTxtNode(), nCntnt );
+                return ::IsFrameBehind( *pNext->GetTextNode(), nContent, *pFirst->GetTextNode(), nContent );
             }
             return pFirstStt->GetIndex() < pNextStt->GetIndex();
         }
@@ -268,25 +268,25 @@ bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
         return pFirst->GetIndex() < pNext->GetIndex();
 
     // same Node in the Section, check Position in the Node
-    return GetCntPosFromCntnt() < rFld.GetCntPosFromCntnt();
+    return GetCntPosFromContent() < rField.GetCntPosFromContent();
 }
 
-const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
+const SwNode* _SetGetExpField::GetNodeFromContent() const
 {
     const SwNode* pRet = 0;
-    if( CNTNT.pTxtFld )
-        switch( eSetGetExpFldType )
+    if( CNTNT.pTextField )
+        switch( eSetGetExpFieldType )
         {
         case TEXTFIELD:
-            pRet = &CNTNT.pTxtFld->GetTxtNode();
+            pRet = &CNTNT.pTextField->GetTextNode();
             break;
 
         case TEXTINET:
-            pRet = &CNTNT.pTxtINet->GetTxtNode();
+            pRet = &CNTNT.pTextINet->GetTextNode();
             break;
 
         case SECTIONNODE:
-            pRet = CNTNT.pSection->GetFmt()->GetSectionNode();
+            pRet = CNTNT.pSection->GetFormat()->GetSectionNode();
             break;
 
         case CRSRPOS:
@@ -294,7 +294,7 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
             break;
 
         case TEXTTOXMARK:
-            pRet = &CNTNT.pTxtTOX->GetTxtNode();
+            pRet = &CNTNT.pTextTOX->GetTextNode();
             break;
 
         case TABLEBOX:
@@ -307,7 +307,7 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
 
         case FLYFRAME:
             {
-                SwNodeIndex aIdx( *CNTNT.pFlyFmt->GetCntnt().GetCntntIdx() );
+                SwNodeIndex aIdx( *CNTNT.pFlyFormat->GetContent().GetContentIdx() );
                 pRet = aIdx.GetNode().GetNodes().GoNext( &aIdx );
             }
             break;
@@ -315,16 +315,16 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
     return pRet;
 }
 
-sal_Int32 _SetGetExpFld::GetCntPosFromCntnt() const
+sal_Int32 _SetGetExpField::GetCntPosFromContent() const
 {
     sal_Int32 nRet = 0;
-    if( CNTNT.pTxtFld )
-        switch( eSetGetExpFldType )
+    if( CNTNT.pTextField )
+        switch( eSetGetExpFieldType )
         {
         case TEXTFIELD:
         case TEXTINET:
         case TEXTTOXMARK:
-            nRet = CNTNT.pTxtFld->GetStart();
+            nRet = CNTNT.pTextField->GetStart();
             break;
         case CRSRPOS:
             nRet =  CNTNT.pPos->nContent.GetIndex();
@@ -343,10 +343,10 @@ _HashStr::_HashStr( const OUString& rName, const OUString& rText,
 }
 
 /// Look up the Name, if it is present, return it's String, otherwise return an empty String
-OUString LookString( SwHash** ppTbl, sal_uInt16 nSize, const OUString& rName,
+OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName,
                      sal_uInt16* pPos )
 {
-    SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTbl, nSize, pPos );
+    SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize, pPos );
     if( pFnd )
         return static_cast<_HashStr*>(pFnd)->aSetStr;
 
@@ -363,12 +363,12 @@ const SwDBData& SwDoc::GetDBDesc()
 #if HAVE_FEATURE_DBCONNECTIVITY
     if(maDBData.sDataSource.isEmpty())
     {
-        const SwFldTypes::size_type nSize = getIDocumentFieldsAccess().GetFldTypes()->size();
-        for(SwFldTypes::size_type i = 0; i < nSize && maDBData.sDataSource.isEmpty(); ++i)
+        const SwFieldTypes::size_type nSize = getIDocumentFieldsAccess().GetFieldTypes()->size();
+        for(SwFieldTypes::size_type i = 0; i < nSize && maDBData.sDataSource.isEmpty(); ++i)
         {
-            SwFieldType& rFldType = *((*getIDocumentFieldsAccess().GetFldTypes())[i]);
-            sal_uInt16 nWhich = rFldType.Which();
-            if(IsUsed(rFldType))
+            SwFieldType& rFieldType = *((*getIDocumentFieldsAccess().GetFieldTypes())[i]);
+            sal_uInt16 nWhich = rFieldType.Which();
+            if(IsUsed(rFieldType))
             {
                 switch(nWhich)
                 {
@@ -377,15 +377,15 @@ const SwDBData& SwDoc::GetDBDesc()
                     case RES_DBNUMSETFLD:
                     case RES_DBSETNUMBERFLD:
                     {
-                        SwIterator<SwFmtFld,SwFieldType> aIter( rFldType );
-                        for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+                        SwIterator<SwFormatField,SwFieldType> aIter( rFieldType );
+                        for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
                         {
-                            if(pFld->IsFldInDoc())
+                            if(pField->IsFieldInDoc())
                             {
                                 if(RES_DBFLD == nWhich)
-                                    maDBData = (static_cast < SwDBFieldType * > (pFld->GetField()->GetTyp()))->GetDBData();
+                                    maDBData = (static_cast < SwDBFieldType * > (pField->GetField()->GetTyp()))->GetDBData();
                                 else
-                                    maDBData = (static_cast < SwDBNameInfField* > (pFld->GetField()))->GetRealDBData();
+                                    maDBData = (static_cast < SwDBNameInfField* > (pField->GetField()))->GetRealDBData();
                                 break;
                             }
                         }
@@ -438,7 +438,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
         pAllDBNames = &aAllDBNames;
     }
 
-    SwSectionFmts& rArr = GetSections();
+    SwSectionFormats& rArr = GetSections();
     for (auto n = rArr.size(); n; )
     {
         SwSection* pSect = rArr[ --n ]->GetSection();
@@ -458,35 +458,35 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
         if( 0 == (pItem = GetAttrPool().GetItem2( RES_TXTATR_FIELD, n ) ))
             continue;
 
-        const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
-        const SwField* pFld = pFmtFld->GetField();
-        switch( pFld->GetTyp()->Which() )
+        const SwField* pField = pFormatField->GetField();
+        switch( pField->GetTyp()->Which() )
         {
             case RES_DBFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBField*>(pFld)->GetDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBField*>(pField)->GetDBData() ));
                 break;
 
             case RES_DBSETNUMBERFLD:
             case RES_DBNAMEFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pFld)->GetRealDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() ));
                 break;
 
             case RES_DBNUMSETFLD:
             case RES_DBNEXTSETFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pFld)->GetRealDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() ));
                 // no break  // JP: is that right like that?
 
             case RES_HIDDENTXTFLD:
             case RES_HIDDENPARAFLD:
                 AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-                                            pFld->GetPar1(), aUsedDBNames ));
+                                            pField->GetPar1(), aUsedDBNames ));
                 aUsedDBNames.clear();
                 break;
 
@@ -494,7 +494,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
             case RES_GETEXPFLD:
             case RES_TABLEFLD:
                 AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-                                        pFld->GetFormula(), aUsedDBNames ));
+                                        pField->GetFormula(), aUsedDBNames ));
                 aUsedDBNames.clear();
                 break;
         }
@@ -595,7 +595,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
     aNewDBData.sCommand = rNewName.getToken(1, DB_DELIM);
     aNewDBData.nCommandType = (short)rNewName.getToken(2, DB_DELIM).toInt32();
 
-    SwSectionFmts& rArr = GetSections();
+    SwSectionFormats& rArr = GetSections();
     for (auto n = rArr.size(); n; )
     {
         SwSection* pSect = rArr[ --n ]->GetSection();
@@ -614,30 +614,30 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
         if( !pItem )
             continue;
 
-        SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem));
-        SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        SwFormatField* pFormatField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem));
+        SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
-        SwField* pFld = pFmtFld->GetField();
+        SwField* pField = pFormatField->GetField();
         bool bExpand = false;
 
-        switch( pFld->GetTyp()->Which() )
+        switch( pField->GetTyp()->Which() )
         {
             case RES_DBFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
-                if( IsNameInArray( rOldNames, lcl_DBDataToString(static_cast<SwDBField*>(pFld)->GetDBData())))
+                if( IsNameInArray( rOldNames, lcl_DBDataToString(static_cast<SwDBField*>(pField)->GetDBData())))
                 {
-                    SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pFld->GetTyp());
+                    SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pField->GetTyp());
 
-                    SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(getIDocumentFieldsAccess().InsertFldType(
+                    SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(getIDocumentFieldsAccess().InsertFieldType(
                             SwDBFieldType(this, pOldTyp->GetColumnName(), aNewDBData)));
 
-                    pFmtFld->RegisterToFieldType( *pTyp );
-                    pFld->ChgTyp(pTyp);
+                    pFormatField->RegisterToFieldType( *pTyp );
+                    pField->ChgTyp(pTyp);
 
-                    static_cast<SwDBField*>(pFld)->ClearInitialized();
-                    static_cast<SwDBField*>(pFld)->InitContent();
+                    static_cast<SwDBField*>(pField)->ClearInitialized();
+                    static_cast<SwDBField*>(pField)->InitContent();
 
                     bExpand = true;
                 }
@@ -647,9 +647,9 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
             case RES_DBSETNUMBERFLD:
             case RES_DBNAMEFLD:
                 if( IsNameInArray( rOldNames,
-                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pFld)->GetRealDBData())))
+                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pField)->GetRealDBData())))
                 {
-                    static_cast<SwDBNameInfField*>(pFld)->SetDBData(aNewDBData);
+                    static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData);
                     bExpand = true;
                 }
                 break;
@@ -657,27 +657,27 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
             case RES_DBNUMSETFLD:
             case RES_DBNEXTSETFLD:
                 if( IsNameInArray( rOldNames,
-                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pFld)->GetRealDBData())))
+                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pField)->GetRealDBData())))
                 {
-                    static_cast<SwDBNameInfField*>(pFld)->SetDBData(aNewDBData);
+                    static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData);
                 }
                 // no break;
             case RES_HIDDENTXTFLD:
             case RES_HIDDENPARAFLD:
-                pFld->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pFld->GetPar1()) );
+                pField->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pField->GetPar1()) );
                 bExpand = true;
                 break;
 
             case RES_SETEXPFLD:
             case RES_GETEXPFLD:
             case RES_TABLEFLD:
-                pFld->SetPar2( ReplaceUsedDBs(rOldNames, rNewName, pFld->GetFormula()) );
+                pField->SetPar2( ReplaceUsedDBs(rOldNames, rNewName, pField->GetFormula()) );
                 bExpand = true;
                 break;
         }
 
         if (bExpand)
-            pTxtFld->ExpandTxtFld( true );
+            pTextField->ExpandTextField( true );
     }
     getIDocumentState().SetModified();
 #endif
@@ -747,14 +747,14 @@ bool SwDoc::IsNameInArray( const std::vector<OUString>& rArr, const OUString& rN
 
 void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
 {
-    const SwFldTypes::size_type nSize = getIDocumentFieldsAccess().GetFldTypes()->size();
+    const SwFieldTypes::size_type nSize = getIDocumentFieldsAccess().GetFieldTypes()->size();
 
-    for( SwFldTypes::size_type i = INIT_FLDTYPES; i < nSize; ++i )
+    for( SwFieldTypes::size_type i = INIT_FLDTYPES; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (*getIDocumentFieldsAccess().GetFldTypes())[i];
-        if( RES_AUTHORITY  == pFldType->Which() )
+        SwFieldType* pFieldType = (*getIDocumentFieldsAccess().GetFieldTypes())[i];
+        if( RES_AUTHORITY  == pFieldType->Which() )
         {
-            SwAuthorityFieldType* pAuthType = static_cast<SwAuthorityFieldType*>(pFldType);
+            SwAuthorityFieldType* pAuthType = static_cast<SwAuthorityFieldType*>(pFieldType);
             pAuthType->ChangeEntryContent(pNewData);
             break;
         }
@@ -762,9 +762,9 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
 
 }
 
-void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
+void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rField )
 {
-    const sal_uInt16 nWhich = rFld.GetFmtFld().GetField()->GetTyp()->Which();
+    const sal_uInt16 nWhich = rField.GetFormatField().GetField()->GetTyp()->Which();
     switch( nWhich )
     {
     case RES_DBFLD:
@@ -782,54 +782,54 @@ void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
     }
 
     SetFieldsDirty( true );
-    if( !pFldSortLst )
+    if( !pFieldSortLst )
     {
         if( !bIns )             // if list is present and deleted
             return;             // don't do a thing
-        pFldSortLst = new _SetGetExpFlds;
+        pFieldSortLst = new _SetGetExpFields;
     }
 
     if( bIns )      // insert anew:
-        GetBodyNode( rFld, nWhich );
+        GetBodyNode( rField, nWhich );
     else
     {
-        // look up via the pTxtFld pointer. It is a sorted list, but it's sorted by node
+        // look up via the pTextField pointer. It is a sorted list, but it's sorted by node
         // position. Until this is found, the search for the pointer is already done.
-        for( _SetGetExpFlds::size_type n = 0; n < pFldSortLst->size(); ++n )
-            if( &rFld == (*pFldSortLst)[ n ]->GetPointer() )
+        for( _SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n )
+            if( &rField == (*pFieldSortLst)[ n ]->GetPointer() )
             {
-                delete (*pFldSortLst)[n];
-                pFldSortLst->erase(n);
+                delete (*pFieldSortLst)[n];
+                pFieldSortLst->erase(n);
                 n--; // one field can occur multiple times
             }
     }
 }
 
-void SwDocUpdtFld::MakeFldList( SwDoc& rDoc, bool bAll, int eGetMode )
+void SwDocUpdateField::MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode )
 {
-    if( !pFldSortLst || bAll || !( eGetMode & nFldLstGetMode ) ||
+    if( !pFieldSortLst || bAll || !( eGetMode & nFieldLstGetMode ) ||
         rDoc.GetNodes().Count() != nNodes )
-        _MakeFldList( rDoc, eGetMode );
+        _MakeFieldList( rDoc, eGetMode );
 }
 
-void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
+void SwDocUpdateField::_MakeFieldList( SwDoc& rDoc, int eGetMode )
 {
     // new version: walk all fields of the attribute pool
-    delete pFldSortLst;
-    pFldSortLst = new _SetGetExpFlds;
+    delete pFieldSortLst;
+    pFieldSortLst = new _SetGetExpFields;
 
     // consider and unhide sections
     //     with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>)
     //     notes by OD:
-    //         eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
-    //         eGetMode == GETFLD_EXPAND in call from method SwDoc::FldsToExpand
-    //         eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds
+    //         eGetMode == GETFLD_CALC in call from methods SwDoc::FieldsToCalc
+    //         eGetMode == GETFLD_EXPAND in call from method SwDoc::FieldsToExpand
+    //         eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFields
     //         I figured out that hidden section only have to be shown,
-    //         if fields have updated (call by SwDoc::UpdateExpFlds) and thus
+    //         if fields have updated (call by SwDoc::UpdateExpFields) and thus
     //         the hide conditions of section have to be updated.
     //         For correct updating the hide condition of a section, its position
     //         have to be known in order to insert the hide condition as a new
-    //         expression field into the sorted field list (<pFldSortLst>).
+    //         expression field into the sorted field list (<pFieldSortLst>).
     if ( eGetMode == GETFLD_ALL )
     // Collect the sections first. Supply sections that are hidden by condition
     // with frames so that the contained fields are sorted properly.
@@ -838,19 +838,19 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
         // from top to bottom
         std::vector<sal_uLong> aTmpArr;
         std::vector<sal_uLong>::size_type nArrStt = 0;
-        SwSectionFmts& rArr = rDoc.GetSections();
+        SwSectionFormats& rArr = rDoc.GetSections();
         SwSectionNode* pSectNd = 0;
-        sal_uLong nSttCntnt = rDoc.GetNodes().GetEndOfExtras().GetIndex();
+        sal_uLong nSttContent = rDoc.GetNodes().GetEndOfExtras().GetIndex();
 
-        for (SwSectionFmts::size_type n = rArr.size(); n; )
+        for (SwSectionFormats::size_type n = rArr.size(); n; )
         {
             SwSection* pSect = rArr[ --n ]->GetSection();
             if( pSect && pSect->IsHidden() && !pSect->GetCondition().isEmpty() &&
-                0 != ( pSectNd = pSect->GetFmt()->GetSectionNode() ))
+                0 != ( pSectNd = pSect->GetFormat()->GetSectionNode() ))
             {
                 sal_uLong nIdx = pSectNd->GetIndex();
                 aTmpArr.push_back( nIdx );
-                if( nIdx < nSttCntnt )
+                if( nIdx < nSttContent )
                     ++nArrStt;
             }
         }
@@ -892,14 +892,14 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
         if( !pItem )
             continue;
 
-        const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
         OUString sFormula;
-        const SwField* pFld = pFmtFld->GetField();
-        const sal_uInt16 nWhich = pFld->GetTyp()->Which();
+        const SwField* pField = pFormatField->GetField();
+        const sal_uInt16 nWhich = pField->GetTyp()->Which();
         switch( nWhich )
         {
             case RES_DBSETNUMBERFLD:
@@ -915,7 +915,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
 
             case RES_SETEXPFLD:
                 if ( !(eGetMode == GETFLD_EXPAND) ||
-                     (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) )
+                     (nsSwGetSetExpType::GSE_STRING & pField->GetSubType()) )
                 {
                     sFormula = sTrue;
                 }
@@ -924,64 +924,64 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
             case RES_HIDDENPARAFLD:
                 if( GETFLD_ALL == eGetMode )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld))->SetHidden( false );
+                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField))->SetHidden( false );
                     else if (sFormula==sTrue)
-                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld))->SetHidden( true );
+                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField))->SetHidden( true );
                     else
                         break;
 
                     sFormula.clear();
                     // trigger formatting
-                    const_cast<SwFmtFld*>(pFmtFld)->ModifyNotification( 0, 0 );
+                    const_cast<SwFormatField*>(pFormatField)->ModifyNotification( 0, 0 );
                 }
                 break;
 
             case RES_HIDDENTXTFLD:
                 if( GETFLD_ALL == eGetMode )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->SetValue( true );
+                        const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->SetValue( true );
                     else if (sFormula==sTrue)
-                        const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->SetValue( false );
+                        const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->SetValue( false );
                     else
                         break;
 
                     sFormula.clear();
 
                     // evaluate field
-                    const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->Evaluate(&rDoc);
+                    const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->Evaluate(&rDoc);
                     // trigger formatting
-                    const_cast<SwFmtFld*>(pFmtFld)->ModifyNotification( 0, 0 );
+                    const_cast<SwFormatField*>(pFormatField)->ModifyNotification( 0, 0 );
                 }
                 break;
 
 #if HAVE_FEATURE_DBCONNECTIVITY
             case RES_DBNUMSETFLD:
             {
-                SwDBData aDBData(const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pFld))->GetDBData(&rDoc));
+                SwDBData aDBData(const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pField))->GetDBData(&rDoc));
 
                 if (
                      (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
-                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNumSetField*>(pFld)->IsCondValid()))
+                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNumSetField*>(pField)->IsCondValid()))
                    )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                 }
             }
             break;
             case RES_DBNEXTSETFLD:
             {
-                SwDBData aDBData(const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pFld))->GetDBData(&rDoc));
+                SwDBData aDBData(const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pField))->GetDBData(&rDoc));
 
                 if (
                      (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
-                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNextSetField*>(pFld)->IsCondValid()))
+                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNextSetField*>(pField)->IsCondValid()))
                    )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                 }
             }
             break;
@@ -990,29 +990,29 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
 
         if (!sFormula.isEmpty())
         {
-            GetBodyNode( *pTxtFld, nWhich );
+            GetBodyNode( *pTextField, nWhich );
         }
     }
-    nFldLstGetMode = static_cast<sal_uInt8>( eGetMode );
+    nFieldLstGetMode = static_cast<sal_uInt8>( eGetMode );
     nNodes = rDoc.GetNodes().Count();
 }
 
-void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
+void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFieldWhich )
 {
-    const SwTxtNode& rTxtNd = rTFld.GetTxtNode();
-    const SwDoc& rDoc = *rTxtNd.GetDoc();
+    const SwTextNode& rTextNd = rTField.GetTextNode();
+    const SwDoc& rDoc = *rTextNd.GetDoc();
 
     // always the first! (in tab headline, header-/footer)
     Point aPt;
-    const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+    const SwContentFrm* pFrm = rTextNd.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
 
-    _SetGetExpFld* pNew = NULL;
+    _SetGetExpField* pNew = NULL;
     bool bIsInBody = false;
 
     if( !pFrm || pFrm->IsInDocBody() )
     {
         // create index to determine the TextNode
-        SwNodeIndex aIdx( rTxtNd );
+        SwNodeIndex aIdx( rTextNd );
         bIsInBody = rDoc.GetNodes().GetEndOfExtras().GetIndex() < aIdx.GetIndex();
 
         // We don't want to update fields in redlines, or those
@@ -1020,40 +1020,40 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
         // fields in hidden sections. So: In order to be updated, a field 1)
         // must have a frame, or 2) it must be in the document body.
         if( (pFrm != NULL) || bIsInBody )
-            pNew = new _SetGetExpFld( aIdx, &rTFld );
+            pNew = new _SetGetExpField( aIdx, &rTField );
     }
     else
     {
         // create index to determine the TextNode
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-        bool const bResult = GetBodyTxtNode( rDoc, aPos, *pFrm );
+        bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrm );
         OSL_ENSURE(bResult, "where is the Field");
         (void) bResult; // unused in non-debug
-        pNew = new _SetGetExpFld( aPos.nNode, &rTFld, &aPos.nContent );
+        pNew = new _SetGetExpField( aPos.nNode, &rTField, &aPos.nContent );
     }
 
-    // always set the BodyTxtFlag in GetExp or DB fields
-    if( RES_GETEXPFLD == nFldWhich )
+    // always set the BodyTextFlag in GetExp or DB fields
+    if( RES_GETEXPFLD == nFieldWhich )
     {
-        SwGetExpField* pGetFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(rTFld.GetFmtFld().GetField()));
-        pGetFld->ChgBodyTxtFlag( bIsInBody );
+        SwGetExpField* pGetField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(rTField.GetFormatField().GetField()));
+        pGetField->ChgBodyTextFlag( bIsInBody );
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
-    else if( RES_DBFLD == nFldWhich )
+    else if( RES_DBFLD == nFieldWhich )
     {
-        SwDBField* pDBFld = const_cast<SwDBField*>(static_cast<const SwDBField*>(rTFld.GetFmtFld().GetField()));
-        pDBFld->ChgBodyTxtFlag( bIsInBody );
+        SwDBField* pDBField = const_cast<SwDBField*>(static_cast<const SwDBField*>(rTField.GetFormatField().GetField()));
+        pDBField->ChgBodyTextFlag( bIsInBody );
     }
 #endif
     if( pNew != NULL )
-        if( !pFldSortLst->insert( pNew ).second )
+        if( !pFieldSortLst->insert( pNew ).second )
             delete pNew;
 }
 
-void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
+void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd )
 {
     const SwDoc& rDoc = *rSectNd.GetDoc();
-    _SetGetExpFld* pNew = 0;
+    _SetGetExpField* pNew = 0;
 
     if( rSectNd.GetIndex() < rDoc.GetNodes().GetEndOfExtras().GetIndex() )
     {
@@ -1062,93 +1062,93 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
             // we need to get the anchor first
             // create index to determine the TextNode
             SwPosition aPos( rSectNd );
-            SwCntntNode* pCNd = rDoc.GetNodes().GoNext( &aPos.nNode ); // to the next ContentNode
+            SwContentNode* pCNd = rDoc.GetNodes().GoNext( &aPos.nNode ); // to the next ContentNode
 
-            if( !pCNd || !pCNd->IsTxtNode() )
+            if( !pCNd || !pCNd->IsTextNode() )
                 break;
 
             // always the first! (in tab headline, header-/footer)
             Point aPt;
-            const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+            const SwContentFrm* pFrm = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
             if( !pFrm )
                 break;
 
-            bool const bResult = GetBodyTxtNode( rDoc, aPos, *pFrm );
+            bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrm );
             OSL_ENSURE(bResult, "where is the Field");
             (void) bResult; // unused in non-debug
-            pNew = new _SetGetExpFld( rSectNd, &aPos );
+            pNew = new _SetGetExpField( rSectNd, &aPos );
 
         } while( false );
     }
 
     if( !pNew )
-        pNew = new _SetGetExpFld( rSectNd );
+        pNew = new _SetGetExpField( rSectNd );
 
-    if( !pFldSortLst->insert( pNew ).second )
+    if( !pFieldSortLst->insert( pNew ).second )
         delete pNew;
 }
 
-void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
+void SwDocUpdateField::InsertFieldType( const SwFieldType& rType )
 {
-    OUString sFldName;
+    OUString sFieldName;
     switch( rType.Which() )
     {
     case RES_USERFLD :
-        sFldName = static_cast<const SwUserFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwUserFieldType&>(rType).GetName();
         break;
     case RES_SETEXPFLD:
-        sFldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
         break;
     default:
         OSL_ENSURE( false, "kein gueltiger FeldTyp" );
     }
 
-    if( !sFldName.isEmpty() )
+    if( !sFieldName.isEmpty() )
     {
         SetFieldsDirty( true );
         // look up and remove from the hash table
-        sFldName = GetAppCharClass().lowercase( sFldName );
+        sFieldName = GetAppCharClass().lowercase( sFieldName );
         sal_uInt16 n;
 
-        SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
+        SwHash* pFnd = Find( sFieldName, GetFieldTypeTable(), TBLSZ, &n );
 
         if( !pFnd )
         {
-            SwCalcFldType* pNew = new SwCalcFldType( sFldName, &rType );
-            pNew->pNext = aFldTypeTable[ n ];
-            aFldTypeTable[ n ] = pNew;
+            SwCalcFieldType* pNew = new SwCalcFieldType( sFieldName, &rType );
+            pNew->pNext = aFieldTypeTable[ n ];
+            aFieldTypeTable[ n ] = pNew;
         }
     }
 }
 
-void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
+void SwDocUpdateField::RemoveFieldType( const SwFieldType& rType )
 {
-    OUString sFldName;
+    OUString sFieldName;
     switch( rType.Which() )
     {
     case RES_USERFLD :
-        sFldName = static_cast<const SwUserFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwUserFieldType&>(rType).GetName();
         break;
     case RES_SETEXPFLD:
-        sFldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
         break;
     }
 
-    if( !sFldName.isEmpty() )
+    if( !sFieldName.isEmpty() )
     {
         SetFieldsDirty( true );
         // look up and remove from the hash table
-        sFldName = GetAppCharClass().lowercase( sFldName );
+        sFieldName = GetAppCharClass().lowercase( sFieldName );
         sal_uInt16 n;
 
-        SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
+        SwHash* pFnd = Find( sFieldName, GetFieldTypeTable(), TBLSZ, &n );
         if( pFnd )
         {
-            if( aFldTypeTable[ n ] == pFnd )
-                aFldTypeTable[ n ] = static_cast<SwCalcFldType*>(pFnd->pNext);
+            if( aFieldTypeTable[ n ] == pFnd )
+                aFieldTypeTable[ n ] = static_cast<SwCalcFieldType*>(pFnd->pNext);
             else
             {
-                SwHash* pPrev = aFldTypeTable[ n ];
+                SwHash* pPrev = aFieldTypeTable[ n ];
                 while( pPrev->pNext != pFnd )
                     pPrev = pPrev->pNext;
                 pPrev->pNext = pFnd->pNext;
@@ -1159,24 +1159,24 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
     }
 }
 
-SwDocUpdtFld::SwDocUpdtFld(SwDoc* pDoc)
-    : pFldSortLst(0)
+SwDocUpdateField::SwDocUpdateField(SwDoc* pDoc)
+    : pFieldSortLst(0)
     , nNodes(0)
-    , nFldLstGetMode(0)
+    , nFieldLstGetMode(0)
     , pDocument(pDoc)
-    , bInUpdateFlds(false)
-    , bFldsDirty(false)
+    , bInUpdateFields(false)
+    , bFieldsDirty(false)
 
 {
-    memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
+    memset( aFieldTypeTable, 0, sizeof( aFieldTypeTable ) );
 }
 
-SwDocUpdtFld::~SwDocUpdtFld()
+SwDocUpdateField::~SwDocUpdateField()
 {
-    delete pFldSortLst;
+    delete pFieldSortLst;
 
     for( int n = 0; n < TBLSZ; ++n )
-        delete aFldTypeTable[n];
+        delete aFieldTypeTable[n];
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 53edd19eed14..e3531caceb14 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -74,24 +74,24 @@ using namespace ::com::sun::star;
 
 size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
 {
-    const SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    const size_t nSize = rFmts.size();
+    const SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    const size_t nSize = rFormats.size();
     size_t nCount = 0;
     const SwNodeIndex* pIdx;
 
-    std::set<const SwFrmFmt*> aTextBoxes;
+    std::set<const SwFrameFormat*> aTextBoxes;
     if (bIgnoreTextBoxes)
         aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
 
     for ( size_t i = 0; i < nSize; ++i)
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ i ];
+        const SwFrameFormat* pFlyFormat = rFormats[ i ];
 
-        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFmt) != aTextBoxes.end())
+        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
             continue;
 
-        if( RES_FLYFRMFMT == pFlyFmt->Which()
-            && 0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() )
+        if( RES_FLYFRMFMT == pFlyFormat->Which()
+            && 0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() )
             && pIdx->GetNodes().IsDocNodes()
             )
         {
@@ -100,7 +100,7 @@ size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
             switch( eType )
             {
             case FLYCNTTYPE_FRM:
-                if(!pNd->IsNoTxtNode())
+                if(!pNd->IsNoTextNode())
                     nCount++;
                 break;
 
@@ -123,27 +123,27 @@ size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
 }
 
 /// @attention If you change this, also update SwXFrameEnumeration in unocoll.
-SwFrmFmt* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes )
+SwFrameFormat* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes )
 {
-    SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    SwFrmFmt* pRetFmt = 0;
-    const size_t nSize = rFmts.size();
+    SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    SwFrameFormat* pRetFormat = 0;
+    const size_t nSize = rFormats.size();
     const SwNodeIndex* pIdx;
     size_t nCount = 0;
 
-    std::set<const SwFrmFmt*> aTextBoxes;
+    std::set<const SwFrameFormat*> aTextBoxes;
     if (bIgnoreTextBoxes)
         aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
 
-    for( size_t i = 0; !pRetFmt && i < nSize; ++i )
+    for( size_t i = 0; !pRetFormat && i < nSize; ++i )
     {
-        SwFrmFmt* pFlyFmt = rFmts[ i ];
+        SwFrameFormat* pFlyFormat = rFormats[ i ];
 
-        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFmt) != aTextBoxes.end())
+        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
             continue;
 
-        if( RES_FLYFRMFMT == pFlyFmt->Which()
-            && 0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() )
+        if( RES_FLYFRMFMT == pFlyFormat->Which()
+            && 0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() )
             && pIdx->GetNodes().IsDocNodes()
             )
         {
@@ -151,37 +151,37 @@ SwFrmFmt* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes
             switch( eType )
             {
             case FLYCNTTYPE_FRM:
-                if( !pNd->IsNoTxtNode() && nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                if( !pNd->IsNoTextNode() && nIdx == nCount++)
+                    pRetFormat = pFlyFormat;
                 break;
             case FLYCNTTYPE_GRF:
                 if(pNd->IsGrfNode() && nIdx == nCount++ )
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
                 break;
             case FLYCNTTYPE_OLE:
                 if(pNd->IsOLENode() && nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
                 break;
             default:
                 if(nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
             }
         }
     }
-    return pRetFmt;
+    return pRetFormat;
 }
 
-static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
-                            const SwFrmFmt* pFlyFmt )
+static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFormatAnchor& rAnch,
+                            const SwFrameFormat* pFlyFormat )
 {
     Point aRet;
     if( rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() )
         switch( rAnch.GetAnchorId() )
         {
         case FLY_AS_CHAR:
-            if( pFlyFmt && rAnch.GetCntntAnchor() )
+            if( pFlyFormat && rAnch.GetContentAnchor() )
             {
-                const SwFrm* pOld = static_cast<const SwFlyFrmFmt*>(pFlyFmt)->GetFrm( &aRet, false );
+                const SwFrm* pOld = static_cast<const SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aRet, false );
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
@@ -189,10 +189,10 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
 
         case FLY_AT_PARA:
         case FLY_AT_CHAR: // LAYER_IMPL
-            if( rAnch.GetCntntAnchor() )
+            if( rAnch.GetContentAnchor() )
             {
-                const SwPosition *pPos = rAnch.GetCntntAnchor();
-                const SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode();
+                const SwPosition *pPos = rAnch.GetContentAnchor();
+                const SwContentNode* pNd = pPos->nNode.GetNode().GetContentNode();
                 const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aRet, 0, false ) : 0;
                 if( pOld )
                     aRet = pOld->Frm().Pos();
@@ -200,11 +200,11 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
             break;
 
         case FLY_AT_FLY: // LAYER_IMPL
-            if( rAnch.GetCntntAnchor() )
+            if( rAnch.GetContentAnchor() )
             {
-                const SwFlyFrmFmt* pFmt = static_cast<SwFlyFrmFmt*>(rAnch.GetCntntAnchor()->
-                                                nNode.GetNode().GetFlyFmt());
-                const SwFrm* pOld = pFmt ? pFmt->GetFrm( &aRet, false ) : 0;
+                const SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>(rAnch.GetContentAnchor()->
+                                                nNode.GetNode().GetFlyFormat());
+                const SwFrm* pOld = pFormat ? pFormat->GetFrm( &aRet, false ) : 0;
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
@@ -233,19 +233,19 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
 #define IGNOREANCHOR 1
 #define DONTMAKEFRMS 2
 
-sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms )
+sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrameFormat& rFormat, SfxItemSet& rSet, bool bNewFrms )
 {
     // Changing anchors is almost always allowed.
     // Exception: Paragraph and character bound frames must not become
     // page bound, if they are located in the header or footer.
-    const SwFmtAnchor &rOldAnch = rFmt.GetAnchor();
+    const SwFormatAnchor &rOldAnch = rFormat.GetAnchor();
     const RndStdIds nOld = rOldAnch.GetAnchorId();
 
-    SwFmtAnchor aNewAnch( static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )) );
+    SwFormatAnchor aNewAnch( static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )) );
     RndStdIds nNew = aNewAnch.GetAnchorId();
 
     // Is the new anchor valid?
-    if( !aNewAnch.GetCntntAnchor() && (FLY_AT_FLY == nNew ||
+    if( !aNewAnch.GetContentAnchor() && (FLY_AT_FLY == nNew ||
         (FLY_AT_PARA == nNew) || (FLY_AS_CHAR == nNew) ||
         (FLY_AT_CHAR == nNew) ))
     {
@@ -255,40 +255,40 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
     if( nOld == nNew )
         return DONTMAKEFRMS;
 
-    Point aOldAnchorPos( ::lcl_FindAnchorLayPos( *this, rOldAnch, &rFmt ));
+    Point aOldAnchorPos( ::lcl_FindAnchorLayPos( *this, rOldAnch, &rFormat ));
     Point aNewAnchorPos( ::lcl_FindAnchorLayPos( *this, aNewAnch, 0 ));
 
     // Destroy the old Frames.
     // The Views are hidden implicitly, so hiding them another time would be
     // kind of a show!
-    rFmt.DelFrms();
+    rFormat.DelFrms();
 
     if ( FLY_AS_CHAR == nOld )
     {
-        // We need to handle InCntnts in a special way:
-        // The TxtAttribut needs to be destroyed which, unfortunately, also
+        // We need to handle InContents in a special way:
+        // The TextAttribut needs to be destroyed which, unfortunately, also
         // destroys the format. To avoid that, we disconnect the format from
         // the attribute.
-        const SwPosition *pPos = rOldAnch.GetCntntAnchor();
-        SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        const SwPosition *pPos = rOldAnch.GetContentAnchor();
+        SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
         const sal_Int32 nIdx = pPos->nContent.GetIndex();
-        SwTxtAttr * const  pHnt =
-            pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
-        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        SwTextAttr * const  pHint =
+            pTextNode->GetTextAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
+        OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
-                    "Wrong TxtFlyCnt-Hint." );
-        if (pHnt)
-            const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+        OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == &rFormat,
+                    "Wrong TextFlyCnt-Hint." );
+        if (pHint)
+            const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
         // They are disconnected. We now have to destroy the attribute.
-        pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
+        pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
     }
 
     // We can finally set the attribute. It needs to be the first one!
     // Undo depends on it!
-    rFmt.SetFmtAttr( aNewAnch );
+    rFormat.SetFormatAttr( aNewAnch );
 
     // Correct the position
     const SfxPoolItem* pItem;
@@ -298,17 +298,17 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
             // If no position attributes are received, we have to make sure
             // that no forbidden automatic alignment is left.
         {
-            const SwPosition *pPos = aNewAnch.GetCntntAnchor();
-            SwTxtNode *pNd = pPos->nNode.GetNode().GetTxtNode();
-            OSL_ENSURE( pNd, "Crsr does not point to TxtNode." );
+            const SwPosition *pPos = aNewAnch.GetContentAnchor();
+            SwTextNode *pNd = pPos->nNode.GetNode().GetTextNode();
+            OSL_ENSURE( pNd, "Crsr does not point to TextNode." );
 
-            SwFmtFlyCnt aFmt( static_cast<SwFlyFrmFmt*>(&rFmt) );
-            pNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 );
+            SwFormatFlyCnt aFormat( static_cast<SwFlyFrameFormat*>(&rFormat) );
+            pNd->InsertItem( aFormat, pPos->nContent.GetIndex(), 0 );
         }
 
         if( SfxItemState::SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem ))
         {
-            SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
+            SwFormatVertOrient aOldV( rFormat.GetVertOrient() );
             bool bSet = true;
             switch( aOldV.GetVertOrient() )
             {
@@ -336,17 +336,17 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
             if( SfxItemState::SET != rSet.GetItemState( RES_HORI_ORIENT, false, &pItem ))
                 pItem = 0;
 
-            SwFmtHoriOrient aOldH( rFmt.GetHoriOrient() );
+            SwFormatHoriOrient aOldH( rFormat.GetHoriOrient() );
 
             if( text::HoriOrientation::NONE == aOldH.GetHoriOrient() && ( !pItem ||
-                aOldH.GetPos() == static_cast<const SwFmtHoriOrient*>(pItem)->GetPos() ))
+                aOldH.GetPos() == static_cast<const SwFormatHoriOrient*>(pItem)->GetPos() ))
             {
                 SwTwips nPos = (FLY_AS_CHAR == nOld) ? 0 : aOldH.GetPos();
                 nPos += aOldAnchorPos.getX() - aNewAnchorPos.getX();
 
                 if( pItem )
                 {
-                    SwFmtHoriOrient* pH = const_cast<SwFmtHoriOrient*>(static_cast<const SwFmtHoriOrient*>(pItem));
+                    SwFormatHoriOrient* pH = const_cast<SwFormatHoriOrient*>(static_cast<const SwFormatHoriOrient*>(pItem));
                     aOldH.SetHoriOrient( pH->GetHoriOrient() );
                     aOldH.SetRelationOrient( pH->GetRelationOrient() );
                 }
@@ -356,18 +356,18 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
 
             if( SfxItemState::SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem ))
                 pItem = 0;
-            SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
+            SwFormatVertOrient aOldV( rFormat.GetVertOrient() );
 
             // #i28922# - correction: compare <aOldV.GetVertOrient() with
             // <text::VertOrientation::NONE>
             if( text::VertOrientation::NONE == aOldV.GetVertOrient() && (!pItem ||
-                aOldV.GetPos() == static_cast<const SwFmtVertOrient*>(pItem)->GetPos() ) )
+                aOldV.GetPos() == static_cast<const SwFormatVertOrient*>(pItem)->GetPos() ) )
             {
                 SwTwips nPos = (FLY_AS_CHAR == nOld) ? 0 : aOldV.GetPos();
                 nPos += aOldAnchorPos.getY() - aNewAnchorPos.getY();
                 if( pItem )
                 {
-                    SwFmtVertOrient* pV = const_cast<SwFmtVertOrient*>(static_cast<const SwFmtVertOrient*>(pItem));
+                    SwFormatVertOrient* pV = const_cast<SwFormatVertOrient*>(static_cast<const SwFormatVertOrient*>(pItem));
                     aOldV.SetVertOrient( pV->GetVertOrient() );
                     aOldV.SetRelationOrient( pV->GetRelationOrient() );
                 }
@@ -381,18 +381,18 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
     }
 
     if( bNewFrms )
-        rFmt.MakeFrms();
+        rFormat.MakeFrms();
 
     return MAKEFRMS;
 }
 
 static bool
 lcl_SetFlyFrmAttr(SwDoc & rDoc,
-        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, bool),
-        SwFrmFmt & rFlyFmt, SfxItemSet & rSet)
+        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrameFormat &, SfxItemSet &, bool),
+        SwFrameFormat & rFlyFormat, SfxItemSet & rSet)
 {
-    // #i32968# Inserting columns in the frame causes MakeFrmFmt to put two
-    // objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the frame causes MakeFrameFormat to put two
+    // objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
 
     // Is the anchor attribute included?
@@ -400,12 +400,12 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     // if the Fly needs to be created anew, because we e.g change the FlyType.
     sal_Int8 const nMakeFrms =
         (SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false ))
-             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, false )
+             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFormat, rSet, false )
              :  DONTMAKEFRMS;
 
     const SfxPoolItem* pItem;
     SfxItemIter aIter( rSet );
-    SfxItemSet aTmpSet( rDoc.GetAttrPool(), aFrmFmtSetRange );
+    SfxItemSet aTmpSet( rDoc.GetAttrPool(), aFrameFormatSetRange );
     sal_uInt16 nWhich = aIter.GetCurItem()->Which();
     do {
         switch( nWhich )
@@ -426,7 +426,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
 
         default:
             if( !IsInvalidItem( aIter.GetCurItem() ) && ( SfxItemState::SET !=
-                rFlyFmt.GetAttrSet().GetItemState( nWhich, true, &pItem ) ||
+                rFlyFormat.GetAttrSet().GetItemState( nWhich, true, &pItem ) ||
                 *pItem != *aIter.GetCurItem() ))
                 aTmpSet.Put( *aIter.GetCurItem() );
             break;
@@ -438,10 +438,10 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     } while( 0 != ( nWhich = aIter.NextItem()->Which() ) );
 
     if( aTmpSet.Count() )
-        rFlyFmt.SetFmtAttr( aTmpSet );
+        rFlyFormat.SetFormatAttr( aTmpSet );
 
     if( MAKEFRMS == nMakeFrms )
-        rFlyFmt.MakeFrms();
+        rFlyFormat.MakeFrms();
 
     return aTmpSet.Count() || MAKEFRMS == nMakeFrms;
 }
@@ -504,20 +504,20 @@ void SwDoc::CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet)
     }
 }
 
-bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
+bool SwDoc::SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet )
 {
     if( !rSet.Count() )
         return false;
 
-    boost::scoped_ptr<SwUndoFmtAttrHelper> pSaveUndo;
+    boost::scoped_ptr<SwUndoFormatAttrHelper> pSaveUndo;
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().ClearRedo(); // AppendUndo far below, so leave it
-        pSaveUndo.reset( new SwUndoFmtAttrHelper( rFlyFmt ) );
+        pSaveUndo.reset( new SwUndoFormatAttrHelper( rFlyFormat ) );
     }
 
-    bool const bRet = lcl_SetFlyFrmAttr(*this, &SwDoc::SetFlyFrmAnchor, rFlyFmt, rSet);
+    bool const bRet = lcl_SetFlyFrmAttr(*this, &SwDoc::SetFlyFrmAnchor, rFlyFormat, rSet);
 
     if ( pSaveUndo.get() )
     {
@@ -529,16 +529,16 @@ bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
 
     getIDocumentState().SetModified();
 
-    SwTextBoxHelper::syncFlyFrmAttr(rFlyFmt, rSet);
+    SwTextBoxHelper::syncFlyFrmAttr(rFlyFormat, rSet);
 
     return bRet;
 }
 
 // #i73249#
-void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+void SwDoc::SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
                             const OUString& sNewTitle )
 {
-    if ( rFlyFrmFmt.GetObjTitle() == sNewTitle )
+    if ( rFlyFrameFormat.GetObjTitle() == sNewTitle )
     {
         return;
     }
@@ -547,21 +547,21 @@ void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrmFmt,
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrameFormat,
                                           UNDO_FLYFRMFMT_TITLE,
-                                          rFlyFrmFmt.GetObjTitle(),
+                                          rFlyFrameFormat.GetObjTitle(),
                                           sNewTitle ) );
     }
 
-    rFlyFrmFmt.SetObjTitle( sNewTitle, true );
+    rFlyFrameFormat.SetObjTitle( sNewTitle, true );
 
     getIDocumentState().SetModified();
 }
 
-void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+void SwDoc::SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
                                   const OUString& sNewDescription )
 {
-    if ( rFlyFrmFmt.GetObjDescription() == sNewDescription )
+    if ( rFlyFrameFormat.GetObjDescription() == sNewDescription )
     {
         return;
     }
@@ -570,72 +570,72 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrmFmt,
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrameFormat,
                                           UNDO_FLYFRMFMT_DESCRIPTION,
-                                          rFlyFrmFmt.GetObjDescription(),
+                                          rFlyFrameFormat.GetObjDescription(),
                                           sNewDescription ) );
     }
 
-    rFlyFrmFmt.SetObjDescription( sNewDescription, true );
+    rFlyFrameFormat.SetObjDescription( sNewDescription, true );
 
     getIDocumentState().SetModified();
 }
 
-bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
+bool SwDoc::SetFrameFormatToFly( SwFrameFormat& rFormat, SwFrameFormat& rNewFormat,
                             SfxItemSet* pSet, bool bKeepOrient )
 {
     bool bChgAnchor = false, bFrmSz = false;
 
-    const SwFmtFrmSize aFrmSz( rFmt.GetFrmSize() );
-    const SwFmtVertOrient aVert( rFmt.GetVertOrient() );
-    const SwFmtHoriOrient aHori( rFmt.GetHoriOrient() );
+    const SwFormatFrmSize aFrmSz( rFormat.GetFrmSize() );
+    const SwFormatVertOrient aVert( rFormat.GetVertOrient() );
+    const SwFormatHoriOrient aHori( rFormat.GetHoriOrient() );
 
-    SwUndoSetFlyFmt* pUndo = 0;
+    SwUndoSetFlyFormat* pUndo = 0;
     bool const bUndo = GetIDocumentUndoRedo().DoesUndo();
     if (bUndo)
     {
-        pUndo = new SwUndoSetFlyFmt( rFmt, rNewFmt );
+        pUndo = new SwUndoSetFlyFormat( rFormat, rNewFormat );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    // #i32968# Inserting columns in the section causes MakeFrmFmt to put
-    // 2 objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the section causes MakeFrameFormat to put
+    // 2 objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     // Set the column first, or we'll have trouble with
     //Set/Reset/Synch. and so on
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET != rNewFmt.GetAttrSet().GetItemState( RES_COL ))
-        rFmt.ResetFmtAttr( RES_COL );
+    if( SfxItemState::SET != rNewFormat.GetAttrSet().GetItemState( RES_COL ))
+        rFormat.ResetFormatAttr( RES_COL );
 
-    if( rFmt.DerivedFrom() != &rNewFmt )
+    if( rFormat.DerivedFrom() != &rNewFormat )
     {
-        rFmt.SetDerivedFrom( &rNewFmt );
+        rFormat.SetDerivedFrom( &rNewFormat );
 
         // 1. If not automatic = ignore; else = dispose
         // 2. Dispose of it!
-        if( SfxItemState::SET == rNewFmt.GetAttrSet().GetItemState( RES_FRM_SIZE, false ))
+        if( SfxItemState::SET == rNewFormat.GetAttrSet().GetItemState( RES_FRM_SIZE, false ))
         {
-            rFmt.ResetFmtAttr( RES_FRM_SIZE );
+            rFormat.ResetFormatAttr( RES_FRM_SIZE );
             bFrmSz = true;
         }
 
         const SfxItemSet* pAsk = pSet;
-        if( !pAsk ) pAsk = &rNewFmt.GetAttrSet();
+        if( !pAsk ) pAsk = &rNewFormat.GetAttrSet();
         if( SfxItemState::SET == pAsk->GetItemState( RES_ANCHOR, false, &pItem )
-            && static_cast<const SwFmtAnchor*>(pItem)->GetAnchorId() !=
-                rFmt.GetAnchor().GetAnchorId() )
+            && static_cast<const SwFormatAnchor*>(pItem)->GetAnchorId() !=
+                rFormat.GetAnchor().GetAnchorId() )
         {
             if( pSet )
-                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, *pSet, false );
+                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFormat, *pSet, false );
             else
             {
-                // Needs to have the FlyFmt range, because we set attributes in it,
+                // Needs to have the FlyFormat range, because we set attributes in it,
                 // in SetFlyFrmAnchor.
-                SfxItemSet aFlySet( *rNewFmt.GetAttrSet().GetPool(),
-                                    rNewFmt.GetAttrSet().GetRanges() );
+                SfxItemSet aFlySet( *rNewFormat.GetAttrSet().GetPool(),
+                                    rNewFormat.GetAttrSet().GetRanges() );
                 aFlySet.Put( *pItem );
-                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, aFlySet, false);
+                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFormat, aFlySet, false);
             }
         }
     }
@@ -647,33 +647,33 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
     // text::HoriOrientation::NONE and text::VertOrientation::NONE are allowed now
     if (!bKeepOrient)
     {
-        rFmt.ResetFmtAttr(RES_VERT_ORIENT);
-        rFmt.ResetFmtAttr(RES_HORI_ORIENT);
+        rFormat.ResetFormatAttr(RES_VERT_ORIENT);
+        rFormat.ResetFormatAttr(RES_HORI_ORIENT);
     }
 
-    rFmt.ResetFmtAttr( RES_PRINT, RES_SURROUND );
-    rFmt.ResetFmtAttr( RES_LR_SPACE, RES_UL_SPACE );
-    rFmt.ResetFmtAttr( RES_BACKGROUND, RES_COL );
-    rFmt.ResetFmtAttr( RES_URL, RES_EDIT_IN_READONLY );
+    rFormat.ResetFormatAttr( RES_PRINT, RES_SURROUND );
+    rFormat.ResetFormatAttr( RES_LR_SPACE, RES_UL_SPACE );
+    rFormat.ResetFormatAttr( RES_BACKGROUND, RES_COL );
+    rFormat.ResetFormatAttr( RES_URL, RES_EDIT_IN_READONLY );
 
     if( !bFrmSz )
-        rFmt.SetFmtAttr( aFrmSz );
+        rFormat.SetFormatAttr( aFrmSz );
 
     if( bChgAnchor )
-        rFmt.MakeFrms();
+        rFormat.MakeFrms();
 
     if( pUndo )
-        pUndo->DeRegisterFromFormat( rFmt );
+        pUndo->DeRegisterFromFormat( rFormat );
 
     getIDocumentState().SetModified();
 
     return bChgAnchor;
 }
 
-void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName,
+void SwDoc::GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName,
                        OUString* pFltName )
 {
-    SwNodeIndex aIdx( *rFmt.GetCntnt().GetCntntIdx(), 1 );
+    SwNodeIndex aIdx( *rFormat.GetContent().GetContentIdx(), 1 );
     const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
     if( pGrfNd && pGrfNd->IsLinkedFile() )
         pGrfNd->GetFileFilterNms( pGrfName, pFltName );
@@ -730,13 +730,13 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             const RndStdIds eOldAnchorType = pContact->GetAnchorId();
             if ( !_bSameOnly && eOldAnchorType == FLY_AS_CHAR )
             {
-                xOldAsCharAnchorPos.reset(new SwPosition(pContact->GetCntntAnchor()));
+                xOldAsCharAnchorPos.reset(new SwPosition(pContact->GetContentAnchor()));
             }
 
             if ( _bSameOnly )
                 _eAnchorType = eOldAnchorType;
 
-            SwFmtAnchor aNewAnch( _eAnchorType );
+            SwFormatAnchor aNewAnch( _eAnchorType );
             SwAnchoredObject *pAnchoredObj = pContact->GetAnchoredObj(pObj);
             Rectangle aObjRect(pAnchoredObj->GetObjRect().SVRect());
             const Point aPt( aObjRect.TopLeft() );
@@ -753,9 +753,9 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
 
                     // allow drawing objects in header/footer
                     pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aNewPoint, false );
-                    if ( pNewAnchorFrm->IsTxtFrm() && static_cast<const SwTxtFrm*>(pNewAnchorFrm)->IsFollow() )
+                    if ( pNewAnchorFrm->IsTextFrm() && static_cast<const SwTextFrm*>(pNewAnchorFrm)->IsFollow() )
                     {
-                        pNewAnchorFrm = static_cast<const SwTxtFrm*>(pNewAnchorFrm)->FindMaster();
+                        pNewAnchorFrm = static_cast<const SwTextFrm*>(pNewAnchorFrm)->FindMaster();
                     }
                     if ( pNewAnchorFrm->IsProtected() )
                     {
@@ -763,7 +763,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     }
                     else
                     {
-                        SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode() );
+                        SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode() );
                         aNewAnch.SetType( _eAnchorType );
                         aNewAnch.SetAnchor( &aPos );
                     }
@@ -773,7 +773,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             case FLY_AT_FLY: // LAYER_IMPL
                 {
                     // Search the closest SwFlyFrm starting from the upper left corner.
-                    SwFrm *pTxtFrm;
+                    SwFrm *pTextFrm;
                     {
                         SwCrsrMoveState aState( MV_SETONLYTEXT );
                         SwPosition aPos( GetNodes() );
@@ -782,16 +782,16 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                         getIDocumentLayoutAccess().GetCurrentLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
                         // consider that drawing objects can be in
                         // header/footer. Thus, <GetFrm()> by left-top-corner
-                        pTxtFrm = aPos.nNode.GetNode().
-                                        GetCntntNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                        pTextFrm = aPos.nNode.GetNode().
+                                        GetContentNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                     }
-                    const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aPt );
+                    const SwFrm *pTmp = ::FindAnchor( pTextFrm, aPt );
                     pNewAnchorFrm = pTmp->FindFlyFrm();
                     if( pNewAnchorFrm && !pNewAnchorFrm->IsProtected() )
                     {
-                        const SwFrmFmt *pTmpFmt = static_cast<const SwFlyFrm*>(pNewAnchorFrm)->GetFmt();
-                        const SwFmtCntnt& rCntnt = pTmpFmt->GetCntnt();
-                        SwPosition aPos( *rCntnt.GetCntntIdx() );
+                        const SwFrameFormat *pTmpFormat = static_cast<const SwFlyFrm*>(pNewAnchorFrm)->GetFormat();
+                        const SwFormatContent& rContent = pTmpFormat->GetContent();
+                        SwPosition aPos( *rContent.GetContentIdx() );
                         aNewAnch.SetAnchor( &aPos );
                         break;
                     }
@@ -818,7 +818,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                         pContact->ConnectToLayout();
                         pOldAnchorFrm = pContact->GetAnchorFrm();
                     }
-                    const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pOldAnchorFrm))->Prepare();
+                    const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pOldAnchorFrm))->Prepare();
                 }
                 else            // Change of anchors
                 {
@@ -834,7 +834,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     Point aPoint( aPt );
                     aPoint.setX(aPoint.getX() - 1);    // Do not load in the DrawObj!
                     aNewAnch.SetType( FLY_AS_CHAR );
-                    SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode() );
+                    SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode() );
                     if ( pNewAnchorFrm->Frm().IsInside( aPoint ) )
                     {
                     // We need to find a TextNode, because only there we can anchor a
@@ -844,23 +844,23 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     }
                     else
                     {
-                        SwCntntNode &rCNd = (SwCntntNode&)
-                            *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode();
+                        SwContentNode &rCNd = (SwContentNode&)
+                            *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode();
                         if ( pNewAnchorFrm->Frm().Bottom() < aPt.Y() )
                             rCNd.MakeStartIndex( &aPos.nContent );
                         else
                             rCNd.MakeEndIndex( &aPos.nContent );
                     }
                     aNewAnch.SetAnchor( &aPos );
-                    SetAttr( aNewAnch, *pContact->GetFmt() );
+                    SetAttr( aNewAnch, *pContact->GetFormat() );
                     // #i26791# - adjust vertical positioning to 'center to
                     // baseline'
-                    SetAttr( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFmt() );
-                    SwTxtNode *pNd = aPos.nNode.GetNode().GetTxtNode();
-                    OSL_ENSURE( pNd, "Cursor not positioned at TxtNode." );
+                    SetAttr( SwFormatVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFormat() );
+                    SwTextNode *pNd = aPos.nNode.GetNode().GetTextNode();
+                    OSL_ENSURE( pNd, "Cursor not positioned at TextNode." );
 
-                    SwFmtFlyCnt aFmt( pContact->GetFmt() );
-                    pNd->InsertItem( aFmt, aPos.nContent.GetIndex(), 0 );
+                    SwFormatFlyCnt aFormat( pContact->GetFormat() );
+                    pNd->InsertItem( aFormat, aPos.nContent.GetIndex(), 0 );
                 }
                 break;
             default:
@@ -874,7 +874,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                 // #i26791# - Direct object positioning no longer needed. Apply
                 // of attributes (method call <SetAttr(..)>) takes care of the
                 // invalidation of the object position.
-                SetAttr( aNewAnch, *pContact->GetFmt() );
+                SetAttr( aNewAnch, *pContact->GetFormat() );
                 if ( _bPosCorr )
                 {
                     // #i33313# - consider not connected 'virtual' drawing
@@ -904,20 +904,20 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             {
                 if ( pNewAnchorFrm)
                 {
-                    // We need to handle InCntnts in a special way:
-                    // The TxtAttribut needs to be destroyed which, unfortunately, also
+                    // We need to handle InContents in a special way:
+                    // The TextAttribut needs to be destroyed which, unfortunately, also
                     // destroys the format. To avoid that, we disconnect the format from
                     // the attribute.
                     const sal_Int32 nIndx( xOldAsCharAnchorPos->nContent.GetIndex() );
-                    SwTxtNode* pTxtNode( xOldAsCharAnchorPos->nNode.GetNode().GetTxtNode() );
-                    assert(pTxtNode && "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object");
-                    SwTxtAttr * const pHnt =
-                        pTxtNode->GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
-                    assert(pHnt && "Missing FlyInCnt-Hint.");
-                    const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+                    SwTextNode* pTextNode( xOldAsCharAnchorPos->nNode.GetNode().GetTextNode() );
+                    assert(pTextNode && "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object");
+                    SwTextAttr * const pHint =
+                        pTextNode->GetTextAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
+                    assert(pHint && "Missing FlyInCnt-Hint.");
+                    const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
                     // They are disconnected. We now have to destroy the attribute.
-                    pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
+                    pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
                 }
             }
         }
@@ -929,57 +929,57 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
     return bUnmark;
 }
 
-SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
+SwChainRet SwDoc::Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest )
 {
     // The Source must not yet have a Follow.
-    const SwFmtChain &rOldChain = rSource.GetChain();
+    const SwFormatChain &rOldChain = rSource.GetChain();
     if ( rOldChain.GetNext() )
         return SwChainRet::SOURCE_CHAINED;
 
     // Target must not be equal to Source and we also must not have a closed chain.
-    const SwFrmFmt *pFmt = &rDest;
+    const SwFrameFormat *pFormat = &rDest;
     do {
-        if( pFmt == &rSource )
+        if( pFormat == &rSource )
             return SwChainRet::SELF;
-        pFmt = pFmt->GetChain().GetNext();
-    } while ( pFmt );
+        pFormat = pFormat->GetChain().GetNext();
+    } while ( pFormat );
 
     // There must not be a chaining from outside to inside or the other way around.
     if( rDest.IsLowerOf( rSource ) || rSource .IsLowerOf( rDest ) )
         return SwChainRet::SELF;
 
     // The Target must not yet have a Master.
-    const SwFmtChain &rChain = rDest.GetChain();
+    const SwFormatChain &rChain = rDest.GetChain();
     if( rChain.GetPrev() )
         return SwChainRet::IS_IN_CHAIN;
 
     // Target must be empty.
-    const SwNodeIndex* pCntIdx = rDest.GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pCntIdx = rDest.GetContent().GetContentIdx();
     if( !pCntIdx )
         return SwChainRet::NOT_FOUND;
 
     SwNodeIndex aNxtIdx( *pCntIdx, 1 );
-    const SwTxtNode* pTxtNd = aNxtIdx.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    const SwTextNode* pTextNd = aNxtIdx.GetNode().GetTextNode();
+    if( !pTextNd )
         return SwChainRet::NOT_FOUND;
 
     const sal_uLong nFlySttNd = pCntIdx->GetIndex();
     if( 2 != ( pCntIdx->GetNode().EndOfSectionIndex() - nFlySttNd ) ||
-        pTxtNd->GetTxt().getLength() )
+        pTextNd->GetText().getLength() )
     {
         return SwChainRet::NOT_EMPTY;
     }
 
-    for( auto pSpzFrmFm : *GetSpzFrmFmts() )
+    for( auto pSpzFrmFm : *GetSpzFrameFormats() )
     {
-        const SwFmtAnchor& rAnchor = pSpzFrmFm->GetAnchor();
+        const SwFormatAnchor& rAnchor = pSpzFrmFm->GetAnchor();
         sal_uLong nTstSttNd;
         // #i20622# - to-frame anchored objects are allowed.
         if ( ((rAnchor.GetAnchorId() == FLY_AT_PARA) ||
               (rAnchor.GetAnchorId() == FLY_AT_CHAR)) &&
-             0 != rAnchor.GetCntntAnchor() &&
+             0 != rAnchor.GetContentAnchor() &&
              nFlySttNd <= ( nTstSttNd =
-                         rAnchor.GetCntntAnchor()->nNode.GetIndex() ) &&
+                         rAnchor.GetContentAnchor()->nNode.GetIndex() ) &&
              nTstSttNd < nFlySttNd + 2 )
         {
             return SwChainRet::NOT_EMPTY;
@@ -992,21 +992,21 @@ SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
     // one. e.g. if it's requested by the API.
 
     // both in the same fly, header, footer or on the page?
-    const SwFmtAnchor &rSrcAnchor = rSource.GetAnchor(),
+    const SwFormatAnchor &rSrcAnchor = rSource.GetAnchor(),
                       &rDstAnchor = rDest.GetAnchor();
     sal_uLong nEndOfExtras = GetNodes().GetEndOfExtras().GetIndex();
     bool bAllowed = false;
     if ( FLY_AT_PAGE == rSrcAnchor.GetAnchorId() )
     {
         if ( (FLY_AT_PAGE == rDstAnchor.GetAnchorId()) ||
-            ( rDstAnchor.GetCntntAnchor() &&
-              rDstAnchor.GetCntntAnchor()->nNode.GetIndex() > nEndOfExtras ))
+            ( rDstAnchor.GetContentAnchor() &&
+              rDstAnchor.GetContentAnchor()->nNode.GetIndex() > nEndOfExtras ))
             bAllowed = true;
     }
-    else if( rSrcAnchor.GetCntntAnchor() && rDstAnchor.GetCntntAnchor() )
+    else if( rSrcAnchor.GetContentAnchor() && rDstAnchor.GetContentAnchor() )
     {
-        const SwNodeIndex &rSrcIdx = rSrcAnchor.GetCntntAnchor()->nNode,
-                            &rDstIdx = rDstAnchor.GetCntntAnchor()->nNode;
+        const SwNodeIndex &rSrcIdx = rSrcAnchor.GetContentAnchor()->nNode,
+                            &rDstIdx = rDstAnchor.GetContentAnchor()->nNode;
         const SwStartNode* pSttNd = 0;
         if( rSrcIdx == rDstIdx ||
             ( !pSttNd &&
@@ -1026,37 +1026,37 @@ SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
     return bAllowed ? SwChainRet::OK : SwChainRet::WRONG_AREA;
 }
 
-SwChainRet SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
+SwChainRet SwDoc::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest )
 {
     SwChainRet nErr = Chainable( rSource, rDest );
     if ( nErr == SwChainRet::OK )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_CHAINE, NULL );
 
-        SwFlyFrmFmt& rDestFmt = const_cast<SwFlyFrmFmt&>(static_cast<const SwFlyFrmFmt&>(rDest));
+        SwFlyFrameFormat& rDestFormat = const_cast<SwFlyFrameFormat&>(static_cast<const SwFlyFrameFormat&>(rDest));
 
         // Attach Follow to the Master.
-        SwFmtChain aChain = rDestFmt.GetChain();
-        aChain.SetPrev( &static_cast<SwFlyFrmFmt&>(rSource) );
-        SetAttr( aChain, rDestFmt );
+        SwFormatChain aChain = rDestFormat.GetChain();
+        aChain.SetPrev( &static_cast<SwFlyFrameFormat&>(rSource) );
+        SetAttr( aChain, rDestFormat );
 
         SfxItemSet aSet( GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE,
                                         RES_CHAIN,  RES_CHAIN, 0 );
 
         // Attach Follow to the Master.
-        aChain.SetPrev( &static_cast<SwFlyFrmFmt&>(rSource) );
-        SetAttr( aChain, rDestFmt );
+        aChain.SetPrev( &static_cast<SwFlyFrameFormat&>(rSource) );
+        SetAttr( aChain, rDestFormat );
 
         // Attach Master to the Follow.
         // Make sure that the Master has a fixed height.
         aChain = rSource.GetChain();
-        aChain.SetNext( &rDestFmt );
+        aChain.SetNext( &rDestFormat );
         aSet.Put( aChain );
 
-        SwFmtFrmSize aSize( rSource.GetFrmSize() );
+        SwFormatFrmSize aSize( rSource.GetFrmSize() );
         if ( aSize.GetHeightSizeType() != ATT_FIX_SIZE )
         {
-            SwFlyFrm *pFly = SwIterator<SwFlyFrm,SwFmt>( rSource ).First();
+            SwFlyFrm *pFly = SwIterator<SwFlyFrm,SwFormat>( rSource ).First();
             if ( pFly )
                 aSize.SetHeight( pFly->Frm().Height() );
             aSize.SetHeightSizeType( ATT_FIX_SIZE );
@@ -1069,15 +1069,15 @@ SwChainRet SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
     return nErr;
 }
 
-void SwDoc::Unchain( SwFrmFmt &rFmt )
+void SwDoc::Unchain( SwFrameFormat &rFormat )
 {
-    SwFmtChain aChain( rFmt.GetChain() );
+    SwFormatChain aChain( rFormat.GetChain() );
     if ( aChain.GetNext() )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_UNCHAIN, NULL );
-        SwFrmFmt *pFollow = aChain.GetNext();
+        SwFrameFormat *pFollow = aChain.GetNext();
         aChain.SetNext( 0 );
-        SetAttr( aChain, rFmt );
+        SetAttr( aChain, rFormat );
         aChain = pFollow->GetChain();
         aChain.SetPrev( 0 );
         SetAttr( aChain, *pFollow );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c69872bbdb75..6750c6f84500 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -88,18 +88,18 @@ using namespace ::com::sun::star::uno;
  * Internal functions
  */
 
-static void SetTxtFmtCollNext( SwTxtFmtColl* pTxtColl, const SwTxtFmtColl* pDel )
+static void SetTextFormatCollNext( SwTextFormatColl* pTextColl, const SwTextFormatColl* pDel )
 {
-    if ( &pTxtColl->GetNextTxtFmtColl() == pDel )
+    if ( &pTextColl->GetNextTextFormatColl() == pDel )
     {
-        pTxtColl->SetNextTxtFmtColl( *pTxtColl );
+        pTextColl->SetNextTextFormatColl( *pTextColl );
     }
 }
 
 static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
 {
-    const sw::DocumentContentOperationsManager::ParaRstFmt* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFmt*>(pArgs);
-    SwCntntNode* pNode = rpNd->GetCntntNode();
+    const sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
+    SwContentNode* pNode = rpNd->GetContentNode();
     if( pNode && pNode->HasSwAttrSet() )
     {
         const bool bLocked = pNode->IsModifyLocked();
@@ -144,10 +144,10 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
                 switch( aSavIds[ n ] )
                 {
                     case RES_PAGEDESC:
-                        bSave = 0 != static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc();
+                        bSave = 0 != static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
                     break;
                     case RES_BREAK:
-                        bSave = SVX_BREAK_NONE != static_cast<const SvxFmtBreakItem*>(pItem)->GetBreak();
+                        bSave = SVX_BREAK_NONE != static_cast<const SvxFormatBreakItem*>(pItem)->GetBreak();
                     break;
                     case RES_PARATR_NUMRULE:
                         bSave = !static_cast<const SwNumRuleItem*>(pItem)->GetValue().isEmpty();
@@ -219,7 +219,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
     return true;
 }
 
-void SwDoc::RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange )
+void SwDoc::RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange )
 {
     SwHistory* pHst = 0;
     SwDataChanged aTmp( rRg );
@@ -230,27 +230,27 @@ void SwDoc::RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
     const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
     aPara.bInclRefToxMark = bInclRefToxMark;
     aPara.bExactRange = bExactRange;
     GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
-                        sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+                        sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
     getIDocumentState().SetModified();
 }
 
 void SwDoc::ResetAttrs( const SwPaM &rRg,
-                        bool bTxtAttr,
+                        bool bTextAttr,
                         const std::set<sal_uInt16> &rAttrs,
                         const bool bSendDataChangedEvents )
 {
     SwPaM* pPam = const_cast<SwPaM*>(&rRg);
-    if( !bTxtAttr && !rAttrs.empty() && RES_TXTATR_END > *(rAttrs.begin()) )
-        bTxtAttr = true;
+    if( !bTextAttr && !rAttrs.empty() && RES_TXTATR_END > *(rAttrs.begin()) )
+        bTextAttr = true;
 
     if( !rRg.HasMark() )
     {
-        SwTxtNode* pTxtNd = rRg.GetPoint()->nNode.GetNode().GetTxtNode();
-        if( !pTxtNd )
+        SwTextNode* pTextNd = rRg.GetPoint()->nNode.GetNode().GetTextNode();
+        if( !pTextNd )
             return ;
 
         pPam = new SwPaM( *rRg.GetPoint() );
@@ -259,9 +259,9 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         sal_Int32 nMkPos, nPtPos = rSt.GetIndex();
 
         // Special case: if the Crsr is located within a URL attribute, we take over it's area
-        SwTxtAttr const*const pURLAttr(
-            pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
-        if (pURLAttr && !pURLAttr->GetINetFmt().GetValue().isEmpty())
+        SwTextAttr const*const pURLAttr(
+            pTextNd->GetTextAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
+        if (pURLAttr && !pURLAttr->GetINetFormat().GetValue().isEmpty())
         {
             nMkPos = pURLAttr->GetStart();
             nPtPos = *pURLAttr->End();
@@ -271,8 +271,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
             Boundary aBndry;
             if( g_pBreakIt->GetBreakIter().is() )
                 aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                             true );
 
@@ -284,8 +284,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
             else
             {
                 nPtPos = nMkPos = rSt.GetIndex();
-                if( bTxtAttr )
-                    pTxtNd->DontExpandFmt( rSt, true );
+                if( bTextAttr )
+                    pTextNd->DontExpandFormat( rSt, true );
             }
         }
 
@@ -304,7 +304,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         SwUndoResetAttr* pUndo = new SwUndoResetAttr( rRg,
-            static_cast<sal_uInt16>(bTxtAttr ? RES_CONDTXTFMTCOLL : RES_TXTFMTCOLL ));
+            static_cast<sal_uInt16>(bTextAttr ? RES_CONDTXTFMTCOLL : RES_TXTFMTCOLL ));
         if( !rAttrs.empty() )
         {
             pUndo->SetAttrs( rAttrs );
@@ -314,7 +314,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     }
 
     const SwPosition *pStt = pPam->Start(), *pEnd = pPam->End();
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
 
     // mst: not including META here; it seems attrs with CH_TXTATR are omitted
     sal_uInt16 aResetableSetRange[] = {
@@ -347,39 +347,39 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     SwNodeIndex aTmpEnd( pEnd->nNode );
     if( pStt->nContent.GetIndex() )     // just one part
     {
-        // set up a later, and all CharFmtAttr -> TxtFmtAttr
-        SwTxtNode* pTNd = aTmpStt.GetNode().GetTxtNode();
+        // set up a later, and all CharFormatAttr -> TextFormatAttr
+        SwTextNode* pTNd = aTmpStt.GetNode().GetTextNode();
         if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
         {
             if (pHst)
             {
                 SwRegHistory history(pTNd, *pTNd, pHst);
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
             else
             {
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
         }
 
         ++aTmpStt;
     }
-    if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
-         // set up a later, and all CharFmtAttr -> TxtFmtAttr
+    if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetContentNode()->Len() )
+         // set up a later, and all CharFormatAttr -> TextFormatAttr
         ++aTmpEnd, bAdd = false;
     else if( pStt->nNode != pEnd->nNode || !pStt->nContent.GetIndex() )
     {
-        SwTxtNode* pTNd = aTmpEnd.GetNode().GetTxtNode();
+        SwTextNode* pTNd = aTmpEnd.GetNode().GetTextNode();
         if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
         {
             if (pHst)
             {
                 SwRegHistory history(pTNd, *pTNd, pHst);
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
             else
             {
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
         }
     }
@@ -393,11 +393,11 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         aPara.bResetAll = true ;
     }
 
-    if( bTxtAttr )
+    if( bTextAttr )
     {
         if( bAdd )
             ++aTmpEnd;
-        GetNodes().ForEach( pStt->nNode, aTmpEnd, sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+        GetNodes().ForEach( pStt->nNode, aTmpEnd, sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
     }
 
     getIDocumentState().SetModified();
@@ -414,8 +414,8 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
     if (!SW_MOD()->GetModuleConfig()->IsStoreRsid())
         return false;
 
-    SwTxtNode *pTxtNode = rRg.GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!pTxtNode)
+    SwTextNode *pTextNode = rRg.GetPoint()->nNode.GetNode().GetTextNode();
+    if (!pTextNode)
     {
         return false;
     }
@@ -424,7 +424,7 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
 
     SfxItemSet aSet(GetAttrPool(), RES_CHRATR_RSID, RES_CHRATR_RSID);
     aSet.Put(aRsid);
-    bool const bRet(pTxtNode->SetAttr(aSet, nStart,
+    bool const bRet(pTextNode->SetAttr(aSet, nStart,
         rRg.GetPoint()->nContent.GetIndex(), SetAttrMode::DEFAULT));
 
     if (bRet && GetIDocumentUndoRedo().DoesUndo())
@@ -441,37 +441,37 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
     return bRet;
 }
 
-bool SwDoc::UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal )
+bool SwDoc::UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal )
 {
     if (!SW_MOD()->GetModuleConfig()->IsStoreRsid())
         return false;
 
-    if (!pTxtNode)
+    if (!pTextNode)
     {
         return false;
     }
 
     SvxRsidItem aRsid( nVal ? nVal : mnRsid, RES_PARATR_RSID );
-    return pTxtNode->SetAttr( aRsid );
+    return pTextNode->SetAttr( aRsid );
 }
 
 /// Set the attribute according to the stated format.
 /// If Undo is enabled, the old values is added to the Undo history.
-void SwDoc::SetAttr( const SfxPoolItem& rAttr, SwFmt& rFmt )
+void SwDoc::SetAttr( const SfxPoolItem& rAttr, SwFormat& rFormat )
 {
     SfxItemSet aSet( GetAttrPool(), rAttr.Which(), rAttr.Which() );
     aSet.Put( rAttr );
-    SetAttr( aSet, rFmt );
+    SetAttr( aSet, rFormat );
 }
 
 /// Set the attribute according to the stated format.
 /// If Undo is enabled, the old values is added to the Undo history.
-void SwDoc::SetAttr( const SfxItemSet& rSet, SwFmt& rFmt )
+void SwDoc::SetAttr( const SfxItemSet& rSet, SwFormat& rFormat )
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoFmtAttrHelper aTmp( rFmt );
-        rFmt.SetFmtAttr( rSet );
+        SwUndoFormatAttrHelper aTmp( rFormat );
+        rFormat.SetFormatAttr( rSet );
         if ( aTmp.GetUndo() )
         {
             GetIDocumentUndoRedo().AppendUndo( aTmp.ReleaseUndo() );
@@ -483,19 +483,19 @@ void SwDoc::SetAttr( const SfxItemSet& rSet, SwFmt& rFmt )
     }
     else
     {
-        rFmt.SetFmtAttr( rSet );
+        rFormat.SetFormatAttr( rSet );
     }
     getIDocumentState().SetModified();
 }
 
 void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId,
-                               SwFmt& rChangedFormat )
+                               SwFormat& rChangedFormat )
 {
     SwUndo *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoFmtResetAttr( rChangedFormat, nWhichId )
+        ?   new SwUndoFormatResetAttr( rChangedFormat, nWhichId )
         :   0;
 
-    const bool bAttrReset = rChangedFormat.ResetFmtAttr( nWhichId );
+    const bool bAttrReset = rChangedFormat.ResetFormatAttr( nWhichId );
 
     if ( bAttrReset )
     {
@@ -516,7 +516,7 @@ static bool lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
     // Set the default values of all TabStops to the new value.
     // Attention: we always work with the PoolAttribut here, so that
     // we don't calculate the same value on the same TabStop (pooled!) for all sets.
-    // We send a FmtChg to modify.
+    // We send a FormatChg to modify.
 
     sal_uInt16 nOldCnt = rChgTabStop.Count();
     if( !nOldCnt || nOldWidth == nNewWidth )
@@ -563,29 +563,29 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
 
         if (isCHRATR(nWhich) || isTXTATR(nWhich))
         {
-            aCallMod.Add( mpDfltTxtFmtColl );
-            aCallMod.Add( mpDfltCharFmt );
+            aCallMod.Add( mpDfltTextFormatColl );
+            aCallMod.Add( mpDfltCharFormat );
             bCheckSdrDflt = 0 != pSdrPool;
         }
         else if ( isPARATR(nWhich) ||
                   isPARATR_LIST(nWhich) )
         {
-            aCallMod.Add( mpDfltTxtFmtColl );
+            aCallMod.Add( mpDfltTextFormatColl );
             bCheckSdrDflt = 0 != pSdrPool;
         }
         else if (isGRFATR(nWhich))
         {
-            aCallMod.Add( mpDfltGrfFmtColl );
+            aCallMod.Add( mpDfltGrfFormatColl );
         }
         else if (isFRMATR(nWhich) || isDrawingLayerAttribute(nWhich) ) //UUUU
         {
-            aCallMod.Add( mpDfltGrfFmtColl );
-            aCallMod.Add( mpDfltTxtFmtColl );
-            aCallMod.Add( mpDfltFrmFmt );
+            aCallMod.Add( mpDfltGrfFormatColl );
+            aCallMod.Add( mpDfltTextFormatColl );
+            aCallMod.Add( mpDfltFrameFormat );
         }
         else if (isBOXATR(nWhich))
         {
-            aCallMod.Add( mpDfltFrmFmt );
+            aCallMod.Add( mpDfltFrameFormat );
         }
 
         // also copy the defaults
@@ -624,7 +624,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
             // Set the default values of all TabStops to the new value.
             // Attention: we always work with the PoolAttribut here, so that
             // we don't calculate the same value on the same TabStop (pooled!) for all sets.
-            // We send a FmtChg to modify.
+            // We send a FormatChg to modify.
             SwTwips nNewWidth = (*static_cast<const SvxTabStopItem*>(pTmpItem))[ 0 ].GetTabPos(),
                     nOldWidth = static_cast<const SvxTabStopItem&>(aOld.Get(RES_PARATR_TABSTOP))[ 0 ].GetTabPos();
 
@@ -639,9 +639,9 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
             aOld.ClearItem( RES_PARATR_TABSTOP );
             if( bChg )
             {
-                SwFmtChg aChgFmt( mpDfltCharFmt );
+                SwFormatChg aChgFormat( mpDfltCharFormat );
                 // notify the frames
-                aCallMod.ModifyNotification( &aChgFmt, &aChgFmt );
+                aCallMod.ModifyNotification( &aChgFormat, &aChgFormat );
             }
         }
     }
@@ -662,15 +662,15 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
 }
 
 /// Get the default attribute in this document
-const SfxPoolItem& SwDoc::GetDefault( sal_uInt16 nFmtHint ) const
+const SfxPoolItem& SwDoc::GetDefault( sal_uInt16 nFormatHint ) const
 {
-    return GetAttrPool().GetDefaultItem( nFmtHint );
+    return GetAttrPool().GetDefaultItem( nFormatHint );
 }
 
 /// Delete the formats
-void SwDoc::DelCharFmt(size_t nFmt, bool bBroadcast)
+void SwDoc::DelCharFormat(size_t nFormat, bool bBroadcast)
 {
-    SwCharFmt * pDel = (*mpCharFmtTbl)[nFmt];
+    SwCharFormat * pDel = (*mpCharFormatTable)[nFormat];
 
     if (bBroadcast)
         BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_CHAR,
@@ -679,287 +679,287 @@ void SwDoc::DelCharFmt(size_t nFmt, bool bBroadcast)
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         SwUndo * pUndo =
-            new SwUndoCharFmtDelete(pDel, this);
+            new SwUndoCharFormatDelete(pDel, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    delete (*mpCharFmtTbl)[nFmt];
-    mpCharFmtTbl->erase(mpCharFmtTbl->begin() + nFmt);
+    delete (*mpCharFormatTable)[nFormat];
+    mpCharFormatTable->erase(mpCharFormatTable->begin() + nFormat);
 
     getIDocumentState().SetModified();
 }
 
-void SwDoc::DelCharFmt( SwCharFmt *pFmt, bool bBroadcast )
+void SwDoc::DelCharFormat( SwCharFormat *pFormat, bool bBroadcast )
 {
-    size_t nFmt = mpCharFmtTbl->GetPos( pFmt );
-    OSL_ENSURE( SIZE_MAX != nFmt, "Fmt not found," );
-    DelCharFmt( nFmt, bBroadcast );
+    size_t nFormat = mpCharFormatTable->GetPos( pFormat );
+    OSL_ENSURE( SIZE_MAX != nFormat, "Format not found," );
+    DelCharFormat( nFormat, bBroadcast );
 }
 
-void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast )
+void SwDoc::DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast )
 {
-    if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
+    if( pFormat->ISA( SwTableBoxFormat ) || pFormat->ISA( SwTableLineFormat ))
     {
         OSL_ENSURE( false, "Format is not in the DocArray any more, "
                        "so it can be deleted with delete" );
-        delete pFmt;
+        delete pFormat;
     }
     else
     {
 
         // The format has to be in the one or the other, we'll see in which one.
-        SwFrmFmts::iterator it = std::find( mpFrmFmtTbl->begin(), mpFrmFmtTbl->end(), pFmt );
-        if ( it != mpFrmFmtTbl->end() )
+        SwFrameFormats::iterator it = std::find( mpFrameFormatTable->begin(), mpFrameFormatTable->end(), pFormat );
+        if ( it != mpFrameFormatTable->end() )
         {
             if (bBroadcast)
-                BroadcastStyleOperation(pFmt->GetName(),
+                BroadcastStyleOperation(pFormat->GetName(),
                                         SFX_STYLE_FAMILY_FRAME,
                                         SfxStyleSheetHintId::ERASED);
 
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                SwUndo * pUndo = new SwUndoFrmFmtDelete(pFmt, this);
+                SwUndo * pUndo = new SwUndoFrameFormatDelete(pFormat, this);
 
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
             delete *it;
-            mpFrmFmtTbl->erase(it);
+            mpFrameFormatTable->erase(it);
         }
         else
         {
-            SwFrmFmts::iterator it2 = std::find( GetSpzFrmFmts()->begin(), GetSpzFrmFmts()->end(), pFmt );
-            OSL_ENSURE( it2 != GetSpzFrmFmts()->end(), "FrmFmt not found." );
-            if( it2 != GetSpzFrmFmts()->end() )
+            SwFrameFormats::iterator it2 = std::find( GetSpzFrameFormats()->begin(), GetSpzFrameFormats()->end(), pFormat );
+            OSL_ENSURE( it2 != GetSpzFrameFormats()->end(), "FrameFormat not found." );
+            if( it2 != GetSpzFrameFormats()->end() )
             {
                 delete *it2;
-                GetSpzFrmFmts()->erase( it2 );
+                GetSpzFrameFormats()->erase( it2 );
             }
         }
     }
 }
 
-void SwDoc::DelTblFrmFmt( SwTableFmt *pFmt )
+void SwDoc::DelTableFrameFormat( SwTableFormat *pFormat )
 {
-    SwFrmFmts::iterator it = std::find( mpTblFrmFmtTbl->begin(), mpTblFrmFmtTbl->end(), pFmt );
-    OSL_ENSURE( it != mpTblFrmFmtTbl->end(), "Fmt not found," );
+    SwFrameFormats::iterator it = std::find( mpTableFrameFormatTable->begin(), mpTableFrameFormatTable->end(), pFormat );
+    OSL_ENSURE( it != mpTableFrameFormatTable->end(), "Format not found," );
     delete *it;
-    mpTblFrmFmtTbl->erase(it);
+    mpTableFrameFormatTable->erase(it);
 }
 
 /// Create the formats
-SwFlyFrmFmt *SwDoc::MakeFlyFrmFmt( const OUString &rFmtName,
-                                    SwFrmFmt *pDerivedFrom )
+SwFlyFrameFormat *SwDoc::MakeFlyFrameFormat( const OUString &rFormatName,
+                                    SwFrameFormat *pDerivedFrom )
 {
-    SwFlyFrmFmt *pFmt = new SwFlyFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    GetSpzFrmFmts()->push_back(pFmt);
+    SwFlyFrameFormat *pFormat = new SwFlyFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    GetSpzFrameFormats()->push_back(pFormat);
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwDrawFrmFmt *SwDoc::MakeDrawFrmFmt( const OUString &rFmtName,
-                                     SwFrmFmt *pDerivedFrom )
+SwDrawFrameFormat *SwDoc::MakeDrawFrameFormat( const OUString &rFormatName,
+                                     SwFrameFormat *pDerivedFrom )
 {
-    SwDrawFrmFmt *pFmt = new SwDrawFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom);
-    GetSpzFrmFmts()->push_back(pFmt);
+    SwDrawFrameFormat *pFormat = new SwDrawFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom);
+    GetSpzFrameFormats()->push_back(pFormat);
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-size_t SwDoc::GetTblFrmFmtCount(bool bUsed) const
+size_t SwDoc::GetTableFrameFormatCount(bool bUsed) const
 {
-    size_t nCount = mpTblFrmFmtTbl->size();
+    size_t nCount = mpTableFrameFormatTable->size();
     if(bUsed)
     {
-        SwAutoFmtGetDocNode aGetHt( &GetNodes() );
+        SwAutoFormatGetDocNode aGetHt( &GetNodes() );
         for ( size_t i = nCount; i; )
         {
-            if((*mpTblFrmFmtTbl)[--i]->GetInfo( aGetHt ))
+            if((*mpTableFrameFormatTable)[--i]->GetInfo( aGetHt ))
                 --nCount;
         }
     }
     return nCount;
 }
 
-SwFrmFmt& SwDoc::GetTblFrmFmt(size_t nFmt, bool bUsed ) const
+SwFrameFormat& SwDoc::GetTableFrameFormat(size_t nFormat, bool bUsed ) const
 {
     size_t nRemoved = 0;
     if(bUsed)
     {
-        SwAutoFmtGetDocNode aGetHt( &GetNodes() );
-        for ( size_t i = 0; i <= nFmt; ++i )
+        SwAutoFormatGetDocNode aGetHt( &GetNodes() );
+        for ( size_t i = 0; i <= nFormat; ++i )
         {
-            while ( (*mpTblFrmFmtTbl)[ i + nRemoved]->GetInfo( aGetHt ))
+            while ( (*mpTableFrameFormatTable)[ i + nRemoved]->GetInfo( aGetHt ))
             {
                 nRemoved++;
             }
         }
     }
-    return *((*mpTblFrmFmtTbl)[nRemoved + nFmt]);
+    return *((*mpTableFrameFormatTable)[nRemoved + nFormat]);
 }
 
-SwTableFmt* SwDoc::MakeTblFrmFmt( const OUString &rFmtName,
-                                    SwFrmFmt *pDerivedFrom )
+SwTableFormat* SwDoc::MakeTableFrameFormat( const OUString &rFormatName,
+                                    SwFrameFormat *pDerivedFrom )
 {
-    SwTableFmt* pFmt = new SwTableFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    mpTblFrmFmtTbl->push_back( pFmt );
+    SwTableFormat* pFormat = new SwTableFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    mpTableFrameFormatTable->push_back( pFormat );
     getIDocumentState().SetModified();
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFrmFmt *SwDoc::MakeFrmFmt(const OUString &rFmtName,
-                            SwFrmFmt *pDerivedFrom,
+SwFrameFormat *SwDoc::MakeFrameFormat(const OUString &rFormatName,
+                            SwFrameFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
+    SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom );
 
-    pFmt->SetAuto(bAuto);
-    mpFrmFmtTbl->push_back( pFmt );
+    pFormat->SetAuto(bAuto);
+    mpFrameFormatTable->push_back( pFormat );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoFrmFmtCreate(pFmt, pDerivedFrom, this);
+        SwUndo * pUndo = new SwUndoFrameFormatCreate(pFormat, pDerivedFrom, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
     {
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_FRAME,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_FRAME,
                                 SfxStyleSheetHintId::CREATED);
     }
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFmt *SwDoc::_MakeFrmFmt(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeFrameFormat(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwFrmFmt *pFrmFmt = dynamic_cast<SwFrmFmt*>(pDerivedFrom);
-    pFrmFmt = MakeFrmFmt( rFmtName, pFrmFmt, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pFrmFmt);
+    SwFrameFormat *pFrameFormat = dynamic_cast<SwFrameFormat*>(pDerivedFrom);
+    pFrameFormat = MakeFrameFormat( rFormatName, pFrameFormat, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pFrameFormat);
 }
 
 // #i40550# - add parameter <bAuto> - not relevant
-SwCharFmt *SwDoc::MakeCharFmt( const OUString &rFmtName,
-                               SwCharFmt *pDerivedFrom,
+SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
+                               SwCharFormat *pDerivedFrom,
                                bool bBroadcast,
                                bool )
 {
-    SwCharFmt *pFmt = new SwCharFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    mpCharFmtTbl->push_back( pFmt );
-    pFmt->SetAuto( false );
+    SwCharFormat *pFormat = new SwCharFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    mpCharFormatTable->push_back( pFormat );
+    pFormat->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoCharFmtCreate(pFmt, pDerivedFrom, this);
+        SwUndo * pUndo = new SwUndoCharFormatCreate(pFormat, pDerivedFrom, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
     {
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_CHAR,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_CHAR,
                                 SfxStyleSheetHintId::CREATED);
     }
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFmt *SwDoc::_MakeCharFmt(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeCharFormat(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwCharFmt *pCharFmt = dynamic_cast<SwCharFmt*>(pDerivedFrom);
-    pCharFmt = MakeCharFmt( rFmtName, pCharFmt, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pCharFmt);
+    SwCharFormat *pCharFormat = dynamic_cast<SwCharFormat*>(pDerivedFrom);
+    pCharFormat = MakeCharFormat( rFormatName, pCharFormat, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pCharFormat);
 }
 
 /// Create the FormatCollections
-SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const OUString &rFmtName,
-                                     SwTxtFmtColl *pDerivedFrom,
+SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
+                                     SwTextFormatColl *pDerivedFrom,
                                      bool bBroadcast,
                                      bool )
 {
-    SwTxtFmtColl *pFmtColl = new SwTxtFmtColl( GetAttrPool(), rFmtName,
+    SwTextFormatColl *pFormatColl = new SwTextFormatColl( GetAttrPool(), rFormatName,
                                                 pDerivedFrom );
-    mpTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( false );
+    mpTextFormatCollTable->push_back(pFormatColl);
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoTxtFmtCollCreate(pFmtColl, pDerivedFrom,
+        SwUndo * pUndo = new SwUndoTextFormatCollCreate(pFormatColl, pDerivedFrom,
                                                     this);
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_PARA,
                                 SfxStyleSheetHintId::CREATED);
 
-    return pFmtColl;
+    return pFormatColl;
 }
 
-SwFmt *SwDoc::_MakeTxtFmtColl(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeTextFormatColl(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwTxtFmtColl *pTxtFmtColl = dynamic_cast<SwTxtFmtColl*>(pDerivedFrom);
-    pTxtFmtColl = MakeTxtFmtColl( rFmtName, pTxtFmtColl, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pTxtFmtColl);
+    SwTextFormatColl *pTextFormatColl = dynamic_cast<SwTextFormatColl*>(pDerivedFrom);
+    pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pTextFormatColl);
 }
 
 //FEATURE::CONDCOLL
-SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const OUString &rFmtName,
-                                                  SwTxtFmtColl *pDerivedFrom,
+SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl( const OUString &rFormatName,
+                                                  SwTextFormatColl *pDerivedFrom,
                                                   bool bBroadcast)
 {
-    SwConditionTxtFmtColl*pFmtColl = new SwConditionTxtFmtColl( GetAttrPool(),
-                                                    rFmtName, pDerivedFrom );
-    mpTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( false );
+    SwConditionTextFormatColl*pFormatColl = new SwConditionTextFormatColl( GetAttrPool(),
+                                                    rFormatName, pDerivedFrom );
+    mpTextFormatCollTable->push_back(pFormatColl);
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoCondTxtFmtCollCreate(pFmtColl, pDerivedFrom,
+        SwUndo * pUndo = new SwUndoCondTextFormatCollCreate(pFormatColl, pDerivedFrom,
                                                         this);
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_PARA,
                                 SfxStyleSheetHintId::CREATED);
 
-    return pFmtColl;
+    return pFormatColl;
 }
 //FEATURE::CONDCOLL
 
 // GRF
-SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const OUString &rFmtName,
-                                     SwGrfFmtColl *pDerivedFrom )
+SwGrfFormatColl* SwDoc::MakeGrfFormatColl( const OUString &rFormatName,
+                                     SwGrfFormatColl *pDerivedFrom )
 {
-    SwGrfFmtColl *pFmtColl = new SwGrfFmtColl( GetAttrPool(), rFmtName,
+    SwGrfFormatColl *pFormatColl = new SwGrfFormatColl( GetAttrPool(), rFormatName,
                                                 pDerivedFrom );
-    mpGrfFmtCollTbl->push_back( pFmtColl );
-    pFmtColl->SetAuto( false );
+    mpGrfFormatCollTable->push_back( pFormatColl );
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
-    return pFmtColl;
+    return pFormatColl;
 }
 
-void SwDoc::DelTxtFmtColl(size_t nFmtColl, bool bBroadcast)
+void SwDoc::DelTextFormatColl(size_t nFormatColl, bool bBroadcast)
 {
-    OSL_ENSURE( nFmtColl, "Remove fuer Coll 0." );
+    OSL_ENSURE( nFormatColl, "Remove fuer Coll 0." );
 
     // Who has the to-be-deleted as their Next?
-    SwTxtFmtColl *pDel = (*mpTxtFmtCollTbl)[nFmtColl];
-    if( mpDfltTxtFmtColl == pDel )
+    SwTextFormatColl *pDel = (*mpTextFormatCollTable)[nFormatColl];
+    if( mpDfltTextFormatColl == pDel )
         return;     // never delete default!
 
     if (bBroadcast)
@@ -968,64 +968,64 @@ void SwDoc::DelTxtFmtColl(size_t nFmtColl, bool bBroadcast)
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoTxtFmtCollDelete * pUndo;
+        SwUndoTextFormatCollDelete * pUndo;
         if (RES_CONDTXTFMTCOLL == pDel->Which())
         {
-            pUndo = new SwUndoCondTxtFmtCollDelete(pDel, this);
+            pUndo = new SwUndoCondTextFormatCollDelete(pDel, this);
         }
         else
         {
-            pUndo = new SwUndoTxtFmtCollDelete(pDel, this);
+            pUndo = new SwUndoTextFormatCollDelete(pDel, this);
         }
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    // Remove the FmtColl
-    mpTxtFmtCollTbl->erase(mpTxtFmtCollTbl->begin() + nFmtColl);
+    // Remove the FormatColl
+    mpTextFormatCollTable->erase(mpTextFormatCollTable->begin() + nFormatColl);
     // Correct next
-    for( SwTxtFmtColls::const_iterator it = mpTxtFmtCollTbl->begin() + 1; it != mpTxtFmtCollTbl->end(); ++it )
-        SetTxtFmtCollNext( *it, pDel );
+    for( SwTextFormatColls::const_iterator it = mpTextFormatCollTable->begin() + 1; it != mpTextFormatCollTable->end(); ++it )
+        SetTextFormatCollNext( *it, pDel );
     delete pDel;
     getIDocumentState().SetModified();
 }
 
-void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, bool bBroadcast )
+void SwDoc::DelTextFormatColl( SwTextFormatColl *pColl, bool bBroadcast )
 {
-    size_t nFmt = mpTxtFmtCollTbl->GetPos( pColl );
-    OSL_ENSURE( SIZE_MAX != nFmt, "Collection not found," );
-    DelTxtFmtColl( nFmt, bBroadcast );
+    size_t nFormat = mpTextFormatCollTable->GetPos( pColl );
+    OSL_ENSURE( SIZE_MAX != nFormat, "Collection not found," );
+    DelTextFormatColl( nFormat, bBroadcast );
 }
 
-static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
+static bool lcl_SetTextFormatColl( const SwNodePtr& rpNode, void* pArgs )
 {
-    SwCntntNode* pCNd = static_cast<SwCntntNode*>(rpNode->GetTxtNode());
+    SwContentNode* pCNd = static_cast<SwContentNode*>(rpNode->GetTextNode());
 
     if( pCNd == NULL)
         return true;
 
-    sw::DocumentContentOperationsManager::ParaRstFmt* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFmt*>(pArgs);
+    sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
 
-    SwTxtFmtColl* pFmt = static_cast<SwTxtFmtColl*>(pPara->pFmtColl);
+    SwTextFormatColl* pFormat = static_cast<SwTextFormatColl*>(pPara->pFormatColl);
     if ( pPara->bReset )
     {
         lcl_RstAttr(pCNd, pPara);
 
         // #i62675# check, if paragraph style has changed
         if ( pPara->bResetListAttrs &&
-             pFmt != pCNd->GetFmtColl() &&
-             pFmt->GetItemState( RES_PARATR_NUMRULE ) == SfxItemState::SET )
+             pFormat != pCNd->GetFormatColl() &&
+             pFormat->GetItemState( RES_PARATR_NUMRULE ) == SfxItemState::SET )
         {
             // Check, if the list style of the paragraph will change.
             bool bChangeOfListStyleAtParagraph( true );
-            SwTxtNode* pTNd( dynamic_cast<SwTxtNode*>(pCNd) );
-            OSL_ENSURE( pTNd, "<lcl_SetTxtFmtColl(..)> - text node expected -> crash" );
+            SwTextNode* pTNd( dynamic_cast<SwTextNode*>(pCNd) );
+            OSL_ENSURE( pTNd, "<lcl_SetTextFormatColl(..)> - text node expected -> crash" );
             {
                 SwNumRule* pNumRuleAtParagraph( pTNd->GetNumRule() );
                 if ( pNumRuleAtParagraph )
                 {
                     const SwNumRuleItem& rNumRuleItemAtParagraphStyle =
-                        pFmt->GetNumRule();
+                        pFormat->GetNumRule();
                     if ( rNumRuleItemAtParagraphStyle.GetValue() ==
                             pNumRuleAtParagraph->GetName() )
                     {
@@ -1056,18 +1056,18 @@ static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
 
     // add to History so that old data is saved, if necessary
     if( pPara->pHistory )
-        pPara->pHistory->Add( pCNd->GetFmtColl(), pCNd->GetIndex(),
+        pPara->pHistory->Add( pCNd->GetFormatColl(), pCNd->GetIndex(),
                 ND_TEXTNODE );
 
-    pCNd->ChgFmtColl( pFmt );
+    pCNd->ChgFormatColl( pFormat );
 
     pPara->nWhich++;
 
     return true;
 }
 
-bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
-                          SwTxtFmtColl *pFmt,
+bool SwDoc::SetTextFormatColl(const SwPaM &rRg,
+                          SwTextFormatColl *pFormat,
                           const bool bReset,
                           const bool bResetListAttrs)
 {
@@ -1078,21 +1078,21 @@ bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoFmtColl* pUndo = new SwUndoFmtColl( rRg, pFmt,
+        SwUndoFormatColl* pUndo = new SwUndoFormatColl( rRg, pFormat,
                                                   bReset,
                                                   bResetListAttrs );
         pHst = pUndo->GetHistory();
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
-    aPara.pFmtColl = pFmt;
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
+    aPara.pFormatColl = pFormat;
     aPara.bReset = bReset;
     // #i62675#
     aPara.bResetListAttrs = bResetListAttrs;
 
     GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
-                        lcl_SetTxtFmtColl, &aPara );
+                        lcl_SetTextFormatColl, &aPara );
     if( !aPara.nWhich )
         bRet = false;           // didn't find a valid Node
 
@@ -1105,98 +1105,98 @@ bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
 }
 
 /// Copy the formats to itself
-SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
-                        const SwFmtsBase& rFmtArr,
-                        FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt )
+SwFormat* SwDoc::CopyFormat( const SwFormat& rFormat,
+                        const SwFormatsBase& rFormatArr,
+                        FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat )
 {
     // It's no autoformat, default format or collection format,
     // then search for it.
-    if( !rFmt.IsAuto() || !rFmt.GetRegisteredIn() )
-        for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
+    if( !rFormat.IsAuto() || !rFormat.GetRegisteredIn() )
+        for( size_t n = 0; n < rFormatArr.GetFormatCount(); ++n )
         {
             // Does the Doc already contain the template?
-            if( rFmtArr.GetFmt(n)->GetName()==rFmt.GetName() )
-                return rFmtArr.GetFmt(n);
+            if( rFormatArr.GetFormat(n)->GetName()==rFormat.GetName() )
+                return rFormatArr.GetFormat(n);
         }
 
     // Search for the "parent" first
-    SwFmt* pParent = const_cast<SwFmt*>(&rDfltFmt);
-    if( rFmt.DerivedFrom() && pParent != rFmt.DerivedFrom() )
-        pParent = CopyFmt( *rFmt.DerivedFrom(), rFmtArr,
-                                fnCopyFmt, rDfltFmt );
+    SwFormat* pParent = const_cast<SwFormat*>(&rDfltFormat);
+    if( rFormat.DerivedFrom() && pParent != rFormat.DerivedFrom() )
+        pParent = CopyFormat( *rFormat.DerivedFrom(), rFormatArr,
+                                fnCopyFormat, rDfltFormat );
 
     // Create the format and copy the attributes
     // #i40550#
-    SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, false, true );
-    pNewFmt->SetAuto( rFmt.IsAuto() );
-    pNewFmt->CopyAttrs( rFmt, true );           // copy the attributes
+    SwFormat* pNewFormat = (this->*fnCopyFormat)( rFormat.GetName(), pParent, false, true );
+    pNewFormat->SetAuto( rFormat.IsAuto() );
+    pNewFormat->CopyAttrs( rFormat, true );           // copy the attributes
 
-    pNewFmt->SetPoolFmtId( rFmt.GetPoolFmtId() );
-    pNewFmt->SetPoolHelpId( rFmt.GetPoolHelpId() );
+    pNewFormat->SetPoolFormatId( rFormat.GetPoolFormatId() );
+    pNewFormat->SetPoolHelpId( rFormat.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
-    pNewFmt->SetPoolHlpFileId( UCHAR_MAX );
+    pNewFormat->SetPoolHlpFileId( UCHAR_MAX );
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
 /// copy the frame format
-SwFrmFmt* SwDoc::CopyFrmFmt( const SwFrmFmt& rFmt )
+SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat )
 {
-    return static_cast<SwFrmFmt*>(CopyFmt( rFmt, *GetFrmFmts(), &SwDoc::_MakeFrmFmt,
-                                *GetDfltFrmFmt() ));
+    return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::_MakeFrameFormat,
+                                *GetDfltFrameFormat() ));
 }
 
 /// copy the char format
-SwCharFmt* SwDoc::CopyCharFmt( const SwCharFmt& rFmt )
+SwCharFormat* SwDoc::CopyCharFormat( const SwCharFormat& rFormat )
 {
-    return static_cast<SwCharFmt*>(CopyFmt( rFmt, *GetCharFmts(),
-                                            &SwDoc::_MakeCharFmt,
-                                            *GetDfltCharFmt() ));
+    return static_cast<SwCharFormat*>(CopyFormat( rFormat, *GetCharFormats(),
+                                            &SwDoc::_MakeCharFormat,
+                                            *GetDfltCharFormat() ));
 }
 
 /// copy TextNodes
-SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
+SwTextFormatColl* SwDoc::CopyTextColl( const SwTextFormatColl& rColl )
 {
-    SwTxtFmtColl* pNewColl = FindTxtFmtCollByName( rColl.GetName() );
+    SwTextFormatColl* pNewColl = FindTextFormatCollByName( rColl.GetName() );
     if( pNewColl )
         return pNewColl;
 
     // search for the "parent" first
-    SwTxtFmtColl* pParent = mpDfltTxtFmtColl;
+    SwTextFormatColl* pParent = mpDfltTextFormatColl;
     if( pParent != rColl.DerivedFrom() )
-        pParent = CopyTxtColl( *static_cast<SwTxtFmtColl*>(rColl.DerivedFrom()) );
+        pParent = CopyTextColl( *static_cast<SwTextFormatColl*>(rColl.DerivedFrom()) );
 
 //FEATURE::CONDCOLL
     if( RES_CONDTXTFMTCOLL == rColl.Which() )
     {
-        pNewColl = new SwConditionTxtFmtColl( GetAttrPool(), rColl.GetName(),
+        pNewColl = new SwConditionTextFormatColl( GetAttrPool(), rColl.GetName(),
                                                 pParent);
-        mpTxtFmtCollTbl->push_back( pNewColl );
+        mpTextFormatCollTable->push_back( pNewColl );
         pNewColl->SetAuto( false );
         getIDocumentState().SetModified();
 
         // copy the conditions
-        static_cast<SwConditionTxtFmtColl*>(pNewColl)->SetConditions(
-                            static_cast<const SwConditionTxtFmtColl&>(rColl).GetCondColls() );
+        static_cast<SwConditionTextFormatColl*>(pNewColl)->SetConditions(
+                            static_cast<const SwConditionTextFormatColl&>(rColl).GetCondColls() );
     }
     else
 //FEATURE::CONDCOLL
-        pNewColl = MakeTxtFmtColl( rColl.GetName(), pParent );
+        pNewColl = MakeTextFormatColl( rColl.GetName(), pParent );
 
     // copy the auto formats or the attributes
     pNewColl->CopyAttrs( rColl, true );
 
     if(rColl.IsAssignedToListLevelOfOutlineStyle())
         pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());
-    pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
+    pNewColl->SetPoolFormatId( rColl.GetPoolFormatId() );
     pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
     pNewColl->SetPoolHlpFileId( UCHAR_MAX );
 
-    if( &rColl.GetNextTxtFmtColl() != &rColl )
-        pNewColl->SetNextTxtFmtColl( *CopyTxtColl( rColl.GetNextTxtFmtColl() ));
+    if( &rColl.GetNextTextFormatColl() != &rColl )
+        pNewColl->SetNextTextFormatColl( *CopyTextColl( rColl.GetNextTextFormatColl() ));
 
     // create the NumRule if necessary
     if( this != rColl.GetDoc() )
@@ -1223,24 +1223,24 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
 }
 
 /// copy the graphic nodes
-SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl )
+SwGrfFormatColl* SwDoc::CopyGrfColl( const SwGrfFormatColl& rColl )
 {
-    SwGrfFmtColl* pNewColl = FindGrfFmtCollByName( rColl.GetName() );
+    SwGrfFormatColl* pNewColl = FindGrfFormatCollByName( rColl.GetName() );
     if( pNewColl )
         return pNewColl;
 
      // Search for the "parent" first
-    SwGrfFmtColl* pParent = mpDfltGrfFmtColl;
+    SwGrfFormatColl* pParent = mpDfltGrfFormatColl;
     if( pParent != rColl.DerivedFrom() )
-        pParent = CopyGrfColl( *static_cast<SwGrfFmtColl*>(rColl.DerivedFrom()) );
+        pParent = CopyGrfColl( *static_cast<SwGrfFormatColl*>(rColl.DerivedFrom()) );
 
     // if not, copy them
-    pNewColl = MakeGrfFmtColl( rColl.GetName(), pParent );
+    pNewColl = MakeGrfFormatColl( rColl.GetName(), pParent );
 
     // copy the attributes
     pNewColl->CopyAttrs( rColl );
 
-    pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
+    pNewColl->SetPoolFormatId( rColl.GetPoolFormatId() );
     pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
@@ -1249,49 +1249,49 @@ SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl )
     return pNewColl;
 }
 
-void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
-                        SwFmtsBase& rDestArr,
-                        FNCopyFmt fnCopyFmt,
-                        SwFmt& rDfltFmt )
+void SwDoc::CopyFormatArr( const SwFormatsBase& rSourceArr,
+                        SwFormatsBase& rDestArr,
+                        FNCopyFormat fnCopyFormat,
+                        SwFormat& rDfltFormat )
 {
-    SwFmt* pSrc, *pDest;
+    SwFormat* pSrc, *pDest;
 
     // 1st step: Create all formats (skip the 0th - it's the default one)
-    for( size_t nSrc = rSourceArr.GetFmtCount(); nSrc > 1; )
+    for( size_t nSrc = rSourceArr.GetFormatCount(); nSrc > 1; )
     {
-        pSrc = rSourceArr.GetFmt( --nSrc );
+        pSrc = rSourceArr.GetFormat( --nSrc );
         if( pSrc->IsDefault() || pSrc->IsAuto() )
             continue;
 
-        if( 0 == FindFmtByName( rDestArr, pSrc->GetName() ) )
+        if( 0 == FindFormatByName( rDestArr, pSrc->GetName() ) )
         {
             if( RES_CONDTXTFMTCOLL == pSrc->Which() )
-                MakeCondTxtFmtColl( pSrc->GetName(), static_cast<SwTxtFmtColl*>(&rDfltFmt) );
+                MakeCondTextFormatColl( pSrc->GetName(), static_cast<SwTextFormatColl*>(&rDfltFormat) );
             else
                 // #i40550#
-                (this->*fnCopyFmt)( pSrc->GetName(), &rDfltFmt, false, true );
+                (this->*fnCopyFormat)( pSrc->GetName(), &rDfltFormat, false, true );
         }
     }
 
     // 2nd step: Copy all attributes, set the right parents
-    for( size_t nSrc = rSourceArr.GetFmtCount(); nSrc > 1; )
+    for( size_t nSrc = rSourceArr.GetFormatCount(); nSrc > 1; )
     {
-        pSrc = rSourceArr.GetFmt( --nSrc );
+        pSrc = rSourceArr.GetFormat( --nSrc );
         if( pSrc->IsDefault() || pSrc->IsAuto() )
             continue;
 
-        pDest = FindFmtByName( rDestArr, pSrc->GetName() );
+        pDest = FindFormatByName( rDestArr, pSrc->GetName() );
         pDest->SetAuto( false );
         pDest->DelDiffs( *pSrc );
 
-        // #i94285#: existing <SwFmtPageDesc> instance, before copying attributes
+        // #i94285#: existing <SwFormatPageDesc> instance, before copying attributes
         const SfxPoolItem* pItem;
         if( &GetAttrPool() != pSrc->GetAttrSet().GetPool() &&
             SfxItemState::SET == pSrc->GetAttrSet().GetItemState(
             RES_PAGEDESC, false, &pItem ) &&
-            static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+            static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
         {
-            SwFmtPageDesc aPageDesc( *static_cast<const SwFmtPageDesc*>(pItem) );
+            SwFormatPageDesc aPageDesc( *static_cast<const SwFormatPageDesc*>(pItem) );
             const OUString& rNm = aPageDesc.GetPageDesc()->GetName();
             SwPageDesc* pPageDesc = FindPageDesc( rNm );
             if( !pPageDesc )
@@ -1301,30 +1301,30 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
             aPageDesc.RegisterToPageDesc( *pPageDesc );
             SwAttrSet aTmpAttrSet( pSrc->GetAttrSet() );
             aTmpAttrSet.Put( aPageDesc );
-            pDest->SetFmtAttr( aTmpAttrSet );
+            pDest->SetFormatAttr( aTmpAttrSet );
         }
         else
         {
-            pDest->SetFmtAttr( pSrc->GetAttrSet() );
+            pDest->SetFormatAttr( pSrc->GetAttrSet() );
         }
 
-        pDest->SetPoolFmtId( pSrc->GetPoolFmtId() );
+        pDest->SetPoolFormatId( pSrc->GetPoolFormatId() );
         pDest->SetPoolHelpId( pSrc->GetPoolHelpId() );
 
         // Always set the HelpFile Id to default!
         pDest->SetPoolHlpFileId( UCHAR_MAX );
 
         if( pSrc->DerivedFrom() )
-            pDest->SetDerivedFrom( FindFmtByName( rDestArr,
+            pDest->SetDerivedFrom( FindFormatByName( rDestArr,
                                         pSrc->DerivedFrom()->GetName() ) );
         if( RES_TXTFMTCOLL == pSrc->Which() ||
             RES_CONDTXTFMTCOLL == pSrc->Which() )
         {
-            SwTxtFmtColl* pSrcColl = static_cast<SwTxtFmtColl*>(pSrc),
-                        * pDstColl = static_cast<SwTxtFmtColl*>(pDest);
-            if( &pSrcColl->GetNextTxtFmtColl() != pSrcColl )
-                pDstColl->SetNextTxtFmtColl( *static_cast<SwTxtFmtColl*>(FindFmtByName(
-                    rDestArr, pSrcColl->GetNextTxtFmtColl().GetName() ) ) );
+            SwTextFormatColl* pSrcColl = static_cast<SwTextFormatColl*>(pSrc),
+                        * pDstColl = static_cast<SwTextFormatColl*>(pDest);
+            if( &pSrcColl->GetNextTextFormatColl() != pSrcColl )
+                pDstColl->SetNextTextFormatColl( *static_cast<SwTextFormatColl*>(FindFormatByName(
+                    rDestArr, pSrcColl->GetNextTextFormatColl().GetName() ) ) );
 
             if(pSrcColl->IsAssignedToListLevelOfOutlineStyle())
                 pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());
@@ -1332,66 +1332,66 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
 //FEATURE::CONDCOLL
             if( RES_CONDTXTFMTCOLL == pSrc->Which() )
                 // Copy the conditions, but delete the old ones first!
-                static_cast<SwConditionTxtFmtColl*>(pDstColl)->SetConditions(
-                            static_cast<SwConditionTxtFmtColl*>(pSrc)->GetCondColls() );
+                static_cast<SwConditionTextFormatColl*>(pDstColl)->SetConditions(
+                            static_cast<SwConditionTextFormatColl*>(pSrc)->GetCondColls() );
 //FEATURE::CONDCOLL
         }
     }
 }
 
 void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
-                                const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
+                                const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
 {
     // Treat the header and footer attributes in the right way:
     // Copy content nodes across documents!
     sal_uInt16 nAttr = static_cast<sal_uInt16>( bCpyHeader ? RES_HEADER : RES_FOOTER );
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET != rSrcFmt.GetAttrSet().GetItemState( nAttr, false, &pItem ))
+    if( SfxItemState::SET != rSrcFormat.GetAttrSet().GetItemState( nAttr, false, &pItem ))
         return ;
 
     // The header only contains the reference to the format from the other document!
     SfxPoolItem* pNewItem = pItem->Clone();
 
-    SwFrmFmt* pOldFmt;
+    SwFrameFormat* pOldFormat;
     if( bCpyHeader )
-         pOldFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
+         pOldFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
     else
-         pOldFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
+         pOldFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
 
-    if( pOldFmt )
+    if( pOldFormat )
     {
-        SwFrmFmt* pNewFmt = new SwFrmFmt( GetAttrPool(), "CpyDesc",
-                                            GetDfltFrmFmt() );
-        pNewFmt->CopyAttrs( *pOldFmt, true );
+        SwFrameFormat* pNewFormat = new SwFrameFormat( GetAttrPool(), "CpyDesc",
+                                            GetDfltFrameFormat() );
+        pNewFormat->CopyAttrs( *pOldFormat, true );
 
-        if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState(
+        if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(
             RES_CNTNT, false, &pItem ))
         {
-            const SwFmtCntnt* pCntnt = static_cast<const SwFmtCntnt*>(pItem);
-            if( pCntnt->GetCntntIdx() )
+            const SwFormatContent* pContent = static_cast<const SwFormatContent*>(pItem);
+            if( pContent->GetContentIdx() )
             {
                 SwNodeIndex aTmpIdx( GetNodes().GetEndOfAutotext() );
-                const SwNodes& rSrcNds = rSrcFmt.GetDoc()->GetNodes();
+                const SwNodes& rSrcNds = rSrcFormat.GetDoc()->GetNodes();
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmpIdx,
                                                 bCpyHeader
                                                     ? SwHeaderStartNode
                                                     : SwFooterStartNode );
-                const SwNode& rCSttNd = pCntnt->GetCntntIdx()->GetNode();
+                const SwNode& rCSttNd = pContent->GetContentIdx()->GetNode();
                 SwNodeRange aRg( rCSttNd, 0, *rCSttNd.EndOfSectionNode() );
                 aTmpIdx = *pSttNd->EndOfSectionNode();
                 rSrcNds._Copy( aRg, aTmpIdx );
                 aTmpIdx = *pSttNd;
-                rSrcFmt.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx );
-                pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
+                rSrcFormat.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx );
+                pNewFormat->SetFormatAttr( SwFormatContent( pSttNd ));
             }
             else
-                pNewFmt->ResetFmtAttr( RES_CNTNT );
+                pNewFormat->ResetFormatAttr( RES_CNTNT );
         }
         if( bCpyHeader )
-            static_cast<SwFmtHeader*>(pNewItem)->RegisterToFormat(*pNewFmt);
+            static_cast<SwFormatHeader*>(pNewItem)->RegisterToFormat(*pNewFormat);
         else
-            static_cast<SwFmtFooter*>(pNewItem)->RegisterToFormat(*pNewFmt);
-        rDestFmt.SetFmtAttr( *pNewItem );
+            static_cast<SwFormatFooter*>(pNewItem)->RegisterToFormat(*pNewFormat);
+        rDestFormat.SetFormatAttr( *pNewItem );
     }
     delete pNewItem;
 }
@@ -1412,7 +1412,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
 
     if( bCopyPoolIds )
     {
-        rDstDesc.SetPoolFmtId( rSrcDesc.GetPoolFmtId() );
+        rDstDesc.SetPoolFormatId( rSrcDesc.GetPoolFormatId() );
         rDstDesc.SetPoolHelpId( rSrcDesc.GetPoolHelpId() );
         // Always set the HelpFile Id to default!
         rDstDesc.SetPoolHlpFileId( UCHAR_MAX );
@@ -1440,7 +1440,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetMaster().DelDiffs( aAttrSet );
-        rDstDesc.GetMaster().SetFmtAttr( aAttrSet );
+        rDstDesc.GetMaster().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetLeft().GetAttrSet() );
@@ -1448,7 +1448,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetLeft().DelDiffs( aAttrSet );
-        rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
+        rDstDesc.GetLeft().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
@@ -1456,7 +1456,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
-        rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
+        rDstDesc.GetFirstMaster().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
@@ -1464,7 +1464,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
-        rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
+        rDstDesc.GetFirstLeft().SetFormatAttr( aAttrSet );
     }
 
     CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
@@ -1472,31 +1472,31 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
     if( !rDstDesc.IsHeaderShared() )
         CopyHeader( rSrcDesc.GetLeft(), rDstDesc.GetLeft() );
     else
-        rDstDesc.GetLeft().SetFmtAttr( rDstDesc.GetMaster().GetHeader() );
+        rDstDesc.GetLeft().SetFormatAttr( rDstDesc.GetMaster().GetHeader() );
     if( !rDstDesc.IsFirstShared() )
     {
         CopyHeader( rSrcDesc.GetFirstMaster(), rDstDesc.GetFirstMaster() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetFirstMaster().GetHeader());
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetFirstMaster().GetHeader());
     }
     else
     {
-        rDstDesc.GetFirstMaster().SetFmtAttr( rDstDesc.GetMaster().GetHeader() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetLeft().GetHeader());
+        rDstDesc.GetFirstMaster().SetFormatAttr( rDstDesc.GetMaster().GetHeader() );
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetLeft().GetHeader());
     }
 
     if( !rDstDesc.IsFooterShared() )
         CopyFooter( rSrcDesc.GetLeft(), rDstDesc.GetLeft() );
     else
-        rDstDesc.GetLeft().SetFmtAttr( rDstDesc.GetMaster().GetFooter() );
+        rDstDesc.GetLeft().SetFormatAttr( rDstDesc.GetMaster().GetFooter() );
     if( !rDstDesc.IsFirstShared() )
     {
         CopyFooter( rSrcDesc.GetFirstMaster(), rDstDesc.GetFirstMaster() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetFirstMaster().GetFooter());
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetFirstMaster().GetFooter());
     }
     else
     {
-        rDstDesc.GetFirstMaster().SetFmtAttr( rDstDesc.GetMaster().GetFooter() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetLeft().GetFooter());
+        rDstDesc.GetFirstMaster().SetFormatAttr( rDstDesc.GetMaster().GetFooter() );
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetLeft().GetFooter());
     }
 
     if( bNotifyLayout && pTmpRoot )
@@ -1506,10 +1506,10 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
     }
 
     // If foot notes change the pages have to be triggered
-    if( !(rDstDesc.GetFtnInfo() == rSrcDesc.GetFtnInfo()) )
+    if( !(rDstDesc.GetFootnoteInfo() == rSrcDesc.GetFootnoteInfo()) )
     {
         sw::PageFootnoteHint aHint;
-        rDstDesc.SetFtnInfo( rSrcDesc.GetFtnInfo() );
+        rDstDesc.SetFootnoteInfo( rSrcDesc.GetFootnoteInfo() );
         rDstDesc.GetMaster().CallSwClientNotify(aHint);
         rDstDesc.GetLeft().CallSwClientNotify(aHint);
         rDstDesc.GetFirstMaster().CallSwClientNotify(aHint);
@@ -1521,12 +1521,12 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
 {
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-    CopyFmtArr( *rSource.mpCharFmtTbl, *mpCharFmtTbl,
-                &SwDoc::_MakeCharFmt, *mpDfltCharFmt );
-    CopyFmtArr( *rSource.mpFrmFmtTbl, *mpFrmFmtTbl,
-                &SwDoc::_MakeFrmFmt, *mpDfltFrmFmt );
-    CopyFmtArr( *rSource.mpTxtFmtCollTbl, *mpTxtFmtCollTbl,
-                &SwDoc::_MakeTxtFmtColl, *mpDfltTxtFmtColl );
+    CopyFormatArr( *rSource.mpCharFormatTable, *mpCharFormatTable,
+                &SwDoc::_MakeCharFormat, *mpDfltCharFormat );
+    CopyFormatArr( *rSource.mpFrameFormatTable, *mpFrameFormatTable,
+                &SwDoc::_MakeFrameFormat, *mpDfltFrameFormat );
+    CopyFormatArr( *rSource.mpTextFormatCollTable, *mpTextFormatCollTable,
+                &SwDoc::_MakeTextFormatColl, *mpDfltTextFormatColl );
 
     //To-Do:
     //  a) in rtf export don't export our hideous pgdsctbl
@@ -1542,7 +1542,7 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
         if( nCnt )
         {
             // a different Doc -> Number formatter needs to be merged
-            SwTblNumFmtMerge aTNFM( rSource, *this );
+            SwTableNumFormatMerge aTNFM( rSource, *this );
 
             // 1st step: Create all formats (skip the 0th - it's the default!)
             while( nCnt )
@@ -1563,10 +1563,10 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
     }
 
     // then there are the numbering templates
-    const SwPageDescs::size_type nCnt = rSource.GetNumRuleTbl().size();
+    const SwPageDescs::size_type nCnt = rSource.GetNumRuleTable().size();
     if( nCnt )
     {
-        const SwNumRuleTbl& rArr = rSource.GetNumRuleTbl();
+        const SwNumRuleTable& rArr = rSource.GetNumRuleTable();
         for( SwPageDescs::size_type n = 0; n < nCnt; ++n )
         {
             const SwNumRule& rR = *rArr[ n ];
@@ -1598,16 +1598,16 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
     getIDocumentState().SetModified();
 }
 
-SwFmt* SwDoc::FindFmtByName( const SwFmtsBase& rFmtArr,
+SwFormat* SwDoc::FindFormatByName( const SwFormatsBase& rFormatArr,
                              const OUString& rName )
 {
-    SwFmt* pFnd = 0;
-    for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
+    SwFormat* pFnd = 0;
+    for( size_t n = 0; n < rFormatArr.GetFormatCount(); ++n )
     {
         // Does the Doc already contain the template?
-        if( rFmtArr.GetFmt(n)->GetName() == rName )
+        if( rFormatArr.GetFormat(n)->GetName() == rName )
         {
-            pFnd = rFmtArr.GetFmt(n);
+            pFnd = rFormatArr.GetFormat(n);
             break;
         }
     }
@@ -1631,10 +1631,10 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
     SwNodeIndex aIdx( rStt.nNode );
     while( aIdx <= rEnd.nNode )
     {
-        SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode* pTNd = aIdx.GetNode().GetTextNode();
         if( pTNd )
         {
-            SvxLRSpaceItem aLS( static_cast<const SvxLRSpaceItem&>(pTNd->SwCntntNode::GetAttr( RES_LR_SPACE )) );
+            SvxLRSpaceItem aLS( static_cast<const SvxLRSpaceItem&>(pTNd->SwContentNode::GetAttr( RES_LR_SPACE )) );
 
             // #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in thints.cxx
             if ( pTNd->AreListLevelIndentsApplicable() )
@@ -1645,17 +1645,17 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
                     const int nListLevel = pTNd->GetActualListLevel();
                     if ( nListLevel >= 0 )
                     {
-                        const SwNumFmt& rFmt = pRule->Get(static_cast<sal_uInt16>(nListLevel));
-                        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+                        const SwNumFormat& rFormat = pRule->Get(static_cast<sal_uInt16>(nListLevel));
+                        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
                         {
-                            aLS.SetTxtLeft( rFmt.GetIndentAt() );
-                            aLS.SetTxtFirstLineOfst( static_cast<short>(rFmt.GetFirstLineIndent()) );
+                            aLS.SetTextLeft( rFormat.GetIndentAt() );
+                            aLS.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
                         }
                     }
                 }
             }
 
-            long nNext = aLS.GetTxtLeft();
+            long nNext = aLS.GetTextLeft();
             if( bModulus )
                 nNext = ( nNext / nDefDist ) * nDefDist;
 
@@ -1665,7 +1665,7 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
                 if(nNext >0) // fdo#75936 set limit for decreasing indent
                     nNext -= nDefDist;
 
-            aLS.SetTxtLeft( nNext );
+            aLS.SetTextLeft( nNext );
 
             SwRegHistory aRegH( pTNd, *pTNd, pHistory );
             pTNd->SetAttr( aLS );
@@ -1675,35 +1675,35 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
     getIDocumentState().SetModified();
 }
 
-bool SwDoc::DontExpandFmt( const SwPosition& rPos, bool bFlag )
+bool SwDoc::DontExpandFormat( const SwPosition& rPos, bool bFlag )
 {
     bool bRet = false;
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        bRet = pTxtNd->DontExpandFmt( rPos.nContent, bFlag );
+        bRet = pTextNd->DontExpandFormat( rPos.nContent, bFlag );
         if( bRet && GetIDocumentUndoRedo().DoesUndo() )
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoDontExpandFmt(rPos) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoDontExpandFormat(rPos) );
         }
     }
     return bRet;
 }
 
-SwTableBoxFmt* SwDoc::MakeTableBoxFmt()
+SwTableBoxFormat* SwDoc::MakeTableBoxFormat()
 {
-    SwTableBoxFmt* pFmt = new SwTableBoxFmt( GetAttrPool(), aEmptyOUStr,
-                                                mpDfltFrmFmt );
+    SwTableBoxFormat* pFormat = new SwTableBoxFormat( GetAttrPool(), aEmptyOUStr,
+                                                mpDfltFrameFormat );
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwTableLineFmt* SwDoc::MakeTableLineFmt()
+SwTableLineFormat* SwDoc::MakeTableLineFormat()
 {
-    SwTableLineFmt* pFmt = new SwTableLineFmt( GetAttrPool(), aEmptyOUStr,
-                                                mpDfltFrmFmt );
+    SwTableLineFormat* pFormat = new SwTableLineFormat( GetAttrPool(), aEmptyOUStr,
+                                                mpDfltFrameFormat );
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
 void SwDoc::_CreateNumberFormatter()
@@ -1717,43 +1717,43 @@ void SwDoc::_CreateNumberFormatter()
     mpNumberFormatter->SetYear2000(static_cast<sal_uInt16>(::utl::MiscCfg().GetYear2000()));
 }
 
-SwTblNumFmtMerge::SwTblNumFmtMerge( const SwDoc& rSrc, SwDoc& rDest )
-    : pNFmt( 0 )
+SwTableNumFormatMerge::SwTableNumFormatMerge( const SwDoc& rSrc, SwDoc& rDest )
+    : pNFormat( 0 )
 {
     // a different Doc -> Number formatter needs to be merged
     SvNumberFormatter* pN;
     if( &rSrc != &rDest && 0 != ( pN = const_cast<SwDoc&>(rSrc).GetNumberFormatter( false ) ))
-        ( pNFmt = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN );
+        ( pNFormat = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN );
 
     if( &rSrc != &rDest )
-        static_cast<SwGetRefFieldType*>(rSrc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ))->
+        static_cast<SwGetRefFieldType*>(rSrc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD ))->
             MergeWithOtherDoc( rDest );
 }
 
-SwTblNumFmtMerge::~SwTblNumFmtMerge()
+SwTableNumFormatMerge::~SwTableNumFormatMerge()
 {
-    if( pNFmt )
-        pNFmt->ClearMergeTable();
+    if( pNFormat )
+        pNFormat->ClearMergeTable();
 }
 
-void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
+void SwDoc::SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId,
                                     const SfxItemSet* pSet )
 {
     SwPaM aPam( rPos );
-    SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     assert(pTNd);
 
-    if (mbIsAutoFmtRedline)
+    if (mbIsAutoFormatRedline)
     {
         // create the redline object
-        const SwTxtFmtColl& rColl = *pTNd->GetTxtColl();
+        const SwTextFormatColl& rColl = *pTNd->GetTextColl();
         SwRangeRedline* pRedl = new SwRangeRedline( nsRedlineType_t::REDLINE_FMTCOLL, aPam );
         pRedl->SetMark();
 
         // Only those items that are not set by the Set again in the Node
         // are of interest. Thus, we take the difference.
-        SwRedlineExtraData_FmtColl aExtraData( rColl.GetName(),
-                                                rColl.GetPoolFmtId() );
+        SwRedlineExtraData_FormatColl aExtraData( rColl.GetName(),
+                                                rColl.GetPoolFormatId() );
         if( pSet && pTNd->HasSwAttrSet() )
         {
             SfxItemSet aTmp( *pTNd->GetpSwAttrSet() );
@@ -1771,24 +1771,24 @@ void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
         getIDocumentRedlineAccess().AppendRedline( pRedl, true );
     }
 
-    SetTxtFmtColl( aPam, getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId ) );
+    SetTextFormatColl( aPam, getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId ) );
 
     if (pSet && pSet->Count())
     {
         aPam.SetMark();
-        aPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        aPam.GetMark()->nContent.Assign(pTNd, pTNd->GetText().getLength());
         getIDocumentContentOperations().InsertItemSet( aPam, *pSet );
     }
 }
 
-void SwDoc::SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& rSet )
+void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet )
 {
-    SwTxtNode* pTNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
     assert(pTNd);
 
     RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
 
-    if (mbIsAutoFmtRedline)
+    if (mbIsAutoFormatRedline)
     {
         // create the redline object
         SwRangeRedline* pRedl = new SwRangeRedline( nsRedlineType_t::REDLINE_FORMAT, rPam );
@@ -1835,18 +1835,18 @@ void SwDoc::SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& rSet )
     getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
 }
 
-void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
+void SwDoc::ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet)
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         // copying <rSet> to <aSet>
         SfxItemSet aSet(rSet);
         // remove from <aSet> all items, which are already set at the format
-        aSet.Differentiate(rFmt.GetAttrSet());
+        aSet.Differentiate(rFormat.GetAttrSet());
         // <aSet> contains now all *new* items for the format
 
         // copying current format item set to <aOldSet>
-        SfxItemSet aOldSet(rFmt.GetAttrSet());
+        SfxItemSet aOldSet(rFormat.GetAttrSet());
         // insert new items into <aOldSet>
         aOldSet.Put(aSet);
         // invalidate all new items in <aOldSet> in order to clear these items,
@@ -1863,15 +1863,15 @@ void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
             }
         }
 
-        SwUndo * pUndo = new SwUndoFmtAttr(aOldSet, rFmt);
+        SwUndo * pUndo = new SwUndoFormatAttr(aOldSet, rFormat);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    rFmt.SetFmtAttr(rSet);
+    rFormat.SetFormatAttr(rSet);
 }
 
-void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
+void SwDoc::RenameFormat(SwFormat & rFormat, const OUString & sNewName,
                       bool bBroadcast)
 {
     SfxStyleFamily eFamily = SFX_STYLE_FAMILY_ALL;
@@ -1880,18 +1880,18 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
     {
         SwUndo * pUndo = NULL;
 
-        switch (rFmt.Which())
+        switch (rFormat.Which())
         {
         case RES_CHRFMT:
-            pUndo = new SwUndoRenameCharFmt(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameCharFormat(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_CHAR;
             break;
         case RES_TXTFMTCOLL:
-            pUndo = new SwUndoRenameFmtColl(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameFormatColl(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_PARA;
             break;
         case RES_FRMFMT:
-            pUndo = new SwUndoRenameFrmFmt(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameFrameFormat(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_FRAME;
             break;
 
@@ -1905,7 +1905,7 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
         }
     }
 
-    rFmt.SetName(sNewName);
+    rFormat.SetName(sNewName);
 
     if (bBroadcast)
         BroadcastStyleOperation(sNewName, eFamily, SfxStyleSheetHintId::MODIFIED);
@@ -1927,15 +1927,15 @@ void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
     maDBData.dumpAsXml(pWriter);
     mpMarkManager->dumpAsXml(pWriter);
     m_pUndoManager->dumpAsXml(pWriter);
-    getIDocumentFieldsAccess().GetFldTypes()->dumpAsXml(pWriter);
-    mpTxtFmtCollTbl->dumpAsXml(pWriter);
-    mpCharFmtTbl->dumpAsXml(pWriter);
-    mpFrmFmtTbl->dumpAsXml(pWriter, "frmFmtTbl");
-    mpSpzFrmFmtTbl->dumpAsXml(pWriter, "spzFrmFmtTbl");
-    mpSectionFmtTbl->dumpAsXml(pWriter);
-    mpNumRuleTbl->dumpAsXml(pWriter);
-    getIDocumentRedlineAccess().GetRedlineTbl().dumpAsXml(pWriter);
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().dumpAsXml(pWriter);
+    getIDocumentFieldsAccess().GetFieldTypes()->dumpAsXml(pWriter);
+    mpTextFormatCollTable->dumpAsXml(pWriter);
+    mpCharFormatTable->dumpAsXml(pWriter);
+    mpFrameFormatTable->dumpAsXml(pWriter, "frmFormatTable");
+    mpSpzFrameFormatTable->dumpAsXml(pWriter, "spzFrameFormatTable");
+    mpSectionFormatTable->dumpAsXml(pWriter);
+    mpNumRuleTable->dumpAsXml(pWriter);
+    getIDocumentRedlineAccess().GetRedlineTable().dumpAsXml(pWriter);
+    getIDocumentRedlineAccess().GetExtraRedlineTable().dumpAsXml(pWriter);
     if (const SdrModel* pModel = getIDocumentDrawModelAccess().GetDrawModel())
         pModel->dumpAsXml(pWriter);
 
@@ -1997,26 +1997,26 @@ namespace docfunc
         // format or the OpenOffice.org file format.
         bool bRet( false );
 
-        const SwTxtFmtColls* pTxtFmtColls( rDoc.GetTxtFmtColls() );
-        if ( pTxtFmtColls )
+        const SwTextFormatColls* pTextFormatColls( rDoc.GetTextFormatColls() );
+        if ( pTextFormatColls )
         {
-            for ( auto pTxtFmtColl : *pTxtFmtColls )
+            for ( auto pTextFormatColl : *pTextFormatColls )
             {
-                if ( pTxtFmtColl->IsDefault() ||
-                    ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+                if ( pTextFormatColl->IsDefault() ||
+                    ! pTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
                 {
                     continue;
                 }
 
-                const SwTxtFmtColl* pParentTxtFmtColl =
-                   dynamic_cast<const SwTxtFmtColl*>( pTxtFmtColl->DerivedFrom());
-                if ( !pParentTxtFmtColl )
+                const SwTextFormatColl* pParentTextFormatColl =
+                   dynamic_cast<const SwTextFormatColl*>( pTextFormatColl->DerivedFrom());
+                if ( !pParentTextFormatColl )
                     continue;
 
-                if ( SfxItemState::SET == pParentTxtFmtColl->GetItemState( RES_PARATR_NUMRULE ) )
+                if ( SfxItemState::SET == pParentTextFormatColl->GetItemState( RES_PARATR_NUMRULE ) )
                 {
                     // #i106218# consider that the outline style is set
-                    const SwNumRuleItem& rDirectItem = pParentTxtFmtColl->GetNumRule();
+                    const SwNumRuleItem& rDirectItem = pParentTextFormatColl->GetNumRule();
                     if ( rDirectItem.GetValue() != rDoc.GetOutlineNumRule()->GetName() )
                     {
                         bRet = true;
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 1b9c1beb6b3c..b89ae65d0110 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -39,8 +39,8 @@
 
 SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
 {
-    if( rInfo.GetFtnTxtColl() )
-        rInfo.GetFtnTxtColl()->Add(this);
+    if( rInfo.GetFootnoteTextColl() )
+        rInfo.GetFootnoteTextColl()->Add(this);
     else if ( GetRegisteredIn())
         GetRegisteredInNonConst()->Remove(this);
 
@@ -49,20 +49,20 @@ SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
     else if ( aPageDescDep.GetRegisteredIn() )
         const_cast<SwModify*>(aPageDescDep.GetRegisteredIn())->Remove( &aPageDescDep );
 
-    if ( rInfo.aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aCharFmtDep.GetRegisteredIn())->Add( &aCharFmtDep );
-    else if ( aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(aCharFmtDep.GetRegisteredIn())->Remove( &aCharFmtDep );
+    if ( rInfo.aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aCharFormatDep.GetRegisteredIn())->Add( &aCharFormatDep );
+    else if ( aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(aCharFormatDep.GetRegisteredIn())->Remove( &aCharFormatDep );
 
-    if ( rInfo.aAnchorCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aAnchorCharFmtDep.GetRegisteredIn())->Add(
-                                                    &aAnchorCharFmtDep );
-    else if( aAnchorCharFmtDep.GetRegisteredIn() )
-        static_cast<SwModify*>(aAnchorCharFmtDep.GetRegisteredIn())->Remove(
-                                                    &aAnchorCharFmtDep );
+    if ( rInfo.aAnchorCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aAnchorCharFormatDep.GetRegisteredIn())->Add(
+                                                    &aAnchorCharFormatDep );
+    else if( aAnchorCharFormatDep.GetRegisteredIn() )
+        static_cast<SwModify*>(aAnchorCharFormatDep.GetRegisteredIn())->Remove(
+                                                    &aAnchorCharFormatDep );
 
-    aFmt = rInfo.aFmt;
-    nFtnOffset = rInfo.nFtnOffset;
+    aFormat = rInfo.aFormat;
+    nFootnoteOffset = rInfo.nFootnoteOffset;
     m_bEndNote = rInfo.m_bEndNote;
     sPrefix = rInfo.sPrefix;
     sSuffix = rInfo.sSuffix;
@@ -73,49 +73,49 @@ bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
 {
     return  aPageDescDep.GetRegisteredIn() ==
                                 rInfo.aPageDescDep.GetRegisteredIn() &&
-            aCharFmtDep.GetRegisteredIn() ==
-                                rInfo.aCharFmtDep.GetRegisteredIn() &&
-            aAnchorCharFmtDep.GetRegisteredIn() ==
-                                rInfo.aAnchorCharFmtDep.GetRegisteredIn() &&
-            GetFtnTxtColl() == rInfo.GetFtnTxtColl() &&
-            aFmt.GetNumberingType() == rInfo.aFmt.GetNumberingType() &&
-            nFtnOffset == rInfo.nFtnOffset &&
+            aCharFormatDep.GetRegisteredIn() ==
+                                rInfo.aCharFormatDep.GetRegisteredIn() &&
+            aAnchorCharFormatDep.GetRegisteredIn() ==
+                                rInfo.aAnchorCharFormatDep.GetRegisteredIn() &&
+            GetFootnoteTextColl() == rInfo.GetFootnoteTextColl() &&
+            aFormat.GetNumberingType() == rInfo.aFormat.GetNumberingType() &&
+            nFootnoteOffset == rInfo.nFootnoteOffset &&
             m_bEndNote == rInfo.m_bEndNote &&
             sPrefix == rInfo.sPrefix &&
             sSuffix == rInfo.sSuffix;
 }
 
 SwEndNoteInfo::SwEndNoteInfo(const SwEndNoteInfo& rInfo) :
-    SwClient( rInfo.GetFtnTxtColl() ),
+    SwClient( rInfo.GetFootnoteTextColl() ),
     aPageDescDep( this, 0 ),
-    aCharFmtDep( this, 0 ),
-    aAnchorCharFmtDep( this, 0 ),
+    aCharFormatDep( this, 0 ),
+    aAnchorCharFormatDep( this, 0 ),
     sPrefix( rInfo.sPrefix ),
     sSuffix( rInfo.sSuffix ),
     m_bEndNote( true ),
-    aFmt( rInfo.aFmt ),
-    nFtnOffset( rInfo.nFtnOffset )
+    aFormat( rInfo.aFormat ),
+    nFootnoteOffset( rInfo.nFootnoteOffset )
 {
     if( rInfo.aPageDescDep.GetRegisteredIn() )
         const_cast<SwModify*>(rInfo.aPageDescDep.GetRegisteredIn())->Add( &aPageDescDep );
 
-    if( rInfo.aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aCharFmtDep.GetRegisteredIn())->Add( &aCharFmtDep );
+    if( rInfo.aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aCharFormatDep.GetRegisteredIn())->Add( &aCharFormatDep );
 
-    if( rInfo.aAnchorCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aAnchorCharFmtDep.GetRegisteredIn())->Add(
-                &aAnchorCharFmtDep );
+    if( rInfo.aAnchorCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aAnchorCharFormatDep.GetRegisteredIn())->Add(
+                &aAnchorCharFormatDep );
 }
 
-SwEndNoteInfo::SwEndNoteInfo(SwTxtFmtColl *pFmt) :
-    SwClient(pFmt),
+SwEndNoteInfo::SwEndNoteInfo(SwTextFormatColl *pFormat) :
+    SwClient(pFormat),
     aPageDescDep( this, 0 ),
-    aCharFmtDep( this, 0 ),
-    aAnchorCharFmtDep( this, 0 ),
+    aCharFormatDep( this, 0 ),
+    aAnchorCharFormatDep( this, 0 ),
     m_bEndNote( true ),
-    nFtnOffset( 0 )
+    nFootnoteOffset( 0 )
 {
-    aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);
+    aFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER);
 }
 
 SwPageDesc *SwEndNoteInfo::GetPageDesc( SwDoc &rDoc ) const
@@ -145,43 +145,43 @@ void SwEndNoteInfo::ChgPageDesc( SwPageDesc *pDesc )
     pDesc->Add( &static_cast<SwClient&>(aPageDescDep) );
 }
 
-void SwEndNoteInfo::SetFtnTxtColl(SwTxtFmtColl& rFmt)
+void SwEndNoteInfo::SetFootnoteTextColl(SwTextFormatColl& rFormat)
 {
-    rFmt.Add(this);
+    rFormat.Add(this);
 }
 
-SwCharFmt* SwEndNoteInfo::GetCharFmt(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc &rDoc) const
 {
-    if ( !aCharFmtDep.GetRegisteredIn() )
+    if ( !aCharFormatDep.GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( static_cast<sal_uInt16>(
+        SwCharFormat* pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
             m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
-        pFmt->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aCharFmtDep)) );
+        pFormat->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aCharFormatDep)) );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(aCharFmtDep.GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(aCharFormatDep.GetRegisteredIn()));
 }
 
-void SwEndNoteInfo::SetCharFmt( SwCharFmt* pChFmt )
+void SwEndNoteInfo::SetCharFormat( SwCharFormat* pChFormat )
 {
-    OSL_ENSURE(pChFmt, "no CharFmt?");
-    pChFmt->Add( &static_cast<SwClient&>(aCharFmtDep) );
+    OSL_ENSURE(pChFormat, "no CharFormat?");
+    pChFormat->Add( &static_cast<SwClient&>(aCharFormatDep) );
 }
 
-SwCharFmt* SwEndNoteInfo::GetAnchorCharFmt(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetAnchorCharFormat(SwDoc &rDoc) const
 {
-    if( !aAnchorCharFmtDep.GetRegisteredIn() )
+    if( !aAnchorCharFormatDep.GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( static_cast<sal_uInt16>(
+        SwCharFormat* pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
             m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : RES_POOLCHR_FOOTNOTE_ANCHOR ) );
-        pFmt->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aAnchorCharFmtDep)) );
+        pFormat->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aAnchorCharFormatDep)) );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(aAnchorCharFmtDep.GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(aAnchorCharFormatDep.GetRegisteredIn()));
 }
 
-void SwEndNoteInfo::SetAnchorCharFmt( SwCharFmt* pChFmt )
+void SwEndNoteInfo::SetAnchorCharFormat( SwCharFormat* pChFormat )
 {
-    OSL_ENSURE(pChFmt, "no CharFmt?");
-    pChFmt->Add( &static_cast<SwClient&>(aAnchorCharFmtDep) );
+    OSL_ENSURE(pChFormat, "no CharFormat?");
+    pChFormat->Add( &static_cast<SwClient&>(aAnchorCharFormatDep) );
 }
 
 void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
@@ -192,18 +192,18 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         RES_FMT_CHG == nWhich )
     {
         SwDoc* pDoc;
-        if( aCharFmtDep.GetRegisteredIn() )
-            pDoc = static_cast<SwFmt*>(aCharFmtDep.GetRegisteredIn())->GetDoc();
+        if( aCharFormatDep.GetRegisteredIn() )
+            pDoc = static_cast<SwFormat*>(aCharFormatDep.GetRegisteredIn())->GetDoc();
         else
-            pDoc = static_cast<SwFmt*>(aAnchorCharFmtDep.GetRegisteredIn())->GetDoc();
-        SwFtnIdxs& rFtnIdxs = pDoc->GetFtnIdxs();
-        for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+            pDoc = static_cast<SwFormat*>(aAnchorCharFormatDep.GetRegisteredIn())->GetDoc();
+        SwFootnoteIdxs& rFootnoteIdxs = pDoc->GetFootnoteIdxs();
+        for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
         {
-            SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if ( rFtn.IsEndNote() == m_bEndNote )
+            SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if ( rFootnote.IsEndNote() == m_bEndNote )
             {
-                pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
             }
         }
     }
@@ -211,7 +211,7 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         CheckRegistration( pOld, pNew );
 }
 
-SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
+SwFootnoteInfo& SwFootnoteInfo::operator=(const SwFootnoteInfo& rInfo)
 {
     SwEndNoteInfo::operator=(rInfo);
     aQuoVadis =  rInfo.aQuoVadis;
@@ -221,7 +221,7 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
     return *this;
 }
 
-bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
+bool SwFootnoteInfo::operator==( const SwFootnoteInfo& rInfo ) const
 {
     return  ePos == rInfo.ePos &&
             eNum == rInfo.eNum &&
@@ -230,7 +230,7 @@ bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
             aErgoSum == rInfo.aErgoSum;
 }
 
-SwFtnInfo::SwFtnInfo(const SwFtnInfo& rInfo) :
+SwFootnoteInfo::SwFootnoteInfo(const SwFootnoteInfo& rInfo) :
     SwEndNoteInfo( rInfo ),
     aQuoVadis( rInfo.aQuoVadis ),
     aErgoSum( rInfo.aErgoSum ),
@@ -240,79 +240,79 @@ SwFtnInfo::SwFtnInfo(const SwFtnInfo& rInfo) :
     m_bEndNote = false;
 }
 
-SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) :
-    SwEndNoteInfo( pFmt ),
+SwFootnoteInfo::SwFootnoteInfo(SwTextFormatColl *pFormat) :
+    SwEndNoteInfo( pFormat ),
     ePos( FTNPOS_PAGE ),
     eNum( FTNNUM_DOC )
 {
-    aFmt.SetNumberingType(SVX_NUM_ARABIC);
+    aFormat.SetNumberingType(SVX_NUM_ARABIC);
     m_bEndNote = false;
 }
 
-void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
+void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
 {
     SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout();
-    if( !(GetFtnInfo() == rInfo) )
+    if( !(GetFootnoteInfo() == rInfo) )
     {
-        const SwFtnInfo &rOld = GetFtnInfo();
+        const SwFootnoteInfo &rOld = GetFootnoteInfo();
 
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             GetIDocumentUndoRedo().AppendUndo( new SwUndoFootNoteInfo(rOld) );
         }
 
-        bool bFtnPos  = rInfo.ePos != rOld.ePos;
-        bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
+        bool bFootnotePos  = rInfo.ePos != rOld.ePos;
+        bool bFootnoteDesc = rOld.ePos == FTNPOS_CHAPTER &&
                             rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
         bool bExtra   = rInfo.aQuoVadis != rOld.aQuoVadis ||
                             rInfo.aErgoSum != rOld.aErgoSum ||
-                            rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
+                            rInfo.aFormat.GetNumberingType() != rOld.aFormat.GetNumberingType() ||
                             rInfo.GetPrefix() != rOld.GetPrefix() ||
                             rInfo.GetSuffix() != rOld.GetSuffix();
-        SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
-                  *pNewChrFmt = rInfo.GetCharFmt( *this );
-        bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+        SwCharFormat *pOldChrFormat = rOld.GetCharFormat( *this ),
+                  *pNewChrFormat = rInfo.GetCharFormat( *this );
+        bool bFootnoteChrFormats = pOldChrFormat != pNewChrFormat;
 
-        *mpFtnInfo = rInfo;
+        *mpFootnoteInfo = rInfo;
 
         if (pTmpRoot)
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            if ( bFtnPos )
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFtns));
+            if ( bFootnotePos )
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFootnotes));
             else
             {
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
-                if ( bFtnDesc )
-                    std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false));
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
+                if ( bFootnoteDesc )
+                    std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), false));
                 if ( bExtra )
                 {
                     // For messages regarding ErgoSum etc. we save the extra code and use the
                     // available methods.
-                    SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-                    for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+                    SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+                    for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
                     {
-                        SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-                        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                        if ( !rFtn.IsEndNote() )
-                            pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                        SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+                        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                        if ( !rFootnote.IsEndNote() )
+                            pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
                     }
                 }
             }
         }
         if( FTNNUM_PAGE != rInfo.eNum )
-            GetFtnIdxs().UpdateAllFtn();
-        else if( bFtnChrFmts )
+            GetFootnoteIdxs().UpdateAllFootnote();
+        else if( bFootnoteChrFormats )
         {
-            SwFmtChg aOld( pOldChrFmt );
-            SwFmtChg aNew( pNewChrFmt );
-            mpFtnInfo->ModifyNotification( &aOld, &aNew );
+            SwFormatChg aOld( pOldChrFormat );
+            SwFormatChg aNew( pNewChrFormat );
+            mpFootnoteInfo->ModifyNotification( &aOld, &aNew );
         }
 
         // #i81002# no update during loading
         if ( !IsInReading() )
         {
-            getIDocumentFieldsAccess().UpdateRefFlds(NULL);
+            getIDocumentFieldsAccess().UpdateRefFields(NULL);
         }
         getIDocumentState().SetModified();
     }
@@ -329,67 +329,67 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        bool bNumChg  = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
-        // this seems to be an optimization: UpdateAllFtn() is only called
+        bool bNumChg  = rInfo.nFootnoteOffset != GetEndNoteInfo().nFootnoteOffset;
+        // this seems to be an optimization: UpdateAllFootnote() is only called
         // if the offset changes; if the offset is the same,
         // but type/prefix/suffix changes, just set new numbers.
         bool const bExtra = !bNumChg &&
-                (   (rInfo.aFmt.GetNumberingType() !=
-                        GetEndNoteInfo().aFmt.GetNumberingType())
+                (   (rInfo.aFormat.GetNumberingType() !=
+                        GetEndNoteInfo().aFormat.GetNumberingType())
                 ||  (rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix())
                 ||  (rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix())
                 );
-        bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
+        bool bFootnoteDesc = rInfo.GetPageDesc( *this ) !=
                             GetEndNoteInfo().GetPageDesc( *this );
-        SwCharFmt *pOldChrFmt = GetEndNoteInfo().GetCharFmt( *this ),
-                  *pNewChrFmt = rInfo.GetCharFmt( *this );
-        bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+        SwCharFormat *pOldChrFormat = GetEndNoteInfo().GetCharFormat( *this ),
+                  *pNewChrFormat = rInfo.GetCharFormat( *this );
+        bool bFootnoteChrFormats = pOldChrFormat != pNewChrFormat;
 
         *mpEndNoteInfo = rInfo;
 
         if ( pTmpRoot )
         {
-            if ( bFtnDesc )
+            if ( bFootnoteDesc )
             {
                 std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true));
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), true));
             }
             if ( bExtra )
             {
                 // For messages regarding ErgoSum etc. we save the extra code and use the
                 // available methods.
-                SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-                for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+                SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+                for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
                 {
-                    SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-                    const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                    if ( rFtn.IsEndNote() )
-                        pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                    SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+                    const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                    if ( rFootnote.IsEndNote() )
+                        pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
                 }
             }
         }
         if( bNumChg )
-            GetFtnIdxs().UpdateAllFtn();
-        else if( bFtnChrFmts )
+            GetFootnoteIdxs().UpdateAllFootnote();
+        else if( bFootnoteChrFormats )
         {
-            SwFmtChg aOld( pOldChrFmt );
-            SwFmtChg aNew( pNewChrFmt );
+            SwFormatChg aOld( pOldChrFormat );
+            SwFormatChg aNew( pNewChrFormat );
             mpEndNoteInfo->ModifyNotification( &aOld, &aNew );
         }
 
         // #i81002# no update during loading
         if ( !IsInReading() )
         {
-            getIDocumentFieldsAccess().UpdateRefFlds(NULL);
+            getIDocumentFieldsAccess().UpdateRefFields(NULL);
         }
         getIDocumentState().SetModified();
     }
 }
 
-bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
+bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
                        sal_uInt16 nNumber, bool bIsEndNote )
 {
-    SwFtnIdxs& rFtnArr = GetFtnIdxs();
+    SwFootnoteIdxs& rFootnoteArr = GetFootnoteIdxs();
     SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout();
 
     const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
@@ -399,7 +399,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
     const sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
     size_t nPos = 0;
-    rFtnArr.SeekEntry( pStt->nNode, &nPos );
+    rFootnoteArr.SeekEntry( pStt->nNode, &nPos );
 
     SwUndoChangeFootNote* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
@@ -408,64 +408,64 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
         pUndo = new SwUndoChangeFootNote( rPam, rNumStr, nNumber, bIsEndNote );
     }
 
-    SwTxtFtn* pTxtFtn;
+    SwTextFootnote* pTextFootnote;
     sal_uLong nIdx;
     bool bChg = false;
     bool bTypeChgd = false;
     const size_t nPosSave = nPos;
-    while( nPos < rFtnArr.size() &&
-            (( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] )))
+    while( nPos < rFootnoteArr.size() &&
+            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
                 < nEndNd || ( nIdx == nEndNd &&
-                nEndCnt >= pTxtFtn->GetStart() )) )
+                nEndCnt >= pTextFootnote->GetStart() )) )
         if( nIdx > nSttNd || ( nIdx == nSttNd &&
-                nSttCnt <= pTxtFtn->GetStart() ) )
+                nSttCnt <= pTextFootnote->GetStart() ) )
         {
-            const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr() != rNumStr ||
-                rFtn.IsEndNote() != bIsEndNote )
+            const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr() != rNumStr ||
+                rFootnote.IsEndNote() != bIsEndNote )
             {
                 bChg = true;
                 if ( pUndo )
                 {
-                    pUndo->GetHistory().Add( *pTxtFtn );
+                    pUndo->GetHistory().Add( *pTextFootnote );
                 }
 
-                pTxtFtn->SetNumber( nNumber, rNumStr );
-                if( rFtn.IsEndNote() != bIsEndNote )
+                pTextFootnote->SetNumber( nNumber, rNumStr );
+                if( rFootnote.IsEndNote() != bIsEndNote )
                 {
-                    const_cast<SwFmtFtn&>(rFtn).SetEndNote( bIsEndNote );
+                    const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote );
                     bTypeChgd = true;
-                    pTxtFtn->CheckCondColl();
+                    pTextFootnote->CheckCondColl();
                     //#i11339# dispose UNO wrapper when a footnote is changed to an endnote or vice versa
-                    const_cast<SwFmtFtn&>(rFtn).InvalidateFootnote();
+                    const_cast<SwFormatFootnote&>(rFootnote).InvalidateFootnote();
                 }
             }
         }
 
     nPos = nPosSave;       // There are more in the front!
     while( nPos &&
-            (( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ --nPos ] )))
+            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
                 > nSttNd || ( nIdx == nSttNd &&
-                nSttCnt <= pTxtFtn->GetStart() )) )
+                nSttCnt <= pTextFootnote->GetStart() )) )
         if( nIdx < nEndNd || ( nIdx == nEndNd &&
-            nEndCnt >= pTxtFtn->GetStart() ) )
+            nEndCnt >= pTextFootnote->GetStart() ) )
         {
-            const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr() != rNumStr ||
-                rFtn.IsEndNote() != bIsEndNote )
+            const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr() != rNumStr ||
+                rFootnote.IsEndNote() != bIsEndNote )
             {
                 bChg = true;
                 if ( pUndo )
                 {
-                    pUndo->GetHistory().Add( *pTxtFtn );
+                    pUndo->GetHistory().Add( *pTextFootnote );
                 }
 
-                pTxtFtn->SetNumber( nNumber, rNumStr );
-                if( rFtn.IsEndNote() != bIsEndNote )
+                pTextFootnote->SetNumber( nNumber, rNumStr );
+                if( rFootnote.IsEndNote() != bIsEndNote )
                 {
-                    const_cast<SwFmtFtn&>(rFtn).SetEndNote( bIsEndNote );
+                    const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote );
                     bTypeChgd = true;
-                    pTxtFtn->CheckCondColl();
+                    pTextFootnote->CheckCondColl();
                 }
             }
         }
@@ -479,16 +479,16 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
         }
 
         if ( bTypeChgd )
-            rFtnArr.UpdateAllFtn();
-        if( FTNNUM_PAGE != GetFtnInfo().eNum )
+            rFootnoteArr.UpdateAllFootnote();
+        if( FTNNUM_PAGE != GetFootnoteInfo().eNum )
         {
             if ( !bTypeChgd )
-                rFtnArr.UpdateAllFtn();
+                rFootnoteArr.UpdateAllFootnote();
         }
         else if( pTmpRoot )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
         }
         getIDocumentState().SetModified();
     }
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 0380e92b51f4..d2f129b334d9 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -61,7 +61,7 @@ enum SwSplitDocType
 };
 
 bool SwDoc::GenerateGlobalDoc( const OUString& rPath,
-                                   const SwTxtFmtColl* pSplitColl )
+                                   const SwTextFormatColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl, 0 );
 }
@@ -77,7 +77,7 @@ bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel )
 }
 
 bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
-                                 const SwTxtFmtColl* pSplitColl )
+                                 const SwTextFormatColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl, 0 );
 }
@@ -88,7 +88,7 @@ SwNodePtr GetStartNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16*
     SwNodePtr pNd;
 
     for( ; *nOutl < pOutlNds->size(); ++(*nOutl) )
-        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTxtNode()->GetAttrOutlineLevel() == nOutlineLevel && !pNd->FindTableNode() )
+        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTextNode()->GetAttrOutlineLevel() == nOutlineLevel && !pNd->FindTableNode() )
         {
             return pNd;
         }
@@ -104,7 +104,7 @@ SwNodePtr GetEndNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16* n
     {
         pNd = (*pOutlNds)[ *nOutl ];
 
-        const int nLevel = pNd->GetTxtNode()->GetAttrOutlineLevel();
+        const int nLevel = pNd->GetTextNode()->GetAttrOutlineLevel();
 
         if( ( 0 < nLevel && nLevel <= nOutlineLevel ) &&
             !pNd->FindTableNode() )
@@ -116,12 +116,12 @@ SwNodePtr GetEndNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16* n
 }
 
 // two helpers for collection mode
-SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplitColl, sal_uInt16* nOutl )
+SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, sal_uInt16* nOutl )
 {
     SwNodePtr pNd;
     for( ; *nOutl < pOutlNds->size(); ++(*nOutl) )
-        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTxtNode()->
-                    GetTxtColl() == pSplitColl &&
+        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTextNode()->
+                    GetTextColl() == pSplitColl &&
             !pNd->FindTableNode() )
         {
             return pNd;
@@ -129,14 +129,14 @@ SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSpl
     return 0;
 }
 
-SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplitColl, sal_uInt16* nOutl )
+SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, sal_uInt16* nOutl )
 {
     SwNodePtr pNd;
 
     for( ++(*nOutl); *nOutl < pOutlNds->size(); ++(*nOutl) )
     {
         pNd = (*pOutlNds)[ *nOutl ];
-        SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl();
+        SwTextFormatColl* pTColl = pNd->GetTextNode()->GetTextColl();
 
         if( ( pTColl == pSplitColl ||
               (   pSplitColl->GetAttrOutlineLevel() > 0 &&
@@ -151,7 +151,7 @@ SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplit
     return 0;
 }
 
-bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTxtFmtColl* pSplitColl, int nOutlineLevel )
+bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTextFormatColl* pSplitColl, int nOutlineLevel )
 {
     // Iterate over all the template's Nodes, creating an own
     // document for every single one and replace linked sections (GlobalDoc) for links (HTML).
@@ -173,8 +173,8 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
             {
                 xTmpOutlNds.reset(new SwOutlineNodes);
                 pOutlNds = xTmpOutlNds.get();
-                SwIterator<SwTxtNode,SwFmtColl> aIter( *pSplitColl );
-                for( SwTxtNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() )
+                SwIterator<SwTextNode,SwFormatColl> aIter( *pSplitColl );
+                for( SwTextNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() )
                     if( pTNd->GetNodes().IsDocNodes() )
                         pOutlNds->insert( pTNd );
 
@@ -185,11 +185,11 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
         else
         {
             // Look for the 1st level OutlineTemplate
-            const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
-            for( SwTxtFmtColls::size_type n = rFmtColls.size(); n; )
-                if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )
+            const SwTextFormatColls& rFormatColls =*GetTextFormatColls();
+            for( SwTextFormatColls::size_type n = rFormatColls.size(); n; )
+                if ( rFormatColls[ --n ]->GetAttrOutlineLevel() == 1 )
                 {
-                    pSplitColl = rFmtColls[ n ];
+                    pSplitColl = rFormatColls[ n ];
                     break;
                 }
 
@@ -290,7 +290,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                     OUString sTitle( xDocProps->getTitle() );
                     if (!sTitle.isEmpty())
                         sTitle += ": ";
-                    sTitle += pStartNd->GetTxtNode()->GetExpandTxt();
+                    sTitle += pStartNd->GetTextNode()->GetExpandText();
                     xDocProps->setTitle( sTitle );
 
                     // Replace template
@@ -325,7 +325,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                     // We need to have a Layout for the HTMLFilter, so that
                     // TextFrames/Controls/OLE objects can be exported correctly as graphics.
                     if( SPLITDOC_TO_HTML == eDocType &&
-                        !pDoc->GetSpzFrmFmts()->empty() )
+                        !pDoc->GetSpzFrameFormats()->empty() )
                     {
                             SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
                     }
@@ -372,19 +372,19 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                             CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), true);
 
                             // If FlyFrames are still around, delete these too
-                            for( SwFrmFmts::size_type n = 0; n < GetSpzFrmFmts()->size(); ++n )
+                            for( SwFrameFormats::size_type n = 0; n < GetSpzFrameFormats()->size(); ++n )
                             {
-                                SwFrmFmt* pFly = (*GetSpzFrmFmts())[n];
-                                const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
+                                SwFrameFormat* pFly = (*GetSpzFrameFormats())[n];
+                                const SwFormatAnchor* pAnchor = &pFly->GetAnchor();
                                 SwPosition const*const pAPos =
-                                    pAnchor->GetCntntAnchor();
+                                    pAnchor->GetContentAnchor();
                                 if (pAPos &&
                                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                                     aSIdx <= pAPos->nNode &&
                                     pAPos->nNode < aEIdx )
                                 {
-                                    getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                                    getIDocumentLayoutAccess().DelLayoutFormat( pFly );
                                     --n;
                                 }
                             }
@@ -393,9 +393,9 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         }
 
                         // set the link in the StartNode
-                        SwFmtINetFmt aINet( sFileName , OUString() );
-                        SwTxtNode* pTNd = pStartNd->GetTxtNode();
-                        pTNd->InsertItem(aINet, 0, pTNd->GetTxt().getLength());
+                        SwFormatINetFormat aINet( sFileName , OUString() );
+                        SwTextNode* pTNd = pStartNd->GetTextNode();
+                        pTNd->InsertItem(aINet, 0, pTNd->GetText().getLength());
 
                         // If the link cannot be found anymore,
                         // it has to be a bug!
@@ -410,7 +410,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         const OUString sNm( INetURLObject( sFileName ).GetName() );
                         SwSectionData aSectData( FILE_LINK_SECTION,
                                         GetUniqueSectionName( &sNm ));
-                        SwSectionFmt* pFmt = MakeSectionFmt( 0 );
+                        SwSectionFormat* pFormat = MakeSectionFormat( 0 );
                         aSectData.SetLinkFileName(sFileName);
                         aSectData.SetProtectFlag(true);
 
@@ -429,7 +429,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                                     pStartNd->GetIndex() )
                             {
                                 bool bMvIdx = aEndIdx == *pSectEnd;
-                                DelSectionFmt( pSectNd->GetSection().GetFmt() );
+                                DelSectionFormat( pSectNd->GetSection().GetFormat() );
                                 if( bMvIdx )
                                     --aEndIdx;
                             }
@@ -465,12 +465,12 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         if (aEndIdx >= aStartIdx)
                         {
                             pSectNd = GetNodes().InsertTextSection(aStartIdx,
-                                *pFmt, aSectData, 0, &aEndIdx, false);
+                                *pFormat, aSectData, 0, &aEndIdx, false);
                         }
                         else
                         {
                             pSectNd = GetNodes().InsertTextSection(aEndIdx,
-                                *pFmt, aSectData, 0, &aStartIdx, false);
+                                *pFormat, aSectData, 0, &aStartIdx, false);
                         }
                         // <- #i26762#
 
@@ -491,7 +491,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
         {
             // save all remaining sections
             while( !GetSections().empty() )
-                DelSectionFmt( GetSections().front() );
+                DelSectionFormat( GetSections().front() );
 
             SfxFilterContainer* pFCntnr = mpDocShell->GetFactory().GetFilterContainer();
             pFilter = pFCntnr->GetFilter4EA( pFilter->GetTypeName(), SfxFilterFlags::EXPORT );
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index a5299483e3f2..8cc57ff8ab34 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -133,8 +133,8 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
     const sal_uInt16 nIdx = rBlock.GetIndex( rEntry );
     if( USHRT_MAX != nIdx )
     {
-        bool bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
-        mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx );
+        bool bSav_IsInsGlossary = mbInsOnlyTextGlssry;
+        mbInsOnlyTextGlssry = rBlock.IsOnlyTextBlock( nIdx );
 
         if( rBlock.BeginGetDoc( nIdx ) )
         {
@@ -153,19 +153,19 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
             pGDoc->getIDocumentFieldsAccess().SetFixFields(false, NULL);
 
             // StartAllAction();
-            getIDocumentFieldsAccess().LockExpFlds();
+            getIDocumentFieldsAccess().LockExpFields();
 
             SwNodeIndex aStt( pGDoc->GetNodes().GetEndOfExtras(), 1 );
-            SwCntntNode* pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
-            const SwTableNode* pTblNd = pCntntNd->FindTableNode();
-            SwPaM aCpyPam( pTblNd ? *(SwNode*)pTblNd : *(SwNode*)pCntntNd );
+            SwContentNode* pContentNd = pGDoc->GetNodes().GoNext( &aStt );
+            const SwTableNode* pTableNd = pContentNd->FindTableNode();
+            SwPaM aCpyPam( pTableNd ? *(SwNode*)pTableNd : *(SwNode*)pContentNd );
             aCpyPam.SetMark();
 
             // till the nodes array's end
             aCpyPam.GetPoint()->nNode = pGDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-            pCntntNd = aCpyPam.GetCntntNode();
+            pContentNd = aCpyPam.GetContentNode();
             aCpyPam.GetPoint()->nContent.Assign(
-                    pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0 );
+                    pContentNd, (pContentNd) ? pContentNd->Len() : 0 );
 
             GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
             SwPaM *_pStartCrsr = &rPaM, *__pStartCrsr = _pStartCrsr;
@@ -191,17 +191,17 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
 
                 aACD.RestoreDontExpandItems( rInsPos );
                 if( pShell )
-                    pShell->SaveTblBoxCntnt( &rInsPos );
+                    pShell->SaveTableBoxContent( &rInsPos );
             } while( (_pStartCrsr = static_cast<SwPaM *>(_pStartCrsr->GetNext())) !=
                         __pStartCrsr );
             GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
-            getIDocumentFieldsAccess().UnlockExpFlds();
-            if( !getIDocumentFieldsAccess().IsExpFldsLocked() )
-                getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+            getIDocumentFieldsAccess().UnlockExpFields();
+            if( !getIDocumentFieldsAccess().IsExpFieldsLocked() )
+                getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
             bRet = true;
         }
-        mbInsOnlyTxtGlssry = bSav_IsInsGlossary;
+        mbInsOnlyTextGlssry = bSav_IsInsGlossary;
     }
     rBlock.EndGetDoc();
     return bRet;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 0d0ebe4ef1a1..4d8a04b22e99 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star;
 
 #define DEF_FLY_WIDTH    2268   // Default width for FlyFrms (2268 == 4cm)
 
-static bool lcl_IsItemSet(const SwCntntNode & rNode, sal_uInt16 which)
+static bool lcl_IsItemSet(const SwContentNode & rNode, sal_uInt16 which)
 {
     bool bResult = false;
 
@@ -161,14 +161,14 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc,
     return pObj;
 }
 
-SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
-                                    const SwCntntNode& rNode,
+SwFlyFrameFormat* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
+                                    const SwContentNode& rNode,
                                     RndStdIds eRequestId,
                                     const SfxItemSet* pFlySet,
-                                    SwFrmFmt* pFrmFmt )
+                                    SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME );
+    if( !pFrameFormat )
+        pFrameFormat = getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME );
 
     OUString sName;
     if( !mbInReading )
@@ -178,17 +178,17 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         case ND_OLENODE:        sName = GetUniqueOLEName();     break;
         default:                sName = GetUniqueFrameName();   break;
         }
-    SwFlyFrmFmt* pFmt = MakeFlyFrmFmt( sName, pFrmFmt );
+    SwFlyFrameFormat* pFormat = MakeFlyFrameFormat( sName, pFrameFormat );
 
     // Create content and connect to the format.
-    // Create CntntNode and put it into the autotext selection.
+    // Create ContentNode and put it into the autotext selection.
     SwNodeRange aRange( GetNodes().GetEndOfAutotext(), -1,
                         GetNodes().GetEndOfAutotext() );
     GetNodes().SectionDown( &aRange, SwFlyStartNode );
 
-    pFmt->SetFmtAttr( SwFmtCntnt( rNode.StartOfSectionNode() ));
+    pFormat->SetFormatAttr( SwFormatContent( rNode.StartOfSectionNode() ));
 
-    const SwFmtAnchor* pAnchor = 0;
+    const SwFormatAnchor* pAnchor = 0;
     if( pFlySet )
     {
         pFlySet->GetItemState( RES_ANCHOR, false,
@@ -197,10 +197,10 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         {
             SfxItemSet aTmpSet( *pFlySet );
             aTmpSet.ClearItem( RES_CNTNT );
-            pFmt->SetFmtAttr( aTmpSet );
+            pFormat->SetFormatAttr( aTmpSet );
         }
         else
-            pFmt->SetFmtAttr( *pFlySet );
+            pFormat->SetFormatAttr( *pFlySet );
     }
 
     // Anchor not yet set?
@@ -209,13 +209,13 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
     // content anchor set.
     if ( !pAnchor ||
          ( FLY_AT_PAGE != pAnchor->GetAnchorId() &&
-           !pAnchor->GetCntntAnchor() ) ||
+           !pAnchor->GetContentAnchor() ) ||
          ( FLY_AT_PAGE == pAnchor->GetAnchorId() &&
-           !pAnchor->GetCntntAnchor() &&
+           !pAnchor->GetContentAnchor() &&
            pAnchor->GetPageNum() == 0 ) )
     {
         // set it again, needed for Undo
-        SwFmtAnchor aAnch( pFmt->GetAnchor() );
+        SwFormatAnchor aAnch( pFormat->GetAnchor() );
         if (pAnchor && (FLY_AT_FLY == pAnchor->GetAnchorId()))
         {
             SwPosition aPos( *rAnchPos.nNode.GetNode().FindFlyStartNode() );
@@ -225,7 +225,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         else
         {
             if( eRequestId != aAnch.GetAnchorId() &&
-                SfxItemState::SET != pFmt->GetItemState( RES_ANCHOR, true ) )
+                SfxItemState::SET != pFormat->GetItemState( RES_ANCHOR, true ) )
             {
                 aAnch.SetType( eRequestId );
             }
@@ -239,141 +239,141 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
                 aAnch.SetAnchor( &rAnchPos );
             }
         }
-        pFmt->SetFmtAttr( aAnch );
+        pFormat->SetFormatAttr( aAnch );
     }
     else
-        eAnchorId = pFmt->GetAnchor().GetAnchorId();
+        eAnchorId = pFormat->GetAnchor().GetAnchorId();
 
     if ( FLY_AS_CHAR == eAnchorId )
     {
         const sal_Int32 nStt = rAnchPos.nContent.GetIndex();
-        SwTxtNode * pTxtNode = rAnchPos.nNode.GetNode().GetTxtNode();
+        SwTextNode * pTextNode = rAnchPos.nNode.GetNode().GetTextNode();
 
-        OSL_ENSURE(pTxtNode!= 0, "There should be a SwTxtNode!");
+        OSL_ENSURE(pTextNode!= 0, "There should be a SwTextNode!");
 
-        if (pTxtNode != NULL)
+        if (pTextNode != NULL)
         {
-            SwFmtFlyCnt aFmt( pFmt );
+            SwFormatFlyCnt aFormat( pFormat );
             // may fail if there's no space left or header/ftr
-            if (!pTxtNode->InsertItem(aFmt, nStt, nStt))
-            {   // pFmt is dead now
+            if (!pTextNode->InsertItem(aFormat, nStt, nStt))
+            {   // pFormat is dead now
                 return 0;
             }
         }
     }
 
-    if( SfxItemState::SET != pFmt->GetAttrSet().GetItemState( RES_FRM_SIZE ))
+    if( SfxItemState::SET != pFormat->GetAttrSet().GetItemState( RES_FRM_SIZE ))
     {
-        SwFmtFrmSize aFmtSize( ATT_VAR_SIZE, 0, DEF_FLY_WIDTH );
-        const SwNoTxtNode* pNoTxtNode = rNode.GetNoTxtNode();
-        if( pNoTxtNode )
+        SwFormatFrmSize aFormatSize( ATT_VAR_SIZE, 0, DEF_FLY_WIDTH );
+        const SwNoTextNode* pNoTextNode = rNode.GetNoTextNode();
+        if( pNoTextNode )
         {
             // Set size
-             Size aSize( pNoTxtNode->GetTwipSize() );
+             Size aSize( pNoTextNode->GetTwipSize() );
             if( MINFLY > aSize.Width() )
                 aSize.Width() = DEF_FLY_WIDTH;
-            aFmtSize.SetWidth( aSize.Width() );
+            aFormatSize.SetWidth( aSize.Width() );
             if( aSize.Height() )
             {
-                aFmtSize.SetHeight( aSize.Height() );
-                aFmtSize.SetHeightSizeType( ATT_FIX_SIZE );
+                aFormatSize.SetHeight( aSize.Height() );
+                aFormatSize.SetHeightSizeType( ATT_FIX_SIZE );
             }
         }
-        pFmt->SetFmtAttr( aFmtSize );
+        pFormat->SetFormatAttr( aFormatSize );
     }
 
     // Set up frames
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
-        pFmt->MakeFrms();           // ???
+        pFormat->MakeFrms();           // ???
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         sal_uLong nNodeIdx = rAnchPos.nNode.GetIndex();
         const sal_Int32 nCntIdx = rAnchPos.nContent.GetIndex();
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoInsLayFmt( pFmt, nNodeIdx, nCntIdx ));
+            new SwUndoInsLayFormat( pFormat, nNodeIdx, nCntIdx ));
     }
 
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
+SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType,
                                     const SwPosition* pAnchorPos,
                                     const SfxItemSet* pFlySet,
-                                    SwFrmFmt* pFrmFmt, bool bCalledFromShell )
+                                    SwFrameFormat* pFrameFormat, bool bCalledFromShell )
 {
-    SwFlyFrmFmt* pFmt = 0;
+    SwFlyFrameFormat* pFormat = 0;
     if ( !pAnchorPos && (FLY_AT_PAGE != eAnchorType) )
     {
-        const SwFmtAnchor* pAnch;
+        const SwFormatAnchor* pAnch;
         if( (pFlySet && SfxItemState::SET == pFlySet->GetItemState(
                 RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) ||
-            ( pFrmFmt && SfxItemState::SET == pFrmFmt->GetItemState(
+            ( pFrameFormat && SfxItemState::SET == pFrameFormat->GetItemState(
                 RES_ANCHOR, true, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) )
         {
             if ( (FLY_AT_PAGE != pAnch->GetAnchorId()) )
             {
-                pAnchorPos = pAnch->GetCntntAnchor();
+                pAnchorPos = pAnch->GetContentAnchor();
             }
         }
     }
 
     if (pAnchorPos)
     {
-        if( !pFrmFmt )
-            pFrmFmt = getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME );
+        if( !pFrameFormat )
+            pFrameFormat = getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME );
 
         sal_uInt16 nCollId = static_cast<sal_uInt16>(
             GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ? RES_POOLCOLL_TEXT : RES_POOLCOLL_FRAME );
 
         /* If there is no adjust item in the paragraph style for the content node of the new fly section
            propagate an existing adjust item at the anchor to the new content node. */
-        SwCntntNode * pNewTxtNd = GetNodes().MakeTxtNode
+        SwContentNode * pNewTextNd = GetNodes().MakeTextNode
             (SwNodeIndex( GetNodes().GetEndOfAutotext()),
-             getIDocumentStylePoolAccess().GetTxtCollFromPool( nCollId ));
-        SwCntntNode * pAnchorNode = pAnchorPos->nNode.GetNode().GetCntntNode();
+             getIDocumentStylePoolAccess().GetTextCollFromPool( nCollId ));
+        SwContentNode * pAnchorNode = pAnchorPos->nNode.GetNode().GetContentNode();
         assert(pAnchorNode); // pAnchorNode from cursor, must be valid
 
         const SfxPoolItem * pItem = NULL;
 
-        if (bCalledFromShell && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) &&
+        if (bCalledFromShell && !lcl_IsItemSet(*pNewTextNd, RES_PARATR_ADJUST) &&
             SfxItemState::SET == pAnchorNode->GetSwAttrSet().
             GetItemState(RES_PARATR_ADJUST, true, &pItem))
         {
-            static_cast<SwCntntNode *>(pNewTxtNd)->SetAttr(*pItem);
+            static_cast<SwContentNode *>(pNewTextNd)->SetAttr(*pItem);
         }
 
-         pFmt = _MakeFlySection( *pAnchorPos, *pNewTxtNd,
-                                eAnchorType, pFlySet, pFrmFmt );
+         pFormat = _MakeFlySection( *pAnchorPos, *pNewTextNd,
+                                eAnchorType, pFlySet, pFrameFormat );
     }
-    return pFmt;
+    return pFormat;
 }
 
-SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
+SwFlyFrameFormat* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                                     const SwSelBoxes* pSelBoxes,
-                                    SwFrmFmt *pParent )
+                                    SwFrameFormat *pParent )
 {
-    const SwFmtAnchor& rAnch = static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR ));
+    const SwFormatAnchor& rAnch = static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR ));
 
     GetIDocumentUndoRedo().StartUndo( UNDO_INSLAYFMT, NULL );
 
-    SwFlyFrmFmt* pFmt = MakeFlySection( rAnch.GetAnchorId(), rPam.GetPoint(),
+    SwFlyFrameFormat* pFormat = MakeFlySection( rAnch.GetAnchorId(), rPam.GetPoint(),
                                         &rSet, pParent );
 
     // If content is selected, it becomes the new frame's content.
     // Namely, it is moved into the NodeArray's appropriate section.
 
-    if( pFmt )
+    if( pFormat )
     {
         do {        // middle check loop
-            const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
-            OSL_ENSURE( rCntnt.GetCntntIdx(), "No content prepared." );
-            SwNodeIndex aIndex( *(rCntnt.GetCntntIdx()), 1 );
-            SwCntntNode *pNode = aIndex.GetNode().GetCntntNode();
+            const SwFormatContent &rContent = pFormat->GetContent();
+            OSL_ENSURE( rContent.GetContentIdx(), "No content prepared." );
+            SwNodeIndex aIndex( *(rContent.GetContentIdx()), 1 );
+            SwContentNode *pNode = aIndex.GetNode().GetContentNode();
 
             // Attention: Do not create an index on the stack, or we
-            // cannot delete CntntNode in the end!
+            // cannot delete ContentNode in the end!
             SwPosition aPos( aIndex );
             aPos.nContent.Assign( pNode, 0 );
 
@@ -384,39 +384,39 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                 // original one and move (copy and delete) the selected boxes.
                 // The size is corrected on a percentage basis.
 
-                SwTableNode* pTblNd = const_cast<SwTableNode*>((*pSelBoxes)[0]->
+                SwTableNode* pTableNd = const_cast<SwTableNode*>((*pSelBoxes)[0]->
                                                 GetSttNd()->FindTableNode());
-                if( !pTblNd )
+                if( !pTableNd )
                     break;
 
-                SwTable& rTbl = pTblNd->GetTable();
+                SwTable& rTable = pTableNd->GetTable();
 
                 // Did we select the whole table?
-                if( pSelBoxes->size() == rTbl.GetTabSortBoxes().size() )
+                if( pSelBoxes->size() == rTable.GetTabSortBoxes().size() )
                 {
                     // move the whole table
-                    SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode(), 1 );
+                    SwNodeRange aRg( *pTableNd, 0, *pTableNd->EndOfSectionNode(), 1 );
 
                     // If we move the whole table and it is located within a
                     // FlyFrame, the we create a TextNode after it.
                     // So that this FlyFrame is preserved.
                     if( aRg.aEnd.GetNode().IsEndNode() )
-                        GetNodes().MakeTxtNode( aRg.aStart,
-                                    GetDfltTxtFmtColl() );
+                        GetNodes().MakeTextNode( aRg.aStart,
+                                    GetDfltTextFormatColl() );
 
                     getIDocumentContentOperations().MoveNodeRange( aRg, aPos.nNode, SwMoveFlags::DEFAULT );
                 }
                 else
                 {
-                    rTbl.MakeCopy( this, aPos, *pSelBoxes );
+                    rTable.MakeCopy( this, aPos, *pSelBoxes );
                     // Don't delete a part of a table with row span!!
                     // You could delete the content instead -> ToDo
-                    //rTbl.DeleteSel( this, *pSelBoxes, 0, 0, true, true );
+                    //rTable.DeleteSel( this, *pSelBoxes, 0, 0, true, true );
                 }
 
                 // If the table is within the frame, then copy without the following TextNode
-                aIndex = rCntnt.GetCntntIdx()->GetNode().EndOfSectionIndex() - 1;
-                OSL_ENSURE( aIndex.GetNode().GetTxtNode(),
+                aIndex = rContent.GetContentIdx()->GetNode().EndOfSectionIndex() - 1;
+                OSL_ENSURE( aIndex.GetNode().GetTextNode(),
                         "a TextNode should be here" );
                 aPos.nContent.Assign( 0, 0 );       // Deregister index!
                 GetNodes().Delete( aIndex, 1 );
@@ -465,7 +465,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
 
     GetIDocumentUndoRedo().EndUndo( UNDO_INSLAYFMT, NULL );
 
-    return pFmt;
+    return pFormat;
 }
 
 
@@ -509,20 +509,20 @@ static bool lcl_TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
     return bOk;
 }
 
-SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso,
+SwPosFlyFrms SwDoc::GetAllFlyFormats( const SwPaM* pCmpRange, bool bDrawAlso,
                            bool bAsCharAlso ) const
 {
     SwPosFlyFrms aRetval;
 
     // collect all anchored somehow to paragraphs
-    for( auto pFly : *GetSpzFrmFmts() )
+    for( auto pFly : *GetSpzFrameFormats() )
     {
-        bool bDrawFmt = bDrawAlso && RES_DRAWFRMFMT == pFly->Which();
-        bool bFlyFmt = RES_FLYFRMFMT == pFly->Which();
-        if( bFlyFmt || bDrawFmt )
+        bool bDrawFormat = bDrawAlso && RES_DRAWFRMFMT == pFly->Which();
+        bool bFlyFormat = RES_FLYFRMFMT == pFly->Which();
+        if( bFlyFormat || bDrawFormat )
         {
-            const SwFmtAnchor& rAnchor = pFly->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFly->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if (pAPos &&
                 ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
                  (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
@@ -553,35 +553,35 @@ SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso,
             for( size_t i = 0; i < rObjs.size(); ++i)
             {
                 SwAnchoredObject* pAnchoredObj = rObjs[i];
-                SwFrmFmt *pFly;
+                SwFrameFormat *pFly;
                 if ( pAnchoredObj->ISA(SwFlyFrm) )
-                    pFly = &(pAnchoredObj->GetFrmFmt());
+                    pFly = &(pAnchoredObj->GetFrameFormat());
                 else if ( bDrawAlso )
-                    pFly = &(pAnchoredObj->GetFrmFmt());
+                    pFly = &(pAnchoredObj->GetFrameFormat());
                 else
                     continue;
 
-                const SwFmtAnchor& rAnchor = pFly->GetAnchor();
+                const SwFormatAnchor& rAnchor = pFly->GetAnchor();
                 if ((FLY_AT_PARA != rAnchor.GetAnchorId()) &&
                     (FLY_AT_FLY  != rAnchor.GetAnchorId()) &&
                     (FLY_AT_CHAR != rAnchor.GetAnchorId()))
                 {
-                    const SwCntntFrm * pCntntFrm = pPage->FindFirstBodyCntnt();
-                    if ( !pCntntFrm )
+                    const SwContentFrm * pContentFrm = pPage->FindFirstBodyContent();
+                    if ( !pContentFrm )
                     {
                         // Oops! An empty page.
                         // In order not to lose the whole frame (RTF) we
-                        // look for the last Cntnt before the page.
+                        // look for the last Content before the page.
                         const SwPageFrm *pPrv = static_cast<const SwPageFrm*>(pPage->GetPrev());
-                        while ( !pCntntFrm && pPrv )
+                        while ( !pContentFrm && pPrv )
                         {
-                            pCntntFrm = pPrv->FindFirstBodyCntnt();
+                            pContentFrm = pPrv->FindFirstBodyContent();
                             pPrv = static_cast<const SwPageFrm*>(pPrv->GetPrev());
                         }
                     }
-                    if ( pCntntFrm )
+                    if ( pContentFrm )
                     {
-                        SwNodeIndex aIdx( *pCntntFrm->GetNode() );
+                        SwNodeIndex aIdx( *pContentFrm->GetNode() );
                         aRetval.insert(SwPosFlyFrmPtr(new SwPosFlyFrm(aIdx, pFly, aRetval.size())));
                     }
                 }
@@ -633,10 +633,10 @@ static void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uIn
 
 }
 
-static SwFlyFrmFmt *
-lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
+static SwFlyFrameFormat *
+lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable,
         SwUndoInsertLabel *const pUndo,
-        SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
+        SwLabelType const eType, OUString const& rText, OUString const& rSeparator,
             const OUString& rNumberingSeparator,
             const bool bBefore, const sal_uInt16 nId, const sal_uLong nNdIdx,
             const OUString& rCharacterStyle,
@@ -646,20 +646,20 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     bool bTable = false;    // To save some code.
 
-    // Get the field first, because we retrieve the TxtColl via the field's name
-    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFldTypes()->size(),
-            "FldType index out of bounds." );
-    SwFieldType *pType = (nId != USHRT_MAX) ? (*rDoc.getIDocumentFieldsAccess().GetFldTypes())[nId] : NULL;
+    // Get the field first, because we retrieve the TextColl via the field's name
+    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFieldTypes()->size(),
+            "FieldType index out of bounds." );
+    SwFieldType *pType = (nId != USHRT_MAX) ? (*rDoc.getIDocumentFieldsAccess().GetFieldTypes())[nId] : NULL;
     OSL_ENSURE(!pType || pType->Which() == RES_SETEXPFLD, "wrong Id for Label");
 
-    SwTxtFmtColl * pColl = NULL;
+    SwTextFormatColl * pColl = NULL;
     if( pType )
     {
-        for( auto i = pTxtFmtCollTbl->size(); i; )
+        for( auto i = pTextFormatCollTable->size(); i; )
         {
-            if( (*pTxtFmtCollTbl)[ --i ]->GetName()==pType->GetName() )
+            if( (*pTextFormatCollTable)[ --i ]->GetName()==pType->GetName() )
             {
-                pColl = (*pTxtFmtCollTbl)[i];
+                pColl = (*pTextFormatCollTable)[i];
                 break;
             }
         }
@@ -668,11 +668,11 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     if( !pColl )
     {
-        pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_LABEL );
+        pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_LABEL );
     }
 
-    SwTxtNode *pNew = NULL;
-    SwFlyFrmFmt* pNewFmt = NULL;
+    SwTextNode *pNew = NULL;
+    SwFlyFrameFormat* pNewFormat = NULL;
 
     switch ( eType )
     {
@@ -704,7 +704,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
                 // Create Node for labeling paragraph.
                 SwNodeIndex aIdx( rDoc.GetNodes(), nNode );
-                pNew = rDoc.GetNodes().MakeTxtNode( aIdx, pColl );
+                pNew = rDoc.GetNodes().MakeTextNode( aIdx, pColl );
             }
             break;
 
@@ -717,54 +717,54 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 // create Frames.
 
                 // Get the FlyFrame's Format and decouple the Layout.
-                SwFrmFmt *pOldFmt = rDoc.GetNodes()[nNdIdx]->GetFlyFmt();
-                OSL_ENSURE( pOldFmt, "Couldn't find the Fly's Format." );
+                SwFrameFormat *pOldFormat = rDoc.GetNodes()[nNdIdx]->GetFlyFormat();
+                OSL_ENSURE( pOldFormat, "Couldn't find the Fly's Format." );
                 // #i115719#
                 // <title> and <description> attributes are lost when calling <DelFrms()>.
                 // Thus, keep them and restore them after the calling <MakeFrms()>
-                const bool bIsSwFlyFrmFmtInstance( dynamic_cast<SwFlyFrmFmt*>(pOldFmt) != 0 );
-                const OUString sTitle( bIsSwFlyFrmFmtInstance
-                                     ? static_cast<SwFlyFrmFmt*>(pOldFmt)->GetObjTitle()
+                const bool bIsSwFlyFrameFormatInstance( dynamic_cast<SwFlyFrameFormat*>(pOldFormat) != 0 );
+                const OUString sTitle( bIsSwFlyFrameFormatInstance
+                                     ? static_cast<SwFlyFrameFormat*>(pOldFormat)->GetObjTitle()
                                      : OUString() );
-                const OUString sDescription( bIsSwFlyFrmFmtInstance
-                                           ? static_cast<SwFlyFrmFmt*>(pOldFmt)->GetObjDescription()
+                const OUString sDescription( bIsSwFlyFrameFormatInstance
+                                           ? static_cast<SwFlyFrameFormat*>(pOldFormat)->GetObjDescription()
                                            : OUString() );
-                pOldFmt->DelFrms();
+                pOldFormat->DelFrms();
 
-                pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(),
-                                rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool(RES_POOLFRM_FRAME) );
+                pNewFormat = rDoc.MakeFlyFrameFormat( rDoc.GetUniqueFrameName(),
+                                rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool(RES_POOLFRM_FRAME) );
 
                 /* #i6447#: Only the selected items are copied from the old
                    format. */
-                SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( true );
+                SfxItemSet* pNewSet = pNewFormat->GetAttrSet().Clone( true );
 
                 // Copy only the set attributes.
                 // The others should apply from the Templates.
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PRINT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_OPAQUE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PROTECT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_SURROUND );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_VERT_ORIENT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_HORI_ORIENT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_LR_SPACE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_UL_SPACE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_BACKGROUND );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_PRINT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_OPAQUE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_PROTECT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_SURROUND );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_VERT_ORIENT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_HORI_ORIENT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_LR_SPACE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_UL_SPACE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_BACKGROUND );
                 if( bCpyBrd )
                 {
                     // If there's no BoxItem at graphic, but the new Format has one, then set the
                     // default item in the new Set. Because the graphic's size has never changed!
                     const SfxPoolItem *pItem;
-                    if( SfxItemState::SET == pOldFmt->GetAttrSet().
+                    if( SfxItemState::SET == pOldFormat->GetAttrSet().
                             GetItemState( RES_BOX, true, &pItem ))
                         pNewSet->Put( *pItem );
-                    else if( SfxItemState::SET == pNewFmt->GetAttrSet().
+                    else if( SfxItemState::SET == pNewFormat->GetAttrSet().
                             GetItemState( RES_BOX, true ))
                         pNewSet->Put( *GetDfltAttr( RES_BOX ) );
 
-                    if( SfxItemState::SET == pOldFmt->GetAttrSet().
+                    if( SfxItemState::SET == pOldFormat->GetAttrSet().
                             GetItemState( RES_SHADOW, true, &pItem ))
                         pNewSet->Put( *pItem );
-                    else if( SfxItemState::SET == pNewFmt->GetAttrSet().
+                    else if( SfxItemState::SET == pNewFormat->GetAttrSet().
                             GetItemState( RES_SHADOW, true ))
                         pNewSet->Put( *GetDfltAttr( RES_SHADOW ) );
                 }
@@ -777,42 +777,42 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 }
 
                 // Always transfer the anchor, which is a hard attribute anyways.
-                pNewSet->Put( pOldFmt->GetAnchor() );
+                pNewSet->Put( pOldFormat->GetAnchor() );
 
                 // The new one should be changeable in its height.
-                SwFmtFrmSize aFrmSize( pOldFmt->GetFrmSize() );
+                SwFormatFrmSize aFrmSize( pOldFormat->GetFrmSize() );
                 aFrmSize.SetHeightSizeType( ATT_MIN_SIZE );
                 pNewSet->Put( aFrmSize );
 
                 SwStartNode* pSttNd = rDoc.GetNodes().MakeTextSection(
                             SwNodeIndex( rDoc.GetNodes().GetEndOfAutotext() ),
                             SwFlyStartNode, pColl );
-                pNewSet->Put( SwFmtCntnt( pSttNd ));
+                pNewSet->Put( SwFormatContent( pSttNd ));
 
-                pNewFmt->SetFmtAttr( *pNewSet );
+                pNewFormat->SetFormatAttr( *pNewSet );
 
-                // InCntnts need to be treated in a special way:
-                // The TxtAttribute needs to be destroyed.
+                // InContents need to be treated in a special way:
+                // The TextAttribute needs to be destroyed.
                 // Unfortunately, this also destroys the Format next to the Frames.
                 // To avoid this, we disconnect the attribute from the Format.
 
-                const SwFmtAnchor& rAnchor = pNewFmt->GetAnchor();
+                const SwFormatAnchor& rAnchor = pNewFormat->GetAnchor();
                 if ( FLY_AS_CHAR == rAnchor.GetAnchorId() )
                 {
-                    const SwPosition *pPos = rAnchor.GetCntntAnchor();
-                    SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                    OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                    const SwPosition *pPos = rAnchor.GetContentAnchor();
+                    SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+                    OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
                     const sal_Int32 nIdx = pPos->nContent.GetIndex();
-                    SwTxtAttr * const pHnt =
-                        pTxtNode->GetTxtAttrForCharAt(nIdx, RES_TXTATR_FLYCNT);
+                    SwTextAttr * const pHint =
+                        pTextNode->GetTextAttrForCharAt(nIdx, RES_TXTATR_FLYCNT);
 
-                    OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+                    OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                                 "Missing FlyInCnt-Hint." );
-                    OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pOldFmt,
-                                "Wrong TxtFlyCnt-Hint." );
+                    OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == pOldFormat,
+                                "Wrong TextFlyCnt-Hint." );
 
-                    const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt(
-                            pNewFmt );
+                    const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat(
+                            pNewFormat );
                 }
 
                 // The old one should not have a flow and it should be adjusted to above and
@@ -820,14 +820,14 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 // Also, the width should be 100% and it should also adjust the hight, if changed.
                 pNewSet->ClearItem();
 
-                pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
+                pNewSet->Put( SwFormatSurround( SURROUND_NONE ) );
                 pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, true ) );
 
                 sal_Int16 eVert = bBefore ? text::VertOrientation::BOTTOM : text::VertOrientation::TOP;
-                pNewSet->Put( SwFmtVertOrient( 0, eVert ) );
-                pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER ) );
+                pNewSet->Put( SwFormatVertOrient( 0, eVert ) );
+                pNewSet->Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER ) );
 
-                aFrmSize = pOldFmt->GetFrmSize();
+                aFrmSize = pOldFormat->GetFrmSize();
                 aFrmSize.SetWidthPercent( 0 );
                 aFrmSize.SetHeightPercent( 255 );
                 pNewSet->Put( aFrmSize );
@@ -843,28 +843,28 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 pNewSet->Put( SvxULSpaceItem(RES_UL_SPACE) );
 
                 // The old one is paragraph-bound to the paragraph in the new one.
-                SwFmtAnchor aAnch( FLY_AT_PARA );
-                SwNodeIndex aAnchIdx( *pNewFmt->GetCntnt().GetCntntIdx(), 1 );
-                pNew = aAnchIdx.GetNode().GetTxtNode();
+                SwFormatAnchor aAnch( FLY_AT_PARA );
+                SwNodeIndex aAnchIdx( *pNewFormat->GetContent().GetContentIdx(), 1 );
+                pNew = aAnchIdx.GetNode().GetTextNode();
                 SwPosition aPos( aAnchIdx );
                 aAnch.SetAnchor( &aPos );
                 pNewSet->Put( aAnch );
 
                 if( pUndo )
-                    pUndo->SetFlys( *pOldFmt, *pNewSet, *pNewFmt );
+                    pUndo->SetFlys( *pOldFormat, *pNewSet, *pNewFormat );
                 else
-                    pOldFmt->SetFmtAttr( *pNewSet );
+                    pOldFormat->SetFormatAttr( *pNewSet );
 
                 delete pNewSet;
 
                 // Have only the FlyFrames created.
                 // We leave this to established methods (especially for InCntFlys).
-                pNewFmt->MakeFrms();
+                pNewFormat->MakeFrms();
                 // #i115719#
-                if ( bIsSwFlyFrmFmtInstance )
+                if ( bIsSwFlyFrameFormatInstance )
                 {
-                    static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjTitle( sTitle );
-                    static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjDescription( sDescription );
+                    static_cast<SwFlyFrameFormat*>(pOldFormat)->SetObjTitle( sTitle );
+                    static_cast<SwFlyFrameFormat*>(pOldFormat)->SetObjDescription( sDescription );
                 }
             }
             break;
@@ -878,49 +878,49 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         // #i61007# order of captions
         bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
         // Work up OUString
-        OUString aTxt;
+        OUString aText;
         if( bOrderNumberingFirst )
         {
-            aTxt = rNumberingSeparator;
+            aText = rNumberingSeparator;
         }
         if( pType)
         {
-            aTxt += pType->GetName();
+            aText += pType->GetName();
             if( !bOrderNumberingFirst )
-                aTxt += " ";
+                aText += " ";
         }
-        sal_Int32 nIdx = aTxt.getLength();
-        if( !rTxt.isEmpty() )
+        sal_Int32 nIdx = aText.getLength();
+        if( !rText.isEmpty() )
         {
-            aTxt += rSeparator;
+            aText += rSeparator;
         }
-        const sal_Int32 nSepIdx = aTxt.getLength();
-        aTxt += rTxt;
+        const sal_Int32 nSepIdx = aText.getLength();
+        aText += rText;
 
         // Insert string
         SwIndex aIdx( pNew, 0 );
-        pNew->InsertText( aTxt, aIdx );
+        pNew->InsertText( aText, aIdx );
 
         // Insert field
         if(pType)
         {
-            SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC);
+            SwSetExpField aField( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC);
             if( bOrderNumberingFirst )
                 nIdx = 0;
-            SwFmtFld aFmt( aFld );
-            pNew->InsertItem( aFmt, nIdx, nIdx );
+            SwFormatField aFormat( aField );
+            pNew->InsertItem( aFormat, nIdx, nIdx );
             if(!rCharacterStyle.isEmpty())
             {
-                SwCharFmt* pCharFmt = rDoc.FindCharFmtByName(rCharacterStyle);
-                if( !pCharFmt )
+                SwCharFormat* pCharFormat = rDoc.FindCharFormatByName(rCharacterStyle);
+                if( !pCharFormat )
                 {
                     const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName(rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
-                    pCharFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( nMyId );
+                    pCharFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( nMyId );
                 }
-                if (pCharFmt)
+                if (pCharFormat)
                 {
-                    SwFmtCharFmt aCharFmt( pCharFmt );
-                    pNew->InsertItem( aCharFmt, 0,
+                    SwFormatCharFormat aCharFormat( pCharFormat );
+                    pNew->InsertItem( aCharFormat, 0,
                         nSepIdx + 1, SetAttrMode::DONTEXPAND );
                 }
             }
@@ -931,15 +931,15 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
             if ( bBefore )
             {
                 if ( !pNew->GetSwAttrSet().GetKeep().GetValue()  )
-                    pNew->SetAttr( SvxFmtKeepItem( true, RES_KEEP ) );
+                    pNew->SetAttr( SvxFormatKeepItem( true, RES_KEEP ) );
             }
             else
             {
                 SwTableNode *const pNd =
                     rDoc.GetNodes()[nNdIdx]->GetStartNode()->GetTableNode();
-                SwTable &rTbl = pNd->GetTable();
-                if ( !rTbl.GetFrmFmt()->GetKeep().GetValue() )
-                    rTbl.GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem( true, RES_KEEP ) );
+                SwTable &rTable = pNd->GetTable();
+                if ( !rTable.GetFrameFormat()->GetKeep().GetValue() )
+                    rTable.GetFrameFormat()->SetFormatAttr( SvxFormatKeepItem( true, RES_KEEP ) );
                 if ( pUndo )
                     pUndo->SetUndoKeep();
             }
@@ -947,12 +947,12 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         rDoc.getIDocumentState().SetModified();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFlyFrmFmt *
+SwFlyFrameFormat *
 SwDoc::InsertLabel(
-        SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
+        SwLabelType const eType, OUString const& rText, OUString const& rSeparator,
         OUString const& rNumberingSeparator,
         bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
         OUString const& rCharacterStyle,
@@ -962,12 +962,12 @@ SwDoc::InsertLabel(
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         pUndo = new SwUndoInsertLabel(
-                        eType, rTxt, rSeparator, rNumberingSeparator,
+                        eType, rText, rSeparator, rNumberingSeparator,
                         bBefore, nId, rCharacterStyle, bCpyBrd );
     }
 
-    SwFlyFrmFmt *const pNewFmt = lcl_InsertLabel(*this, mpTxtFmtCollTbl, pUndo,
-            eType, rTxt, rSeparator, rNumberingSeparator, bBefore,
+    SwFlyFrameFormat *const pNewFormat = lcl_InsertLabel(*this, mpTextFormatCollTable, pUndo,
+            eType, rText, rSeparator, rNumberingSeparator, bBefore,
             nId, nNdIdx, rCharacterStyle, bCpyBrd);
 
     if (pUndo)
@@ -979,13 +979,13 @@ SwDoc::InsertLabel(
         GetIDocumentUndoRedo().DelAllUndoObj();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-static SwFlyFrmFmt *
-lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
-        SwUndoInsertLabel *const pUndo, SwDrawFrmFmt *const pOldFmt,
-        OUString const& rTxt,
+static SwFlyFrameFormat *
+lcl_InsertDrawLabel( SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable,
+        SwUndoInsertLabel *const pUndo, SwDrawFrameFormat *const pOldFormat,
+        OUString const& rText,
                                      const OUString& rSeparator,
                                      const OUString& rNumberSeparator,
                                      const sal_uInt16 nId,
@@ -995,20 +995,20 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
     ::sw::DrawUndoGuard const drawUndoGuard(rDoc.GetIDocumentUndoRedo());
 
-    // Because we get by the TxtColl's name, we need to create the field first.
-    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFldTypes()->size(),
-            "FldType index out of bounds" );
-    SwFieldType *pType = nId != USHRT_MAX ? (*rDoc.getIDocumentFieldsAccess().GetFldTypes())[nId] : 0;
+    // Because we get by the TextColl's name, we need to create the field first.
+    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFieldTypes()->size(),
+            "FieldType index out of bounds" );
+    SwFieldType *pType = nId != USHRT_MAX ? (*rDoc.getIDocumentFieldsAccess().GetFieldTypes())[nId] : 0;
     OSL_ENSURE( !pType || pType->Which() == RES_SETEXPFLD, "Wrong label id" );
 
-    SwTxtFmtColl *pColl = NULL;
+    SwTextFormatColl *pColl = NULL;
     if( pType )
     {
-        for( auto i = pTxtFmtCollTbl->size(); i; )
+        for( auto i = pTextFormatCollTable->size(); i; )
         {
-            if( (*pTxtFmtCollTbl)[ --i ]->GetName()==pType->GetName() )
+            if( (*pTextFormatCollTable)[ --i ]->GetName()==pType->GetName() )
             {
-                pColl = (*pTxtFmtCollTbl)[i];
+                pColl = (*pTextFormatCollTable)[i];
                 break;
             }
         }
@@ -1017,11 +1017,11 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     if( !pColl )
     {
-        pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_LABEL );
+        pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_LABEL );
     }
 
-    SwTxtNode* pNew = NULL;
-    SwFlyFrmFmt* pNewFmt = NULL;
+    SwTextNode* pNew = NULL;
+    SwFlyFrameFormat* pNewFormat = NULL;
 
     // Destroy Frame,
     // insert new Frame,
@@ -1035,26 +1035,26 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     //       Removing the frames of the drawing object changes its layer.
     const SdrLayerID nLayerId = rSdrObj.GetLayer();
 
-    pOldFmt->DelFrms();
+    pOldFormat->DelFrms();
 
-    // InCntnts need to be treated in a special way:
-    // The TxtAttribute needs to be destroyed.
+    // InContents need to be treated in a special way:
+    // The TextAttribute needs to be destroyed.
     // Unfortunately, this also destroys the Format next to the Frames.
     // To avoid this, we disconnect the attribute from the Format.
-    SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( false );
+    SfxItemSet* pNewSet = pOldFormat->GetAttrSet().Clone( false );
 
     // Protect the Frame's size and position
     if ( rSdrObj.IsMoveProtect() || rSdrObj.IsResizeProtect() )
     {
         SvxProtectItem aProtect(RES_PROTECT);
-        aProtect.SetCntntProtect( false );
+        aProtect.SetContentProtect( false );
         aProtect.SetPosProtect( rSdrObj.IsMoveProtect() );
         aProtect.SetSizeProtect( rSdrObj.IsResizeProtect() );
         pNewSet->Put( aProtect );
     }
 
     // Take over the text wrap
-    lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_SURROUND );
+    lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_SURROUND );
 
     // Send the frame to the back, if needed.
     // Consider the 'invisible' hell layer.
@@ -1068,64 +1068,64 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     // Take over position
     // #i26791# - use directly drawing object's positioning attributes
-    pNewSet->Put( pOldFmt->GetHoriOrient() );
-    pNewSet->Put( pOldFmt->GetVertOrient() );
+    pNewSet->Put( pOldFormat->GetHoriOrient() );
+    pNewSet->Put( pOldFormat->GetVertOrient() );
 
-    pNewSet->Put( pOldFmt->GetAnchor() );
+    pNewSet->Put( pOldFormat->GetAnchor() );
 
     // The new one should be variable in its height!
      Size aSz( rSdrObj.GetCurrentBoundRect().GetSize() );
-    SwFmtFrmSize aFrmSize( ATT_MIN_SIZE, aSz.Width(), aSz.Height() );
+    SwFormatFrmSize aFrmSize( ATT_MIN_SIZE, aSz.Width(), aSz.Height() );
     pNewSet->Put( aFrmSize );
 
     // Apply the margin to the new Frame.
     // Don't set a border, use the one from the Template.
-    pNewSet->Put( pOldFmt->GetLRSpace() );
-    pNewSet->Put( pOldFmt->GetULSpace() );
+    pNewSet->Put( pOldFormat->GetLRSpace() );
+    pNewSet->Put( pOldFormat->GetULSpace() );
 
     SwStartNode* pSttNd =
         rDoc.GetNodes().MakeTextSection(
             SwNodeIndex( rDoc.GetNodes().GetEndOfAutotext() ),
                                     SwFlyStartNode, pColl );
 
-    pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(),
-                 rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME ) );
+    pNewFormat = rDoc.MakeFlyFrameFormat( rDoc.GetUniqueFrameName(),
+                 rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME ) );
 
     // Set border and shadow to default if the template contains any.
-    if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState( RES_BOX, true ))
+    if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState( RES_BOX, true ))
         pNewSet->Put( *GetDfltAttr( RES_BOX ) );
 
-    if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState(RES_SHADOW,true))
+    if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(RES_SHADOW,true))
         pNewSet->Put( *GetDfltAttr( RES_SHADOW ) );
 
-    pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
-    pNewFmt->SetFmtAttr( *pNewSet );
+    pNewFormat->SetFormatAttr( SwFormatContent( pSttNd ));
+    pNewFormat->SetFormatAttr( *pNewSet );
 
-    const SwFmtAnchor& rAnchor = pNewFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pNewFormat->GetAnchor();
     if ( FLY_AS_CHAR == rAnchor.GetAnchorId() )
     {
-        const SwPosition *pPos = rAnchor.GetCntntAnchor();
-        SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        const SwPosition *pPos = rAnchor.GetContentAnchor();
+        SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
         const sal_Int32 nIdx = pPos->nContent.GetIndex();
-        SwTxtAttr * const pHnt =
-            pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
+        SwTextAttr * const pHint =
+            pTextNode->GetTextAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
 
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().
-                    GetFrmFmt() == (SwFrmFmt*)pOldFmt,
-                    "Wrong TxtFlyCnt-Hint." );
+        OSL_ENSURE( pHint && pHint->GetFlyCnt().
+                    GetFrameFormat() == (SwFrameFormat*)pOldFormat,
+                    "Wrong TextFlyCnt-Hint." );
 #endif
-        const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt( pNewFmt );
+        const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat( pNewFormat );
     }
 
     // The old one should not have a flow
     // and it should be adjusted to above and middle.
     pNewSet->ClearItem();
 
-    pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
+    pNewSet->Put( SwFormatSurround( SURROUND_NONE ) );
     if (nLayerId == rDoc.getIDocumentDrawModelAccess().GetHellId())
     {
     // Consider drawing objects in the 'invisible' hell layer
@@ -1139,31 +1139,31 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     pNewSet->Put( SvxULSpaceItem( RES_UL_SPACE ) );
 
     // #i26791# - set position of the drawing object, which is labeled.
-    pNewSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
-    pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
+    pNewSet->Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+    pNewSet->Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
 
     // The old one is paragraph-bound to the new one's paragraph.
-    SwFmtAnchor aAnch( FLY_AT_PARA );
-    SwNodeIndex aAnchIdx( *pNewFmt->GetCntnt().GetCntntIdx(), 1 );
-    pNew = aAnchIdx.GetNode().GetTxtNode();
+    SwFormatAnchor aAnch( FLY_AT_PARA );
+    SwNodeIndex aAnchIdx( *pNewFormat->GetContent().GetContentIdx(), 1 );
+    pNew = aAnchIdx.GetNode().GetTextNode();
     SwPosition aPos( aAnchIdx );
     aAnch.SetAnchor( &aPos );
     pNewSet->Put( aAnch );
 
     if( pUndo )
     {
-        pUndo->SetFlys( *pOldFmt, *pNewSet, *pNewFmt );
+        pUndo->SetFlys( *pOldFormat, *pNewSet, *pNewFormat );
         // #i26791# - position no longer needed
         pUndo->SetDrawObj( nLayerId );
     }
     else
-        pOldFmt->SetFmtAttr( *pNewSet );
+        pOldFormat->SetFormatAttr( *pNewSet );
 
     delete pNewSet;
 
     // Have only the FlyFrames created.
     // We leave this to established methods (especially for InCntFlys).
-    pNewFmt->MakeFrms();
+    pNewFormat->MakeFrms();
 
     OSL_ENSURE( pNew, "No Label inserted" );
 
@@ -1173,57 +1173,57 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
 
         // prepare string
-        OUString aTxt;
+        OUString aText;
         if( bOrderNumberingFirst )
         {
-            aTxt = rNumberSeparator;
+            aText = rNumberSeparator;
         }
         if ( pType )
         {
-            aTxt += pType->GetName();
+            aText += pType->GetName();
             if( !bOrderNumberingFirst )
-                aTxt += " ";
+                aText += " ";
         }
-        sal_Int32 nIdx = aTxt.getLength();
-        aTxt += rSeparator;
-        const sal_Int32 nSepIdx = aTxt.getLength();
-        aTxt += rTxt;
+        sal_Int32 nIdx = aText.getLength();
+        aText += rSeparator;
+        const sal_Int32 nSepIdx = aText.getLength();
+        aText += rText;
 
         // insert text
         SwIndex aIdx( pNew, 0 );
-        pNew->InsertText( aTxt, aIdx );
+        pNew->InsertText( aText, aIdx );
 
         // insert field
         if ( pType )
         {
-            SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC );
+            SwSetExpField aField( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC );
             if( bOrderNumberingFirst )
                 nIdx = 0;
-            SwFmtFld aFmt( aFld );
-            pNew->InsertItem( aFmt, nIdx, nIdx );
+            SwFormatField aFormat( aField );
+            pNew->InsertItem( aFormat, nIdx, nIdx );
             if ( !rCharacterStyle.isEmpty() )
             {
-                SwCharFmt * pCharFmt = rDoc.FindCharFmtByName(rCharacterStyle);
-                if ( !pCharFmt )
+                SwCharFormat * pCharFormat = rDoc.FindCharFormatByName(rCharacterStyle);
+                if ( !pCharFormat )
                 {
                     const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName( rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-                    pCharFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( nMyId );
+                    pCharFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( nMyId );
                 }
-                if ( pCharFmt )
+                if ( pCharFormat )
                 {
-                    SwFmtCharFmt aCharFmt( pCharFmt );
-                    pNew->InsertItem( aCharFmt, 0, nSepIdx + 1,
+                    SwFormatCharFormat aCharFormat( pCharFormat );
+                    pNew->InsertItem( aCharFormat, 0, nSepIdx + 1,
                             SetAttrMode::DONTEXPAND );
                 }
             }
         }
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFlyFrmFmt* SwDoc::InsertDrawLabel(
-        OUString const& rTxt,
+SwFlyFrameFormat* SwDoc::InsertDrawLabel(
+        OUString const& rText,
         OUString const& rSeparator,
         OUString const& rNumberSeparator,
         sal_uInt16 const nId,
@@ -1232,13 +1232,13 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
 {
     SwDrawContact *const pContact =
         static_cast<SwDrawContact*>(GetUserCall( &rSdrObj ));
-    OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFmt()->Which(),
-            "InsertDrawLabel(): not a DrawFrmFmt" );
+    OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFormat()->Which(),
+            "InsertDrawLabel(): not a DrawFrameFormat" );
     if (!pContact)
         return 0;
 
-    SwDrawFrmFmt* pOldFmt = static_cast<SwDrawFrmFmt *>(pContact->GetFmt());
-    if (!pOldFmt)
+    SwDrawFrameFormat* pOldFormat = static_cast<SwDrawFrameFormat *>(pContact->GetFormat());
+    if (!pOldFormat)
         return 0;
 
     SwUndoInsertLabel * pUndo = 0;
@@ -1246,13 +1246,13 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     {
         GetIDocumentUndoRedo().ClearRedo();
         pUndo = new SwUndoInsertLabel(
-            LTYPE_DRAW, rTxt, rSeparator, rNumberSeparator, false,
+            LTYPE_DRAW, rText, rSeparator, rNumberSeparator, false,
             nId, rCharacterStyle, false );
     }
 
-    SwFlyFrmFmt *const pNewFmt = lcl_InsertDrawLabel(
-        *this, mpTxtFmtCollTbl, pUndo, pOldFmt,
-        rTxt, rSeparator, rNumberSeparator, nId, rCharacterStyle, rSdrObj);
+    SwFlyFrameFormat *const pNewFormat = lcl_InsertDrawLabel(
+        *this, mpTextFormatCollTable, pUndo, pOldFormat,
+        rText, rSeparator, rNumberSeparator, nId, rCharacterStyle, rSdrObj);
 
     if (pUndo)
     {
@@ -1263,7 +1263,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
         GetIDocumentUndoRedo().DelAllUndoObj();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
 IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, )
@@ -1288,7 +1288,7 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
     {
         OUString newName = "MailMergeFly"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( pDoc->GetSpzFrmFmts()->size() + 1 );
+            + OUString::number( pDoc->GetSpzFrameFormats()->size() + 1 );
         return newName;
     }
 
@@ -1296,25 +1296,25 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
     OUString aName( aId );
     sal_Int32 nNmLen = aName.getLength();
 
-    const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+    const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
 
-    std::vector<sal_uInt8> aSetFlags(rFmts.size()/8 + 2);
+    std::vector<sal_uInt8> aSetFlags(rFormats.size()/8 + 2);
 
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ n ];
-        if( RES_FLYFRMFMT == pFlyFmt->Which() &&
-            pFlyFmt->GetName().startsWith( aName ) )
+        const SwFrameFormat* pFlyFormat = rFormats[ n ];
+        if( RES_FLYFRMFMT == pFlyFormat->Which() &&
+            pFlyFormat->GetName().startsWith( aName ) )
         {
             // Only get and set the Flag
-            const sal_Int32 nNum = pFlyFmt->GetName().copy( nNmLen ).toInt32()-1;
-            if( nNum >= 0 && static_cast<SwFrmFmts::size_type>(nNum) < rFmts.size() )
+            const sal_Int32 nNum = pFlyFormat->GetName().copy( nNmLen ).toInt32()-1;
+            if( nNum >= 0 && static_cast<SwFrameFormats::size_type>(nNum) < rFormats.size() )
                 aSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
         }
     }
 
     // All numbers are flagged accordingly, so determine the right one
-    SwFrmFmts::size_type nNum = rFmts.size();
+    SwFrameFormats::size_type nNum = rFormats.size();
     for( std::vector<sal_uInt8>::size_type n=0; n<aSetFlags.size(); ++n )
     {
         sal_uInt8 nTmp = aSetFlags[ n ];
@@ -1346,15 +1346,15 @@ OUString SwDoc::GetUniqueFrameName() const
     return lcl_GetUniqueFlyName( this, STR_FRAME_DEFNAME );
 }
 
-const SwFlyFrmFmt* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp ) const
+const SwFlyFrameFormat* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp ) const
 {
-    const SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    for( auto n = rFmts.size(); n; )
+    const SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    for( auto n = rFormats.size(); n; )
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ --n ];
+        const SwFrameFormat* pFlyFormat = rFormats[ --n ];
         const SwNodeIndex* pIdx = 0;
-        if( RES_FLYFRMFMT == pFlyFmt->Which() && pFlyFmt->GetName() == rName &&
-            0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() ) &&
+        if( RES_FLYFRMFMT == pFlyFormat->Which() && pFlyFormat->GetName() == rName &&
+            0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             if( nNdTyp )
@@ -1362,24 +1362,24 @@ const SwFlyFrmFmt* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp
                 // query for the right NodeType
                 const SwNode* pNd = GetNodes()[ pIdx->GetIndex()+1 ];
                 if( nNdTyp == ND_TEXTNODE
-                        ? !pNd->IsNoTxtNode()
+                        ? !pNd->IsNoTextNode()
                         : nNdTyp == pNd->GetNodeType() )
-                    return static_cast<const SwFlyFrmFmt*>(pFlyFmt);
+                    return static_cast<const SwFlyFrameFormat*>(pFlyFormat);
             }
             else
-                return static_cast<const SwFlyFrmFmt*>(pFlyFmt);
+                return static_cast<const SwFlyFrameFormat*>(pFlyFormat);
         }
     }
     return 0;
 }
 
-void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
+void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName )
 {
     OUString sName( rName );
     if( sName.isEmpty() || FindFlyByName( sName ) )
     {
         sal_uInt16 nTyp = STR_FRAME_DEFNAME;
-        const SwNodeIndex* pIdx = rFmt.GetCntnt().GetCntntIdx();
+        const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx();
         if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
             switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
             {
@@ -1388,7 +1388,7 @@ void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
             }
         sName = lcl_GetUniqueFlyName( this, nTyp );
     }
-    rFmt.SetName( sName, true );
+    rFormat.SetName( sName, true );
     getIDocumentState().SetModified();
 }
 
@@ -1403,18 +1403,18 @@ void SwDoc::SetAllUniqueFlyNames()
     const OUString sGrfNm( nGrfId );
     const OUString sOLENm( nOLEId );
 
-    if( 255 < ( n = GetSpzFrmFmts()->size() ))
+    if( 255 < ( n = GetSpzFrameFormats()->size() ))
         n = 255;
-    SwFrmFmts aArr;
+    SwFrameFormats aArr;
     aArr.reserve( n );
-    SwFrmFmt* pFlyFmt;
+    SwFrameFormat* pFlyFormat;
     bool bContainsAtPageObjWithContentAnchor = false;
 
-    for( n = GetSpzFrmFmts()->size(); n; )
+    for( n = GetSpzFrameFormats()->size(); n; )
     {
-        if( RES_FLYFRMFMT == (pFlyFmt = (*GetSpzFrmFmts())[ --n ])->Which() )
+        if( RES_FLYFRMFMT == (pFlyFormat = (*GetSpzFrameFormats())[ --n ])->Which() )
         {
-            const OUString aNm = pFlyFmt->GetName();
+            const OUString aNm = pFlyFormat->GetName();
             if ( !aNm.isEmpty() )
             {
                 sal_Int32 *pNum = 0;
@@ -1444,14 +1444,14 @@ void SwDoc::SetAllUniqueFlyNames()
             }
             else
                 // we want to set that afterwards
-                aArr.push_back( pFlyFmt );
+                aArr.push_back( pFlyFormat );
 
         }
         if ( !bContainsAtPageObjWithContentAnchor )
         {
-            const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
+            const SwFormatAnchor& rAnchor = pFlyFormat->GetAnchor();
             if ( (FLY_AT_PAGE == rAnchor.GetAnchorId()) &&
-                 rAnchor.GetCntntAnchor() )
+                 rAnchor.GetContentAnchor() )
             {
                 bContainsAtPageObjWithContentAnchor = true;
             }
@@ -1463,39 +1463,39 @@ void SwDoc::SetAllUniqueFlyNames()
     {
         const SwNodeIndex* pIdx;
 
-        if( 0 != ( pIdx = ( pFlyFmt = aArr[ --n ])->GetCntnt().GetCntntIdx() )
+        if( 0 != ( pIdx = ( pFlyFormat = aArr[ --n ])->GetContent().GetContentIdx() )
             && pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
             {
             case ND_GRFNODE:
-                pFlyFmt->SetName( sGrfNm + OUString::number( ++nGrfNum ));
+                pFlyFormat->SetName( sGrfNm + OUString::number( ++nGrfNum ));
                 break;
             case ND_OLENODE:
-                pFlyFmt->SetName( sOLENm + OUString::number( ++nOLENum ));
+                pFlyFormat->SetName( sOLENm + OUString::number( ++nOLENum ));
                 break;
             default:
-                pFlyFmt->SetName( sFlyNm + OUString::number( ++nFlyNum ));
+                pFlyFormat->SetName( sFlyNm + OUString::number( ++nFlyNum ));
                 break;
             }
         }
     }
     aArr.clear();
 
-    if( !GetFtnIdxs().empty() )
+    if( !GetFootnoteIdxs().empty() )
     {
-        SwTxtFtn::SetUniqueSeqRefNo( *this );
+        SwTextFootnote::SetUniqueSeqRefNo( *this );
         // #i52775# Chapter footnotes did not get updated correctly.
-        // Calling UpdateAllFtn() instead of UpdateFtn() solves this problem,
-        // but I do not dare to call UpdateAllFtn() in all cases: Safety first.
-        if ( FTNNUM_CHAPTER == GetFtnInfo().eNum )
+        // Calling UpdateAllFootnote() instead of UpdateFootnote() solves this problem,
+        // but I do not dare to call UpdateAllFootnote() in all cases: Safety first.
+        if ( FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
         {
-            GetFtnIdxs().UpdateAllFtn();
+            GetFootnoteIdxs().UpdateAllFootnote();
         }
         else
         {
             SwNodeIndex aTmp( GetNodes() );
-            GetFtnIdxs().UpdateFtn( aTmp );
+            GetFootnoteIdxs().UpdateFootnote( aTmp );
         }
     }
 }
@@ -1513,36 +1513,36 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
     {
         // get up by using the Anchor
 #if OSL_DEBUG_LEVEL > 0
-        std::list<const SwFrmFmt*> checkFmts;
-        for( auto pFmt : *GetSpzFrmFmts() )
+        std::list<const SwFrameFormat*> checkFormats;
+        for( auto pFormat : *GetSpzFrameFormats() )
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if( pIdx && pFlyNd == &pIdx->GetNode() )
-                checkFmts.push_back( pFmt );
+                checkFormats.push_back( pFormat );
         }
 #endif
-        std::vector<SwFrmFmt*> const*const pFlys(pFlyNd->GetAnchoredFlys());
+        std::vector<SwFrameFormat*> const*const pFlys(pFlyNd->GetAnchoredFlys());
         bool bFound(false);
         for (size_t i = 0; pFlys && i < pFlys->size(); ++i)
         {
-            const SwFrmFmt *const pFmt = (*pFlys)[i];
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwFrameFormat *const pFormat = (*pFlys)[i];
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if( pIdx && pFlyNd == &pIdx->GetNode() )
             {
 #if OSL_DEBUG_LEVEL > 0
-                std::list<const SwFrmFmt*>::iterator checkPos = std::find(
-                        checkFmts.begin(), checkFmts.end(), pFmt );
-                assert( checkPos != checkFmts.end());
-                checkFmts.erase( checkPos );
+                std::list<const SwFrameFormat*>::iterator checkPos = std::find(
+                        checkFormats.begin(), checkFormats.end(), pFormat );
+                assert( checkPos != checkFormats.end());
+                checkFormats.erase( checkPos );
 #endif
-                const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                 if ((FLY_AT_PAGE == rAnchor.GetAnchorId()) ||
-                    !rAnchor.GetCntntAnchor() )
+                    !rAnchor.GetContentAnchor() )
                 {
                     return false;
                 }
 
-                pNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
+                pNd = &rAnchor.GetContentAnchor()->nNode.GetNode();
                 pFlyNd = pNd->FindFlyStartNode();
                 bFound = true;
                 break;
@@ -1564,9 +1564,9 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
 {
     short nRet = -1;
 
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
 
-    // #i42921# - use new method <SwCntntNode::GetTextDirection(..)>
+    // #i42921# - use new method <SwContentNode::GetTextDirection(..)>
     if ( pNd )
     {
         nRet = pNd->GetTextDirection( rPos, pPt );
@@ -1577,25 +1577,25 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
         if( pNd )
         {
             // Are we in a FlyFrame? Then look at that for the correct attribute
-            const SwFrmFmt* pFlyFmt = pNd->GetFlyFmt();
-            while( pFlyFmt )
+            const SwFrameFormat* pFlyFormat = pNd->GetFlyFormat();
+            while( pFlyFormat )
             {
-                pItem = &pFlyFmt->GetFrmDir();
+                pItem = &pFlyFormat->GetFrmDir();
                 if( FRMDIR_ENVIRONMENT == pItem->GetValue() )
                 {
                     pItem = 0;
-                    const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
+                    const SwFormatAnchor* pAnchor = &pFlyFormat->GetAnchor();
                     if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                        pAnchor->GetCntntAnchor())
+                        pAnchor->GetContentAnchor())
                     {
-                        pFlyFmt = pAnchor->GetCntntAnchor()->nNode.
-                                            GetNode().GetFlyFmt();
+                        pFlyFormat = pAnchor->GetContentAnchor()->nNode.
+                                            GetNode().GetFlyFormat();
                     }
                     else
-                        pFlyFmt = 0;
+                        pFlyFormat = 0;
                 }
                 else
-                    pFlyFmt = 0;
+                    pFlyFormat = 0;
             }
 
             if( !pItem )
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 60f9756069c7..3f60d4e6f697 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -123,11 +123,11 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::document;
 
-const sal_Char sFrmFmtStr[] = "Frameformat";
+const sal_Char sFrameFormatStr[] = "Frameformat";
 const sal_Char sEmptyPageStr[] = "Empty Page";
 const sal_Char sColumnCntStr[] = "Columncontainer";
-const sal_Char sCharFmtStr[] = "Character style";
-const sal_Char sTxtCollStr[] = "Paragraph style";
+const sal_Char sCharFormatStr[] = "Character style";
+const sal_Char sTextCollStr[] = "Paragraph style";
 const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
 
 /*
@@ -186,14 +186,14 @@ void StartGrammarChecking( SwDoc &rDoc )
 /*
  * internal functions
  */
-static void lcl_DelFmtIndices( SwFmt* pFmt )
+static void lcl_DelFormatIndices( SwFormat* pFormat )
 {
-    SwFmtCntnt &rFmtCntnt = (SwFmtCntnt&)pFmt->GetCntnt();
-    if ( rFmtCntnt.GetCntntIdx() )
-        rFmtCntnt.SetNewCntntIdx( 0 );
-    SwFmtAnchor &rFmtAnchor = (SwFmtAnchor&)pFmt->GetAnchor();
-    if ( rFmtAnchor.GetCntntAnchor() )
-        rFmtAnchor.SetAnchor( 0 );
+    SwFormatContent &rFormatContent = (SwFormatContent&)pFormat->GetContent();
+    if ( rFormatContent.GetContentIdx() )
+        rFormatContent.SetNewContentIdx( 0 );
+    SwFormatAnchor &rFormatAnchor = (SwFormatAnchor&)pFormat->GetAnchor();
+    if ( rFormatAnchor.GetContentAnchor() )
+        rFormatAnchor.SetAnchor( 0 );
 }
 
 /*
@@ -223,33 +223,33 @@ SwDoc::SwDoc()
     m_pDocumentLayoutManager( new ::sw::DocumentLayoutManager( *this ) ),
     m_pDocumentStylePoolManager( new ::sw::DocumentStylePoolManager( *this ) ),
     m_pDocumentExternalDataManager( new ::sw::DocumentExternalDataManager() ),
-    mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
-    mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ),
-    mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ),
-    mpDfltCharFmt( new SwCharFmt( GetAttrPool(), sCharFmtStr, 0 ) ),
-    mpDfltTxtFmtColl( new SwTxtFmtColl( GetAttrPool(), sTxtCollStr ) ),
-    mpDfltGrfFmtColl( new SwGrfFmtColl( GetAttrPool(), sGrfCollStr ) ),
-    mpFrmFmtTbl( new SwFrmFmts() ),
-    mpCharFmtTbl( new SwCharFmts() ),
-    mpSpzFrmFmtTbl( new SwFrmFmts() ),
-    mpSectionFmtTbl( new SwSectionFmts() ),
-    mpTblFrmFmtTbl( new SwFrmFmts() ),
-    mpTxtFmtCollTbl( new SwTxtFmtColls() ),
-    mpGrfFmtCollTbl( new SwGrfFmtColls() ),
+    mpDfltFrameFormat( new SwFrameFormat( GetAttrPool(), sFrameFormatStr, 0 ) ),
+    mpEmptyPageFormat( new SwFrameFormat( GetAttrPool(), sEmptyPageStr, mpDfltFrameFormat ) ),
+    mpColumnContFormat( new SwFrameFormat( GetAttrPool(), sColumnCntStr, mpDfltFrameFormat ) ),
+    mpDfltCharFormat( new SwCharFormat( GetAttrPool(), sCharFormatStr, 0 ) ),
+    mpDfltTextFormatColl( new SwTextFormatColl( GetAttrPool(), sTextCollStr ) ),
+    mpDfltGrfFormatColl( new SwGrfFormatColl( GetAttrPool(), sGrfCollStr ) ),
+    mpFrameFormatTable( new SwFrameFormats() ),
+    mpCharFormatTable( new SwCharFormats() ),
+    mpSpzFrameFormatTable( new SwFrameFormats() ),
+    mpSectionFormatTable( new SwSectionFormats() ),
+    mpTableFrameFormatTable( new SwFrameFormats() ),
+    mpTextFormatCollTable( new SwTextFormatColls() ),
+    mpGrfFormatCollTable( new SwGrfFormatColls() ),
     mpTOXTypes( new SwTOXTypes() ),
     mpDefTOXBases( new SwDefTOXBase_Impl() ),
     mpGlossaryDoc( 0 ),
     mpOutlineRule( 0 ),
-    mpFtnInfo( new SwFtnInfo ),
+    mpFootnoteInfo( new SwFootnoteInfo ),
     mpEndNoteInfo( new SwEndNoteInfo ),
     mpLineNumberInfo( new SwLineNumberInfo ),
-    mpFtnIdxs( new SwFtnIdxs ),
+    mpFootnoteIdxs( new SwFootnoteIdxs ),
     mpDocShell( 0 ),
     mpACEWord( 0 ),
     mpURLStateChgd( 0 ),
     mpNumberFormatter( 0 ),
-    mpNumRuleTbl( new SwNumRuleTbl ),
-    mpUnoCrsrTbl( new SwUnoCrsrTbl() ),
+    mpNumRuleTable( new SwNumRuleTable ),
+    mpUnoCrsrTable( new SwUnoCrsrTable() ),
     mpPgPViewPrtData( 0 ),
     mpExtInputRing( 0 ),
     mpStyleAccess( 0 ),
@@ -265,10 +265,10 @@ SwDoc::SwDoc()
     mbInXMLImport(false),
     mbUpdateTOX(false),
     mbInLoadAsynchron(false),
-    mbIsAutoFmtRedline(false),
+    mbIsAutoFormatRedline(false),
     mbOLEPrtNotifyPending(false),
     mbAllOLENotify(false),
-    mbInsOnlyTxtGlssry(false),
+    mbInsOnlyTextGlssry(false),
     mbContains_MSVBasic(false),
     mbClipBoard( false ),
     mbColumnSelection( false ),
@@ -291,35 +291,35 @@ SwDoc::SwDoc()
     // style hierarchies) are created and to always set (but only at the root) the FillStyle
     // to NONE fixed; that will add that attribute to the file format. It will be hard to reset
     // attribbute sets (which is done at import and using UI). Also not a good solution.
-    // Luckily Writer uses pDfltTxtFmtColl as default parent for all paragraphs and similar, thus
+    // Luckily Writer uses pDfltTextFormatColl as default parent for all paragraphs and similar, thus
     // it is possible to set this attribute here. It will be not reset when importing.
-    mpDfltTxtFmtColl->SetFmtAttr(XFillStyleItem(drawing::FillStyle_NONE));
-    mpDfltFrmFmt->SetFmtAttr(XFillStyleItem(drawing::FillStyle_NONE));
+    mpDfltTextFormatColl->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
+    mpDfltFrameFormat->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
 
     /*
-     * DefaultFormats and DefaultFormatCollections (FmtColl)
+     * DefaultFormats and DefaultFormatCollections (FormatColl)
      * are inserted at position 0 at the respective array.
-     * The formats in the FmtColls are derived from the
+     * The formats in the FormatColls are derived from the
      * DefaultFormats and are also in the list.
      */
     /* Formats */
-    mpFrmFmtTbl->push_back(mpDfltFrmFmt);
-    mpCharFmtTbl->push_back(mpDfltCharFmt);
+    mpFrameFormatTable->push_back(mpDfltFrameFormat);
+    mpCharFormatTable->push_back(mpDfltCharFormat);
 
-    /* FmtColls */
+    /* FormatColls */
     // TXT
-    mpTxtFmtCollTbl->push_back(mpDfltTxtFmtColl);
+    mpTextFormatCollTable->push_back(mpDfltTextFormatColl);
     // GRF
-    mpGrfFmtCollTbl->push_back(mpDfltGrfFmtColl);
+    mpGrfFormatCollTable->push_back(mpDfltGrfFormatColl);
 
-    // Create PageDesc, EmptyPageFmt and ColumnFmt
+    // Create PageDesc, EmptyPageFormat and ColumnFormat
     if ( maPageDescs.empty() )
         getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
 
     // Set to "Empty Page"
-    mpEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
-    // Set BodyFmt for columns
-    mpColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+    mpEmptyPageFormat->SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE ) );
+    // Set BodyFormat for columns
+    mpColumnContFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) );
 
     GetDocumentFieldsManager()._InitFieldTypes();
 
@@ -332,11 +332,11 @@ SwDoc::SwDoc()
     // Counting of phantoms depends on <IsOldNumbering()>
     mpOutlineRule->SetCountPhantoms( !GetDocumentSettingManager().get(DocumentSettingId::OLD_NUMBERING) );
 
-    new SwTxtNode(
+    new SwTextNode(
             SwNodeIndex(GetUndoManager().GetUndoNodes().GetEndOfContent()),
-            mpDfltTxtFmtColl );
-    new SwTxtNode( SwNodeIndex( GetNodes().GetEndOfContent() ),
-                    getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+            mpDfltTextFormatColl );
+    new SwTextNode( SwNodeIndex( GetNodes().GetEndOfContent() ),
+                    getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
 
     maOLEModifiedIdle.SetPriority( SchedulerPriority::LOWEST );
     maOLEModifiedIdle.SetIdleHdl( LINK( this, SwDoc, DoUpdateModifiedOLE ));
@@ -394,15 +394,15 @@ SwDoc::~SwDoc()
     delete mpGrammarContact;
     mpGrammarContact = 0;
 
-    //!! needs to be done to destroy a possible SwFmtDrop format that may
+    //!! needs to be done to destroy a possible SwFormatDrop format that may
     //!! be connected to a char format which may not otherwise be removed
-    //!! and thus would leave a unremoved SwFmt object. (TL)
+    //!! and thus would leave a unremoved SwFormat object. (TL)
     //!! (this is case is not possible via UI but via API...)
-    SwFmtDrop aDrop;
+    SwFormatDrop aDrop;
     SetDefault(aDrop);
-    //!! same for SwFmtCharFmt
-    SwFmtCharFmt aCharFmt(NULL);
-    SetDefault(aCharFmt);
+    //!! same for SwFormatCharFormat
+    SwFormatCharFormat aCharFormat(NULL);
+    SetDefault(aCharFormat);
 
     getIDocumentTimerAccess().StopIdling();   // stop idle timer
 
@@ -420,10 +420,10 @@ SwDoc::~SwDoc()
     mbDtor = true;
 
     //Clear the redline table before the nodes array is destroyed
-    getIDocumentRedlineAccess().GetRedlineTbl().DeleteAndDestroyAll();
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetRedlineTable().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAndDestroyAll();
 
-    delete mpUnoCrsrTbl;
+    delete mpUnoCrsrTable;
     delete mpACEWord;
 
     // Release the BaseLinks
@@ -443,7 +443,7 @@ SwDoc::~SwDoc()
     SwNodes & rUndoNodes( GetUndoManager().GetUndoNodes() );
     rUndoNodes.pOutlineNds->clear();
 
-    mpFtnIdxs->clear();
+    mpFootnoteIdxs->clear();
 
     // indices could be registered in attributes
     m_pUndoManager->DelAllUndoObj();
@@ -475,15 +475,15 @@ SwDoc::~SwDoc()
 
     // Any of the FrmFormats can still have indices registered.
     // These need to be destroyed now at the latest.
-    for( SwFrmFmt* pFmt : *mpFrmFmtTbl )
-        lcl_DelFmtIndices( pFmt );
-    for( SwFrmFmt* pFmt : *mpSpzFrmFmtTbl )
-        lcl_DelFmtIndices( pFmt );
-    for( SwSectionFmt* pFmt : *mpSectionFmtTbl )
-        lcl_DelFmtIndices( pFmt );
+    for( SwFrameFormat* pFormat : *mpFrameFormatTable )
+        lcl_DelFormatIndices( pFormat );
+    for( SwFrameFormat* pFormat : *mpSpzFrameFormatTable )
+        lcl_DelFormatIndices( pFormat );
+    for( SwSectionFormat* pFormat : *mpSectionFormatTable )
+        lcl_DelFormatIndices( pFormat );
 
     // The formats/styles that follow depend on the default formats.
-    // Destroy these only after destroying the FmtIndices, because the content
+    // Destroy these only after destroying the FormatIndices, because the content
     // of headers/footers has to be deleted as well. If in the headers/footers
     // there are still Flys registered at that point, we have a problem.
     maPageDescs.clear();
@@ -498,25 +498,25 @@ SwDoc::~SwDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFtnInfo->ReleaseCollection();
+    mpFootnoteInfo->ReleaseCollection();
     mpEndNoteInfo->ReleaseCollection();
 
-    OSL_ENSURE( mpDfltTxtFmtColl == (*mpTxtFmtCollTbl)[0],
+    OSL_ENSURE( mpDfltTextFormatColl == (*mpTextFormatCollTable)[0],
             "Default-Text-Collection must always be at the start" );
 
     // Optimization: Based on the fact that Standard is always 2nd in the
     // array, we should delete it as the last. With this we avoid
     // reparenting the Formats all the time!
-    if( 2 < mpTxtFmtCollTbl->size() )
-        mpTxtFmtCollTbl->DeleteAndDestroy(2, mpTxtFmtCollTbl->size());
-    mpTxtFmtCollTbl->DeleteAndDestroy(1, mpTxtFmtCollTbl->size());
-    delete mpTxtFmtCollTbl;
+    if( 2 < mpTextFormatCollTable->size() )
+        mpTextFormatCollTable->DeleteAndDestroy(2, mpTextFormatCollTable->size());
+    mpTextFormatCollTable->DeleteAndDestroy(1, mpTextFormatCollTable->size());
+    delete mpTextFormatCollTable;
 
-    OSL_ENSURE( mpDfltGrfFmtColl == (*mpGrfFmtCollTbl)[0],
+    OSL_ENSURE( mpDfltGrfFormatColl == (*mpGrfFormatCollTable)[0],
             "DefaultGrfCollection must always be at the start" );
 
-    mpGrfFmtCollTbl->DeleteAndDestroy(1, mpGrfFmtCollTbl->size());
-    delete mpGrfFmtCollTbl;
+    mpGrfFormatCollTable->DeleteAndDestroy(1, mpGrfFormatCollTable->size());
+    delete mpGrfFormatCollTable;
 
     // Without explicitly freeing the DocumentDeviceManager
     // and relying on the implicit freeing there would be a crash
@@ -524,13 +524,13 @@ SwDoc::~SwDoc()
     m_pDeviceAccess.reset();
 
     /*
-     * DefaultFormats and DefaultFormatCollections (FmtColl)
+     * DefaultFormats and DefaultFormatCollections (FormatColl)
      * are at position 0 of their respective arrays.
      * In order to not be deleted by the array's dtor, we remove them
      * now.
      */
-    mpFrmFmtTbl->erase( mpFrmFmtTbl->begin() );
-    mpCharFmtTbl->erase( mpCharFmtTbl->begin() );
+    mpFrameFormatTable->erase( mpFrameFormatTable->begin() );
+    mpCharFormatTable->erase( mpCharFormatTable->begin() );
 
 #if HAVE_FEATURE_DBCONNECTIVITY
     DELETEZ( mpDBManager );
@@ -539,7 +539,7 @@ SwDoc::~SwDoc()
     // All Flys need to be destroyed before the Drawing Model,
     // because Flys can still contain DrawContacts, when no
     // Layout could be constructed due to a read error.
-    mpSpzFrmFmtTbl->DeleteAndDestroy( 0, mpSpzFrmFmtTbl->size() );
+    mpSpzFrameFormatTable->DeleteAndDestroy( 0, mpSpzFrameFormatTable->size() );
 
     // Only now destroy the Model, the drawing objects - which are also
     // contained in the Undo - need to remove their attributes from the
@@ -551,30 +551,30 @@ SwDoc::~SwDoc()
 
     // Clear the Tables before deleting the defaults, or we crash due to
     // dependencies on defaults.
-    delete mpFrmFmtTbl;
-    delete mpSpzFrmFmtTbl;
+    delete mpFrameFormatTable;
+    delete mpSpzFrameFormatTable;
 
     delete mpStyleAccess;
 
-    delete mpCharFmtTbl;
-    delete mpSectionFmtTbl;
-    delete mpTblFrmFmtTbl;
-    delete mpDfltTxtFmtColl;
-    delete mpDfltGrfFmtColl;
-    delete mpNumRuleTbl;
+    delete mpCharFormatTable;
+    delete mpSectionFormatTable;
+    delete mpTableFrameFormatTable;
+    delete mpDfltTextFormatColl;
+    delete mpDfltGrfFormatColl;
+    delete mpNumRuleTable;
 
     disposeXForms(); // #i113606#, dispose the XForms objects
 
     delete mpNumberFormatter;
-    delete mpFtnInfo;
+    delete mpFootnoteInfo;
     delete mpEndNoteInfo;
     delete mpLineNumberInfo;
-    delete mpFtnIdxs;
+    delete mpFootnoteIdxs;
     delete mpTOXTypes;
-    delete mpEmptyPageFmt;
-    delete mpColumnContFmt;
-    delete mpDfltCharFmt;
-    delete mpDfltFrmFmt;
+    delete mpEmptyPageFormat;
+    delete mpColumnContFormat;
+    delete mpDfltCharFormat;
+    delete mpDfltFrameFormat;
     delete mpLayoutCache;
 
     SfxItemPool::Free(mpAttrPool);
@@ -632,13 +632,13 @@ void SwDoc::ClearDoc()
     }
 
     // if there are still FlyFrames dangling around, delete them too
-    while ( !mpSpzFrmFmtTbl->empty() )
-        getIDocumentLayoutAccess().DelLayoutFmt((*mpSpzFrmFmtTbl)[mpSpzFrmFmtTbl->size()-1]);
+    while ( !mpSpzFrameFormatTable->empty() )
+        getIDocumentLayoutAccess().DelLayoutFormat((*mpSpzFrameFormatTable)[mpSpzFrameFormatTable->size()-1]);
     OSL_ENSURE( !GetDocumentDrawModelManager().GetDrawModel() || !GetDocumentDrawModelManager().GetDrawModel()->GetPage(0)->GetObjCount(),
                 "not all DrawObjects removed from the page" );
 
-    getIDocumentRedlineAccess().GetRedlineTbl().DeleteAndDestroyAll();
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetRedlineTable().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAndDestroyAll();
 
     delete mpACEWord;
 
@@ -652,12 +652,12 @@ void SwDoc::ClearDoc()
 
     SwNodeIndex aSttIdx( *GetNodes().GetEndOfContent().StartOfSectionNode(), 1 );
     // create the first one over and over again (without attributes/style etc.
-    SwTxtNode* pFirstNd = GetNodes().MakeTxtNode( aSttIdx, mpDfltTxtFmtColl );
+    SwTextNode* pFirstNd = GetNodes().MakeTextNode( aSttIdx, mpDfltTextFormatColl );
 
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // set the layout to the dummy pagedesc
-        pFirstNd->SetAttr( SwFmtPageDesc( pDummyPgDsc ));
+        pFirstNd->SetAttr( SwFormatPageDesc( pDummyPgDsc ));
 
         SwPosition aPos( *pFirstNd, SwIndex( pFirstNd ));
         SwPaM const tmpPaM(aSttIdx, SwNodeIndex(GetNodes().GetEndOfContent()));
@@ -671,9 +671,9 @@ void SwDoc::ClearDoc()
     // destruction of numbering rules and creation of new outline rule
     // *after* the document nodes are deleted.
     mpOutlineRule = NULL;
-    for( SwNumRule* pNumRule : *mpNumRuleTbl )
+    for( SwNumRule* pNumRule : *mpNumRuleTable )
         delete pNumRule;
-    mpNumRuleTbl->clear();
+    mpNumRuleTable->clear();
 
     // creation of new outline numbering rule
     mpOutlineRule = new SwNumRule( SwNumRule::GetOutlineRuleName(),
@@ -692,27 +692,27 @@ void SwDoc::ClearDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFtnInfo->ReleaseCollection();
+    mpFootnoteInfo->ReleaseCollection();
     mpEndNoteInfo->ReleaseCollection();
 
     // Optimization: Based on the fact that Standard is always 2nd in the
     // array, we should delete it as the last. With this we avoid
     // reparenting the Formats all the time!
-    if( 2 < mpTxtFmtCollTbl->size() )
-        mpTxtFmtCollTbl->DeleteAndDestroy(2, mpTxtFmtCollTbl->size());
-    mpTxtFmtCollTbl->DeleteAndDestroy(1, mpTxtFmtCollTbl->size());
-    mpGrfFmtCollTbl->DeleteAndDestroy(1, mpGrfFmtCollTbl->size());
-    mpCharFmtTbl->DeleteAndDestroy(1, mpCharFmtTbl->size());
+    if( 2 < mpTextFormatCollTable->size() )
+        mpTextFormatCollTable->DeleteAndDestroy(2, mpTextFormatCollTable->size());
+    mpTextFormatCollTable->DeleteAndDestroy(1, mpTextFormatCollTable->size());
+    mpGrfFormatCollTable->DeleteAndDestroy(1, mpGrfFormatCollTable->size());
+    mpCharFormatTable->DeleteAndDestroy(1, mpCharFormatTable->size());
 
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // search the FrameFormat of the root frm. This is not allowed to delete
-        mpFrmFmtTbl->erase( std::find( mpFrmFmtTbl->begin(), mpFrmFmtTbl->end(), getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFmt() ) );
-        mpFrmFmtTbl->DeleteAndDestroy(1, mpFrmFmtTbl->size());
-        mpFrmFmtTbl->push_back( getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFmt() );
+        mpFrameFormatTable->erase( std::find( mpFrameFormatTable->begin(), mpFrameFormatTable->end(), getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFormat() ) );
+        mpFrameFormatTable->DeleteAndDestroy(1, mpFrameFormatTable->size());
+        mpFrameFormatTable->push_back( getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFormat() );
     }
     else
-        mpFrmFmtTbl->DeleteAndDestroy(1, mpFrmFmtTbl->size());
+        mpFrameFormatTable->DeleteAndDestroy(1, mpFrameFormatTable->size());
 
     mxForbiddenCharsTable.clear();
 
@@ -721,7 +721,7 @@ void SwDoc::ClearDoc()
     delete mpNumberFormatter, mpNumberFormatter = 0;
 
     getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-    pFirstNd->ChgFmtColl( getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+    pFirstNd->ChgFormatColl( getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
     nDummyPgDsc = maPageDescs.size();
     maPageDescs.push_back( pDummyPgDsc );
     // set the layout back to the new standard pagedesc
@@ -767,9 +767,9 @@ void SwDoc::WriteLayoutCache( SvStream& rStream )
     SwLayoutCache::Write( rStream, *this );
 }
 
-IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode )
+IGrammarContact* getGrammarContact( const SwTextNode& rTextNode )
 {
-    const SwDoc* pDoc = rTxtNode.GetDoc();
+    const SwDoc* pDoc = rTextNode.GetDoc();
     if( !pDoc || pDoc->IsInDtor() )
         return 0;
     return pDoc->getGrammarContact();
@@ -901,7 +901,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
     SwNodeIndex aSourceEndIdx( rSource.GetNodes().GetEndOfContent(), -1 );
     SwPaM aCpyPam( aSourceIdx );
 
-    if ( aSourceEndIdx.GetNode().IsTxtNode() ) {
+    if ( aSourceEndIdx.GetNode().IsTextNode() ) {
         aCpyPam.SetMark();
         // moves to the last content node before EOC; for single paragraph
         // documents this would result in [n, n], which is considered empty
@@ -949,7 +949,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             // any marks, those are from the previous page: move them back
             // there, otherwise later we can't delete that empty text node.
             SwNodeIndex aNodeIndex(GetNodes().GetEndOfContent(), -1);
-            if (SwTxtNode* pTxtNode = aNodeIndex.GetNode().GetTxtNode())
+            if (SwTextNode* pTextNode = aNodeIndex.GetNode().GetTextNode())
             {
                 // Position of the last paragraph on the previous page.
                 --aNodeIndex;
@@ -957,7 +957,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
                 // Collect the marks starting or ending at this text node.
                 std::set<sw::mark::IMark*> aSeenMarks;
                 IDocumentMarkAccess* pMarkAccess = getIDocumentMarkAccess();
-                for (const SwIndex* pIndex = pTxtNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
+                for (const SwIndex* pIndex = pTextNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
                 {
                     sw::mark::IMark* pMark = const_cast<sw::mark::IMark*>(pIndex->GetMark());
                     if (!pMark)
@@ -992,7 +992,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
 #endif
 
     this->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
-    this->getIDocumentFieldsAccess().LockExpFlds();
+    this->getIDocumentFieldsAccess().LockExpFields();
 
     // Position where the appended doc starts. Will be filled in later (uses GetEndOfContent() because SwNodeIndex has no default ctor).
     SwNodeIndex aStartAppendIndex( GetNodes().GetEndOfContent() );
@@ -1030,9 +1030,9 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex();
                     nIdx <= nEndIdx; ++nIdx)
             {
-                SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode();
-                if ( pTxtNode )
-                    UpdateParRsid( pTxtNode );
+                SwTextNode *const pTextNode = rDestNodes[nIdx]->GetTextNode();
+                if ( pTextNode )
+                    UpdateParRsid( pTextNode );
             }
         }
 
@@ -1044,23 +1044,23 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             // this keeps all other settings as in the pasted document
             if ( nStartPageNumber || pTargetPageDesc ) {
                 SfxPoolItem *pNewItem;
-                SwTxtNode *aTxtNd = 0;
-                SwFmt *pFmt = 0;
+                SwTextNode *aTextNd = 0;
+                SwFormat *pFormat = 0;
 
                 // find the first node allowed to contain a RES_PAGEDESC
                 while (true) {
                     aFixupIdx++;
 
                     SwNode &node = aFixupIdx.GetNode();
-                    if ( node.IsTxtNode() ) {
+                    if ( node.IsTextNode() ) {
                         // every document contains at least one text node!
-                        aTxtNd = node.GetTxtNode();
-                        pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+                        aTextNd = node.GetTextNode();
+                        pNewItem = aTextNd->GetAttr( RES_PAGEDESC ).Clone();
                         break;
                     }
                     else if ( node.IsTableNode() ) {
-                        pFmt = node.GetTableNode()->GetTable().GetFrmFmt();
-                        pNewItem = pFmt->GetFmtAttr( RES_PAGEDESC ).Clone();
+                        pFormat = node.GetTableNode()->GetTable().GetFrameFormat();
+                        pNewItem = pFormat->GetFormatAttr( RES_PAGEDESC ).Clone();
                         break;
                     }
                 }
@@ -1070,7 +1070,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
     SAL_INFO( "sw.docappend", "Idx Fix " << CNTNT_IDX( aFixupIdx ) );
 #endif
                 // just update the original instead of overwriting
-                SwFmtPageDesc *aDesc = static_cast< SwFmtPageDesc* >( pNewItem );
+                SwFormatPageDesc *aDesc = static_cast< SwFormatPageDesc* >( pNewItem );
 #ifdef DBG_UTIL
 if ( aDesc->GetPageDesc() )
     SAL_INFO( "sw.docappend", "PD Update " << aDesc->GetPageDesc()->GetName() );
@@ -1081,10 +1081,10 @@ else
                     aDesc->SetNumOffset( nStartPageNumber );
                 if ( pTargetPageDesc )
                     aDesc->RegisterToPageDesc( *pTargetPageDesc );
-                if ( aTxtNd )
-                    aTxtNd->SetAttr( *aDesc );
+                if ( aTextNd )
+                    aTextNd->SetAttr( *aDesc );
                 else
-                    pFmt->SetFmtAttr( *aDesc );
+                    pFormat->SetFormatAttr( *aDesc );
                 delete pNewItem;
 
 #ifdef DBG_UTIL
@@ -1119,10 +1119,10 @@ else
         }
 
         // finally copy page bound frames
-        for ( auto pCpyFmt : *rSource.GetSpzFrmFmts() )
+        for ( auto pCpyFormat : *rSource.GetSpzFrameFormats() )
         {
-            const SwFrmFmt& rCpyFmt = *pCpyFmt;
-            SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+            const SwFrameFormat& rCpyFormat = *pCpyFormat;
+            SwFormatAnchor aAnchor( rCpyFormat.GetAnchor() );
             if (FLY_AT_PAGE != aAnchor.GetAnchorId())
                 continue;
 #ifdef DBG_UTIL
@@ -1131,14 +1131,14 @@ else
 #endif
             if ( pageOffset != 0 )
                 aAnchor.SetPageNum( aAnchor.GetPageNum() + pageOffset );
-            this->getIDocumentLayoutAccess().CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+            this->getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true );
         }
     }
 
     this->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
-    getIDocumentFieldsAccess().UnlockExpFlds();
-    getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    getIDocumentFieldsAccess().UnlockExpFields();
+    getIDocumentFieldsAccess().UpdateFields(NULL, false);
 
     if ( pTargetShell )
         pTargetShell->EndAllAction();
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 9b4e5efedcd8..f23053b3d070 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -69,12 +69,12 @@ namespace {
         // On a selection setup a corresponding Point-and-Mark in order to get
         // the indentation attribute reset on all paragraphs touched by the selection
         if ( rPam.HasMark() &&
-             rPam.End()->nNode.GetNode().GetTxtNode() )
+             rPam.End()->nNode.GetNode().GetTextNode() )
         {
             SwPaM aPam( rPam.Start()->nNode,
                         rPam.End()->nNode );
             aPam.Start()->nContent = 0;
-            aPam.End()->nContent = rPam.End()->nNode.GetNode().GetTxtNode()->Len();
+            aPam.End()->nContent = rPam.End()->nNode.GetNode().GetTextNode()->Len();
             pDoc->ResetAttrs( aPam, false, aResetAttrsArray );
         }
         else
@@ -116,23 +116,23 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     mpOutlineRule->SetAutoRule( true );
 
     // test whether the optional CharFormats are defined in this Document
-    mpOutlineRule->CheckCharFmts( this );
+    mpOutlineRule->CheckCharFormats( this );
 
     // notify text nodes, which are registered at the outline style, about the
     // changed outline style
-    SwNumRule::tTxtNodeList aTxtNodeList;
-    mpOutlineRule->GetTxtNodeList( aTxtNodeList );
-    for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-          aIter != aTxtNodeList.end(); ++aIter )
+    SwNumRule::tTextNodeList aTextNodeList;
+    mpOutlineRule->GetTextNodeList( aTextNodeList );
+    for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+          aIter != aTextNodeList.end(); ++aIter )
     {
-        SwTxtNode* pTxtNd = *aIter;
-        pTxtNd->NumRuleChgd();
+        SwTextNode* pTextNd = *aIter;
+        pTextNd->NumRuleChgd();
 
         // assure that list level corresponds to outline level
-        if ( pTxtNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle() &&
-             pTxtNd->GetAttrListLevel() != pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() )
+        if ( pTextNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle() &&
+             pTextNd->GetAttrListLevel() != pTextNd->GetTextColl()->GetAssignedOutlineStyleLevel() )
         {
-            pTxtNd->SetAttrListLevel( pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() );
+            pTextNd->SetAttrListLevel( pTextNd->GetTextColl()->GetAssignedOutlineStyleLevel() );
         }
     }
 
@@ -141,17 +141,17 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     UpdateNumRule();
 
     // update if we have foot notes && numbering by chapter
-    if( !GetFtnIdxs().empty() && FTNNUM_CHAPTER == GetFtnInfo().eNum )
-        GetFtnIdxs().UpdateAllFtn();
+    if( !GetFootnoteIdxs().empty() && FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
+        GetFootnoteIdxs().UpdateAllFootnote();
 
-    getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     getIDocumentState().SetModified();
 }
 
 void SwDoc::PropagateOutlineRule()
 {
-    for (auto pColl : *mpTxtFmtCollTbl)
+    for (auto pColl : *mpTextFormatCollTable)
     {
         if(pColl->IsAssignedToListLevelOfOutlineStyle())
         {
@@ -167,7 +167,7 @@ void SwDoc::PropagateOutlineRule()
                 {
                     SwNumRuleItem aNumItem( pMyOutlineRule->GetName() );
 
-                    pColl->SetFmtAttr(aNumItem);
+                    pColl->SetFormatAttr(aNumItem);
                 }
             }
         }
@@ -200,15 +200,15 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
 
     // Here we go:
     // 1. Create the style array:
-    SwTxtFmtColl* aCollArr[ MAXLEVEL ];
-    memset( aCollArr, 0, sizeof( SwTxtFmtColl* ) * MAXLEVEL );
+    SwTextFormatColl* aCollArr[ MAXLEVEL ];
+    memset( aCollArr, 0, sizeof( SwTextFormatColl* ) * MAXLEVEL );
 
-    for( auto pTxtFmtColl : *mpTxtFmtCollTbl )
+    for( auto pTextFormatColl : *mpTextFormatCollTable )
     {
-        if (pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle())
+        if (pTextFormatColl->IsAssignedToListLevelOfOutlineStyle())
         {
-            const int nLevel = pTxtFmtColl->GetAssignedOutlineStyleLevel();
-            aCollArr[ nLevel ] = pTxtFmtColl;
+            const int nLevel = pTextFormatColl->GetAssignedOutlineStyleLevel();
+            aCollArr[ nLevel ] = pTextFormatColl;
         }
     }
 
@@ -231,8 +231,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         {
             n++;
 
-            SwTxtFmtColl *aTmpColl =
-                getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
+            SwTextFormatColl *aTmpColl =
+                getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
 
             if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
                 aTmpColl->GetAssignedOutlineStyleLevel() == n )
@@ -260,8 +260,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         {
             n--;
 
-            SwTxtFmtColl *aTmpColl =
-                getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
+            SwTextFormatColl *aTmpColl =
+                getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
 
             if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
                 aTmpColl->GetAssignedOutlineStyleLevel() == n )
@@ -337,8 +337,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
     bool bMoveApplicable = true;
     for (auto i = nSttPos; i < nEndPos; ++i)
     {
-        SwTxtNode* pTxtNd = rOutlNds[ i ]->GetTxtNode();
-        SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+        SwTextNode* pTextNd = rOutlNds[ i ]->GetTextNode();
+        SwTextFormatColl* pColl = pTextNd->GetTextColl();
 
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
@@ -351,7 +351,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         // not an outline via a to outline style assigned paragraph style.
         else
         {
-            const int nNewOutlineLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
+            const int nNewOutlineLevel = pTextNd->GetAttrOutlineLevel() + nOffset;
             if ( nNewOutlineLevel < 1 || nNewOutlineLevel > MAXLEVEL )
             {
                 bMoveApplicable = false;
@@ -372,30 +372,30 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
     // 2. Apply the new style to all Nodes
     for (auto i = nSttPos; i < nEndPos; ++i)
     {
-        SwTxtNode* pTxtNd = rOutlNds[ i ]->GetTxtNode();
-        SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+        SwTextNode* pTextNd = rOutlNds[ i ]->GetTextNode();
+        SwTextFormatColl* pColl = pTextNd->GetTextColl();
 
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             const int nLevel = pColl->GetAssignedOutlineStyleLevel();
 
             OSL_ENSURE(aMoveArr[nLevel] >= 0,
-                "move table: current TxtColl not found when building table!");
+                "move table: current TextColl not found when building table!");
 
             if (nLevel < MAXLEVEL && aMoveArr[nLevel] >= 0)
             {
                 pColl = aCollArr[ aMoveArr[nLevel] ];
 
                 if (pColl != NULL)
-                    pTxtNd->ChgFmtColl( pColl );
+                    pTextNd->ChgFormatColl( pColl );
             }
 
         }
-        else if( pTxtNd->GetAttrOutlineLevel() > 0)
+        else if( pTextNd->GetAttrOutlineLevel() > 0)
         {
-            int nLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
+            int nLevel = pTextNd->GetAttrOutlineLevel() + nOffset;
             if( 0 <= nLevel && nLevel <= MAXLEVEL)
-                pTxtNd->SetAttrOutlineLevel( nLevel );
+                pTextNd->SetAttrOutlineLevel( nLevel );
 
         }
         // Undo ???
@@ -431,8 +431,8 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     int nOutLineLevel = MAXLEVEL;
     SwNode* pSrch = &aSttRg.GetNode();
 
-   if( pSrch->IsTxtNode())
-        nOutLineLevel = static_cast<sal_uInt8>(pSrch->GetTxtNode()->GetAttrOutlineLevel()-1);
+   if( pSrch->IsTextNode())
+        nOutLineLevel = static_cast<sal_uInt8>(pSrch->GetTextNode()->GetAttrOutlineLevel()-1);
     SwNode* pEndSrch = &aEndRg.GetNode();
     if( !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nAktPos ) )
     {
@@ -453,8 +453,8 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     // The criteria has to be the outline level: sub level => incorporate, same/higher level => no.
     if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) )
     {
-        if( !pEndSrch->IsTxtNode() || pEndSrch == pSrch ||
-            nOutLineLevel < pEndSrch->GetTxtNode()->GetAttrOutlineLevel()-1 )
+        if( !pEndSrch->IsTextNode() || pEndSrch == pSrch ||
+            nOutLineLevel < pEndSrch->GetTextNode()->GetAttrOutlineLevel()-1 )
             ++nTmpPos; // For sub outlines only!
     }
 
@@ -562,25 +562,25 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     return MoveParagraph( aPam, nOffs, true );
 }
 
-static SwTxtNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUString& rName,
+static SwTextNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUString& rName,
                             bool bExact )
 {
-    SwTxtNode* pSavedNode = nullptr;
+    SwTextNode* pSavedNode = nullptr;
     for( auto pOutlNd : rOutlNds )
     {
-        SwTxtNode* pTxtNd = pOutlNd->GetTxtNode();
-        const OUString sTxt( pTxtNd->GetExpandTxt() );
-        if (sTxt.startsWith(rName))
+        SwTextNode* pTextNd = pOutlNd->GetTextNode();
+        const OUString sText( pTextNd->GetExpandText() );
+        if (sText.startsWith(rName))
         {
-            if (sTxt.getLength() == rName.getLength())
+            if (sText.getLength() == rName.getLength())
             {
                 // Found "exact", set Pos to the Node
-                return pTxtNd;
+                return pTextNd;
             }
             if( !bExact && !pSavedNode )
             {
                 // maybe we just found the text's first part
-                pSavedNode = pTxtNd;
+                pSavedNode = pTextNd;
             }
         }
     }
@@ -588,7 +588,7 @@ static SwTxtNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUS
     return pSavedNode;
 }
 
-static SwTxtNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString& rName )
+static SwTextNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString& rName )
 {
     // Valid numbers are (always just offsets!):
     //  ([Number]+\.)+  (as a regular expression!)
@@ -643,7 +643,7 @@ static SwTxtNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString&
     // search in the existing outline nodes for the required outline num array
     for( auto pOutlNd : rOutlNds )
     {
-        SwTxtNode* pNd = pOutlNd->GetTxtNode();
+        SwTextNode* pNd = pOutlNd->GetTextNode();
         if ( pNd->GetAttrOutlineLevel() == nLevel )
         {
             // #i51089#, #i68289#
@@ -695,10 +695,10 @@ bool SwDoc::GotoOutline( SwPosition& rPos, const OUString& rName ) const
 
         // 1. step: via the Number:
         OUString sName( rName );
-        SwTxtNode* pNd = ::lcl_FindOutlineNum( rOutlNds, sName );
+        SwTextNode* pNd = ::lcl_FindOutlineNum( rOutlNds, sName );
         if ( pNd )
         {
-            OUString sExpandedText = pNd->GetExpandTxt();
+            OUString sExpandedText = pNd->GetExpandText();
             //#i4533# leading numbers followed by a dot have been remove while
             //searching for the outline position
             //to compensate this they must be removed from the paragraphs text content, too
@@ -714,7 +714,7 @@ bool SwDoc::GotoOutline( SwPosition& rPos, const OUString& rName ) const
 
             if( sExpandedText != sName )
             {
-                SwTxtNode *pTmpNd = ::lcl_FindOutlineName( rOutlNds, sName, true );
+                SwTextNode *pTmpNd = ::lcl_FindOutlineName( rOutlNds, sName, true );
                 if ( pTmpNd )             // found via the Name
                 {
                     pNd = pTmpNd;
@@ -754,29 +754,29 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
     if (!pOld) //we cannot proceed without the old NumRule
         return;
 
-    sal_uInt16 nChgFmtLevel = 0;
+    sal_uInt16 nChgFormatLevel = 0;
     sal_uInt16 nMask = 1;
 
     for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nMask <<= 1 )
     {
-        const SwNumFmt& rOldFmt = pOld->Get( n ), &rNewFmt = rRule.Get( n );
+        const SwNumFormat& rOldFormat = pOld->Get( n ), &rNewFormat = rRule.Get( n );
 
-        if ( rOldFmt != rNewFmt )
+        if ( rOldFormat != rNewFormat )
         {
-            nChgFmtLevel |= nMask;
+            nChgFormatLevel |= nMask;
         }
-        else if ( SVX_NUM_NUMBER_NONE > rNewFmt.GetNumberingType()
-                  && 1 < rNewFmt.GetIncludeUpperLevels()
-                  && 0 != ( nChgFmtLevel & GetUpperLvlChg( n, rNewFmt.GetIncludeUpperLevels(), nMask ) ) )
+        else if ( SVX_NUM_NUMBER_NONE > rNewFormat.GetNumberingType()
+                  && 1 < rNewFormat.GetIncludeUpperLevels()
+                  && 0 != ( nChgFormatLevel & GetUpperLvlChg( n, rNewFormat.GetIncludeUpperLevels(), nMask ) ) )
         {
-            nChgFmtLevel |= nMask;
+            nChgFormatLevel |= nMask;
         }
     }
 
-    if( !nChgFmtLevel )         // Nothing has been changed?
+    if( !nChgFormatLevel )         // Nothing has been changed?
     {
         const bool bInvalidateNumRule( pOld->IsContinusNum() != rRule.IsContinusNum() );
-        pOld->CheckCharFmts( &rDoc );
+        pOld->CheckCharFormats( &rDoc );
         pOld->SetContinusNum( rRule.IsContinusNum() );
 
         if ( bInvalidateNumRule )
@@ -787,29 +787,29 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
         return ;
     }
 
-    SwNumRule::tTxtNodeList aTxtNodeList;
-    pOld->GetTxtNodeList( aTxtNodeList );
+    SwNumRule::tTextNodeList aTextNodeList;
+    pOld->GetTextNodeList( aTextNodeList );
     sal_uInt8 nLvl( 0 );
-    for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-          aIter != aTxtNodeList.end(); ++aIter )
+    for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+          aIter != aTextNodeList.end(); ++aIter )
     {
-        SwTxtNode* pTxtNd = *aIter;
-        nLvl = static_cast<sal_uInt8>(pTxtNd->GetActualListLevel());
+        SwTextNode* pTextNd = *aIter;
+        nLvl = static_cast<sal_uInt8>(pTextNd->GetActualListLevel());
 
         if( nLvl < MAXLEVEL )
         {
-            if( nChgFmtLevel & ( 1 << nLvl ))
+            if( nChgFormatLevel & ( 1 << nLvl ))
             {
-                pTxtNd->NumRuleChgd();
+                pTextNd->NumRuleChgd();
             }
         }
     }
 
     for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
-        if ( nChgFmtLevel & ( 1 << n ) )
-            pOld->Set( n, rRule.GetNumFmt( n ) );
+        if ( nChgFormatLevel & ( 1 << n ) )
+            pOld->Set( n, rRule.GetNumFormat( n ) );
 
-    pOld->CheckCharFmts( &rDoc );
+    pOld->CheckCharFormats( &rDoc );
     pOld->SetInvalidRule( true );
     pOld->SetContinusNum( rRule.IsContinusNum() );
 
@@ -839,7 +839,7 @@ OUString SwDoc::SetNumRule( const SwPaM& rPam,
     if ( pNewOrChangedNumRule == NULL )
     {
         // create new numbering rule based on given one
-        pNewOrChangedNumRule = ( *mpNumRuleTbl )[MakeNumRule( rRule.GetName(), &rRule )];
+        pNewOrChangedNumRule = ( *mpNumRuleTable )[MakeNumRule( rRule.GetName(), &rRule )];
         bNewNumRuleCreated = true;
     }
     else if ( rRule != *pNewOrChangedNumRule )
@@ -887,31 +887,31 @@ OUString SwDoc::SetNumRule( const SwPaM& rPam,
 
     if ( !rPam.HasMark() )
     {
-        SwTxtNode * pTxtNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode * pTextNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
         // robust code: consider case that the PaM doesn't denote a text node - e.g. it denotes a graphic node
-        if ( pTxtNd != NULL )
+        if ( pTextNd != NULL )
         {
-            SwNumRule * pRule = pTxtNd->GetNumRule();
+            SwNumRule * pRule = pTextNd->GetNumRule();
 
             if (pRule && pRule->GetName() == pNewOrChangedNumRule->GetName())
             {
                 bSetItem = false;
-                if ( !pTxtNd->IsInList() )
+                if ( !pTextNd->IsInList() )
                 {
-                    pTxtNd->AddToList();
+                    pTextNd->AddToList();
                 }
             }
             // Only clear numbering attribute at text node, if at paragraph
             // style the new numbering rule is found.
             else if ( !pRule )
             {
-                SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+                SwTextFormatColl* pColl = pTextNd->GetTextColl();
                 if ( pColl )
                 {
                     SwNumRule* pCollRule = FindNumRulePtr(pColl->GetNumRule().GetValue());
                     if ( pCollRule && pCollRule->GetName() == pNewOrChangedNumRule->GetName() )
                     {
-                        pTxtNd->ResetAttr( RES_PARATR_NUMRULE );
+                        pTextNd->ResetAttr( RES_PARATR_NUMRULE );
                         bSetItem = false;
                     }
                 }
@@ -954,12 +954,12 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
 
 void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        const SwNumRule* pRule = pTxtNd->GetNumRule();
-        if( pRule && !bFlag != !pTxtNd->IsListRestart())
+        const SwNumRule* pRule = pTextNd->GetNumRule();
+        if( pRule && !bFlag != !pTextNd->IsListRestart())
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
@@ -967,7 +967,7 @@ void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            pTxtNd->SetListRestart(bFlag);
+            pTextNd->SetListRestart(bFlag);
 
             getIDocumentState().SetModified();
         }
@@ -976,19 +976,19 @@ void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
 
 void SwDoc::SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        if ( !pTxtNd->HasAttrListRestartValue() ||
-             pTxtNd->GetAttrListRestartValue() != nStt )
+        if ( !pTextNd->HasAttrListRestartValue() ||
+             pTextNd->GetAttrListRestartValue() != nStt )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 SwUndo *const pUndo( new SwUndoNumRuleStart(rPos, nStt) );
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
-            pTxtNd->SetAttrListRestartValue( nStt );
+            pTextNd->SetAttrListRestartValue( nStt );
 
             getIDocumentState().SetModified();
         }
@@ -1003,18 +1003,18 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
     if (nPos == USHRT_MAX)
         return false;
 
-    if ( (*mpNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
+    if ( (*mpNumRuleTable)[ nPos ] == GetOutlineNumRule() )
     {
         OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
         return false;
     }
 
-    if( !IsUsed( *(*mpNumRuleTbl)[ nPos ] ))
+    if( !IsUsed( *(*mpNumRuleTable)[ nPos ] ))
     {
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             SwUndo * pUndo =
-                new SwUndoNumruleDelete(*(*mpNumRuleTbl)[nPos], this);
+                new SwUndoNumruleDelete(*(*mpNumRuleTable)[nPos], this);
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
@@ -1027,8 +1027,8 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
         // #i34097# DeleteAndDestroy deletes rName if
         // rName is directly taken from the numrule.
         const OUString aTmpName( rName );
-        delete (*mpNumRuleTbl)[ nPos ];
-        mpNumRuleTbl->erase( mpNumRuleTbl->begin() + nPos );
+        delete (*mpNumRuleTable)[ nPos ];
+        mpNumRuleTable->erase( mpNumRuleTable->begin() + nPos );
         maNumRuleMap.erase(aTmpName);
 
         getIDocumentState().SetModified();
@@ -1037,7 +1037,7 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
     return false;
 }
 
-void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule )
+void SwDoc::ChgNumRuleFormats( const SwNumRule& rRule )
 {
     SwNumRule* pRule = FindNumRulePtr( rRule.GetName() );
     if( pRule )
@@ -1073,18 +1073,18 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        pNumRule->GetTxtNodeList( aTxtNodeList );
+        SwNumRule::tTextNodeList aTextNodeList;
+        pNumRule->GetTextNodeList( aTextNodeList );
 
         pNumRule->SetName( rNewName, getIDocumentListsAccess() );
 
         SwNumRuleItem aItem(rNewName);
 
-        for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-              aIter != aTxtNodeList.end(); ++aIter )
+        for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+              aIter != aTextNodeList.end(); ++aIter )
         {
-            SwTxtNode * pTxtNd = *aIter;
-            pTxtNd->SetAttr(aItem);
+            SwTextNode * pTextNd = *aIter;
+            pTextNd->SetAttr(aItem);
         }
 
         bResult = true;
@@ -1099,16 +1099,16 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
 
 void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
 {
-    for( sal_uInt16 n = GetNumRuleTbl().size(); n; )
+    for( sal_uInt16 n = GetNumRuleTable().size(); n; )
     {
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        GetNumRuleTbl()[ --n ]->GetTxtNodeList( aTxtNodeList );
-        for ( SwNumRule::tTxtNodeList::iterator aTxtNodeIter = aTxtNodeList.begin();
-              aTxtNodeIter != aTxtNodeList.end(); ++aTxtNodeIter )
+        SwNumRule::tTextNodeList aTextNodeList;
+        GetNumRuleTable()[ --n ]->GetTextNodeList( aTextNodeList );
+        for ( SwNumRule::tTextNodeList::iterator aTextNodeIter = aTextNodeList.begin();
+              aTextNodeIter != aTextNodeList.end(); ++aTextNodeIter )
         {
-            SwTxtNode* pTNd = *aTxtNodeIter;
-            SwIterator<SwTxtFrm,SwTxtNode> aIter(*pTNd);
-            for(SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+            SwTextNode* pTNd = *aTextNodeIter;
+            SwIterator<SwTextFrm,SwTextNode> aIter(*pTNd);
+            for(SwTextFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
                 if( pFrm->HasAnimation() )
                     pFrm->StopAnimation( pOut );
         }
@@ -1132,36 +1132,36 @@ bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        pOldRule->GetTxtNodeList( aTxtNodeList );
-        if ( aTxtNodeList.size() > 0 )
+        SwNumRule::tTextNodeList aTextNodeList;
+        pOldRule->GetTextNodeList( aTextNodeList );
+        if ( aTextNodeList.size() > 0 )
         {
             SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
-            sal_uInt16 nChgFmtLevel = 0;
+            sal_uInt16 nChgFormatLevel = 0;
             for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
             {
-                const SwNumFmt& rOldFmt = pOldRule->Get( n ),
-                    & rNewFmt = pNewRule->Get( n );
+                const SwNumFormat& rOldFormat = pOldRule->Get( n ),
+                    & rNewFormat = pNewRule->Get( n );
 
-                if( rOldFmt.GetAbsLSpace() != rNewFmt.GetAbsLSpace() ||
-                    rOldFmt.GetFirstLineOffset() != rNewFmt.GetFirstLineOffset() )
-                    nChgFmtLevel |= ( 1 << n );
+                if( rOldFormat.GetAbsLSpace() != rNewFormat.GetAbsLSpace() ||
+                    rOldFormat.GetFirstLineOffset() != rNewFormat.GetFirstLineOffset() )
+                    nChgFormatLevel |= ( 1 << n );
             }
 
-            const SwTxtNode* pGivenTxtNode = rPos.nNode.GetNode().GetTxtNode();
+            const SwTextNode* pGivenTextNode = rPos.nNode.GetNode().GetTextNode();
             SwNumRuleItem aRule( rNewRule );
-            for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-                  aIter != aTxtNodeList.end(); ++aIter )
+            for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+                  aIter != aTextNodeList.end(); ++aIter )
             {
-                SwTxtNode* pTxtNd = *aIter;
+                SwTextNode* pTextNd = *aIter;
 
-                if ( pGivenTxtNode &&
-                     pGivenTxtNode->GetListId() == pTxtNd->GetListId() )
+                if ( pGivenTextNode &&
+                     pGivenTextNode->GetListId() == pTextNd->GetListId() )
                 {
-                    aRegH.RegisterInModify( pTxtNd, *pTxtNd );
+                    aRegH.RegisterInModify( pTextNd, *pTextNd );
 
-                    pTxtNd->SetAttr( aRule );
-                    pTxtNd->NumRuleChgd();
+                    pTextNd->SetAttr( aRule );
+                    pTextNd->NumRuleChgd();
                 }
             }
             GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
@@ -1202,7 +1202,7 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
     const sal_uLong nEnd = rPaM.End()->nNode.GetIndex();
     for (sal_uLong n = nStt; n <= nEnd; n++)
     {
-        SwTxtNode * pCNd = GetNodes()[n]->GetTxtNode();
+        SwTextNode * pCNd = GetNodes()[n]->GetTextNode();
 
         if (pCNd)
         {
@@ -1262,7 +1262,7 @@ bool SwDoc::NoNum( const SwPaM& rPam )
     {
         // Set NoNum and Upate
         const SwNodeIndex& rIdx = rPam.GetPoint()->nNode;
-        SwTxtNode* pNd = rIdx.GetNode().GetTxtNode();
+        SwTextNode* pNd = rIdx.GetNode().GetTextNode();
         const SwNumRule* pRule = pNd->GetNumRule();
         if( pRule )
         {
@@ -1300,9 +1300,9 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
     const SwNode* pOutlNd = 0;
     for( ; nStt <= nEnd; ++nStt )
     {
-        SwTxtNode* pTNd = GetNodes()[ nStt ]->GetTxtNode();
-        SwNumRule* pNumRuleOfTxtNode = pTNd ? pTNd->GetNumRule() : 0;
-        if ( pTNd && pNumRuleOfTxtNode )
+        SwTextNode* pTNd = GetNodes()[ nStt ]->GetTextNode();
+        SwNumRule* pNumRuleOfTextNode = pTNd ? pTNd->GetNumRule() : 0;
+        if ( pTNd && pNumRuleOfTextNode )
         {
             // recognize changes of attribute for undo
             aRegH.RegisterInModify( pTNd, *pTNd );
@@ -1325,12 +1325,12 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
             pTNd->ResetAttr( RES_PARATR_LIST_RESTARTVALUE );
             pTNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
 
-            if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
+            if( RES_CONDTXTFMTCOLL == pTNd->GetFormatColl()->Which() )
             {
                 pTNd->ChkCondColl();
             }
             else if( !pOutlNd &&
-                     static_cast<SwTxtFmtColl*>(pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )
+                     static_cast<SwTextFormatColl*>(pTNd->GetFormatColl())->IsAssignedToListLevelOfOutlineStyle() )
             {
                 pOutlNd = pTNd;
             }
@@ -1341,13 +1341,13 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
     UpdateNumRule();
 
     if( pOutlNd )
-        GetNodes().UpdtOutlineIdx( *pOutlNd );
+        GetNodes().UpdateOutlineIdx( *pOutlNd );
 }
 
 void SwDoc::InvalidateNumRules()
 {
-    for (sal_uInt16 n = 0; n < mpNumRuleTbl->size(); ++n)
-        (*mpNumRuleTbl)[n]->SetInvalidRule(true);
+    for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
+        (*mpNumRuleTable)[n]->SetInvalidRule(true);
 }
 
 // To the next/preceding Bullet at the same Level
@@ -1394,7 +1394,7 @@ static bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
 static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
                             bool bOverUpper, sal_uInt8* pUpper, sal_uInt8* pLower )
 {
-    const SwTxtNode* pNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pNd = rPos.nNode.GetNode().GetTextNode();
     if( !pNd || 0 == pNd->GetNumRule() )
         return false;
 
@@ -1407,9 +1407,9 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
         bool bError = false;
         do {
             --aIdx;
-            if( aIdx.GetNode().IsTxtNode() )
+            if( aIdx.GetNode().IsTextNode() )
             {
-                pNd = aIdx.GetNode().GetTxtNode();
+                pNd = aIdx.GetNode().GetTextNode();
                 const SwNumRule* pRule = pNd->GetNumRule();
 
                 sal_uInt8 nTmpNum;
@@ -1435,7 +1435,7 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
     sal_uInt8 nLower = nSrchNum, nUpper = nSrchNum;
     bool bRet = false;
 
-    const SwTxtNode* pLast;
+    const SwTextNode* pLast;
     if( bNext )
         ++aIdx, pLast = pNd;
     else
@@ -1444,9 +1444,9 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
     while( bNext ? ( aIdx.GetIndex() < aIdx.GetNodes().Count() - 1 )
                  : aIdx.GetIndex() != 0 )
     {
-        if( aIdx.GetNode().IsTxtNode() )
+        if( aIdx.GetNode().IsTextNode() )
         {
-            pNd = aIdx.GetNode().GetTxtNode();
+            pNd = aIdx.GetNode().GetTextNode();
             const SwNumRule* pRule = pNd->GetNumRule();
             if( pRule )
             {
@@ -1454,7 +1454,7 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
                                     static_cast<sal_uInt8>(pNd->GetActualListLevel()) ))
                 {
                     rPos.nNode = aIdx;
-                    rPos.nContent.Assign( const_cast<SwTxtNode*>(pNd), 0 );
+                    rPos.nContent.Assign( const_cast<SwTextNode*>(pNd), 0 );
                     bRet = true;
                     break;
                 }
@@ -1478,13 +1478,13 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
         if( bNext )
         {
             rPos.nNode = aIdx;
-            if( aIdx.GetNode().IsCntntNode() )
-                rPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), 0 );
+            if( aIdx.GetNode().IsContentNode() )
+                rPos.nContent.Assign( aIdx.GetNode().GetContentNode(), 0 );
         }
         else
         {
             rPos.nNode.Assign( *pLast );
-            rPos.nContent.Assign( const_cast<SwTxtNode*>(pLast), 0 );
+            rPos.nContent.Assign( const_cast<SwTextNode*>(pLast), 0 );
         }
         bRet = true;
     }
@@ -1514,10 +1514,10 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                                         const bool bInvestigateStartNode)
 {
     const SwNumRule * pResult = NULL;
-    SwTxtNode * pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    SwNode * pStartFromNode = pTxtNd;
+    SwTextNode * pTextNd = rPos.nNode.GetNode().GetTextNode();
+    SwNode * pStartFromNode = pTextNd;
 
-    if (pTxtNd)
+    if (pTextNd)
     {
         SwNodeIndex aIdx(rPos.nNode);
 
@@ -1533,25 +1533,25 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                     --aIdx;
             }
 
-            if (aIdx.GetNode().IsTxtNode())
+            if (aIdx.GetNode().IsTextNode())
             {
-                pTxtNd = aIdx.GetNode().GetTxtNode();
+                pTextNd = aIdx.GetNode().GetTextNode();
 
-                const SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                const SwNumRule * pNumRule = pTextNd->GetNumRule();
                 if (pNumRule)
                 {
                     if ( ( pNumRule->IsOutlineRule() == bOutline ) &&
                          ( ( bNum && pNumRule->Get(0).IsEnumeration()) ||
                            ( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
                     {
-                        pResult = pTxtNd->GetNumRule();
+                        pResult = pTextNd->GetNumRule();
                         // provide also the list id, to which the text node belongs.
-                        sListId = pTxtNd->GetListId();
+                        sListId = pTextNd->GetListId();
                     }
 
                     break;
                 }
-                else if (pTxtNd->Len() > 0 || NULL != pTxtNd->GetNumRule())
+                else if (pTextNd->Len() > 0 || NULL != pTextNd->GetNumRule())
                 {
                     if (nNonEmptyAllowed == 0)
                         break;
@@ -1600,11 +1600,11 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
     bool bOnlyNonOutline = true;
     for (sal_uLong n = nStt; n <= nEnd; n++)
     {
-        SwTxtNode * pTxtNd = GetNodes()[n]->GetTxtNode();
+        SwTextNode * pTextNd = GetNodes()[n]->GetTextNode();
 
-        if (pTxtNd)
+        if (pTextNd)
         {
-            SwNumRule * pRule = pTxtNd->GetNumRule();
+            SwNumRule * pRule = pTextNd->GetNumRule();
 
             if (pRule)
             {
@@ -1629,7 +1629,7 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
         */
         for (sal_uLong nTmp = nStt; nTmp <= nEnd; ++nTmp)
         {
-            SwTxtNode* pTNd = GetNodes()[ nTmp ]->GetTxtNode();
+            SwTextNode* pTNd = GetNodes()[ nTmp ]->GetTextNode();
 
             // Make code robust: consider case that the node doesn't denote a
             // text node.
@@ -1657,7 +1657,7 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
 
             for(sal_uLong nTmp = nStt; nTmp <= nEnd; ++nTmp )
             {
-                SwTxtNode* pTNd = GetNodes()[ nTmp ]->GetTxtNode();
+                SwTextNode* pTNd = GetNodes()[ nTmp ]->GetTextNode();
 
                 if( pTNd)
                 {
@@ -1787,14 +1787,14 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         {
             SwPosition aStPos( *pStt ), aEndPos( *pEnd );
             aStPos.nContent = 0;
-            SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = pEnd->nNode.GetNode().GetContentNode();
             aEndPos.nContent = pCNd ? pCNd->Len() : 1;
             bool bCheckDel = true;
 
             // There is a some Redline Delete Object for the range
-            for( ; nRedlPos < getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nRedlPos )
+            for( ; nRedlPos < getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlPos )
             {
-                const SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+                const SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
                 if( !bCheckDel || nsRedlineType_t::REDLINE_DELETE == pTmp->GetType() )
                 {
                     const SwPosition *pRStt = pTmp->Start(), *pREnd = pTmp->End();
@@ -1802,7 +1802,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                     {
                     case POS_COLLIDE_START:
                     case POS_BEHIND:            // Pos1 comes after Pos2
-                        nRedlPos = getIDocumentRedlineAccess().GetRedlineTbl().size();
+                        nRedlPos = getIDocumentRedlineAccess().GetRedlineTable().size();
                         break;
 
                     case POS_COLLIDE_END:
@@ -1842,10 +1842,10 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         sal_uInt16 nRedlPos = getIDocumentRedlineAccess().GetRedlinePos( pStt->nNode.GetNode(), nsRedlineType_t::REDLINE_INSERT );
         if( USHRT_MAX != nRedlPos )
         {
-            SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+            SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
             const SwPosition *pRStt = pTmp->Start(), *pREnd = pTmp->End();
             SwRangeRedline aTmpRedl( nsRedlineType_t::REDLINE_INSERT, rPam );
-            const SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+            const SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
             // Is completely in the range and is the own Redline too?
             if( aTmpRedl.IsOwnRedline( *pTmp ) &&
                 (pRStt->nNode < pStt->nNode ||
@@ -1856,9 +1856,9 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                          : !pREnd->nContent.GetIndex() )) )
             {
                 pOwnRedl = pTmp;
-                if( nRedlPos + 1 < (sal_uInt16)getIDocumentRedlineAccess().GetRedlineTbl().size() )
+                if( nRedlPos + 1 < (sal_uInt16)getIDocumentRedlineAccess().GetRedlineTable().size() )
                 {
-                    pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos+1 ];
+                    pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos+1 ];
                     if( *pTmp->Start() == *pREnd )
                         // then don't!
                         pOwnRedl = 0;
@@ -1879,7 +1879,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
 
             // First the Insert, then the Delete
             SwPosition aInsPos( aIdx );
-            aInsPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), 0 );
+            aInsPos.nContent.Assign( aIdx.GetNode().GetContentNode(), 0 );
 
             SwPaM aPam( pStt->nNode, aMvRg.aEnd );
 
@@ -1887,7 +1887,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             rOrigPam.DeleteMark();
             rOrigPam.GetPoint()->nNode = aIdx.GetIndex() - 1;
 
-            bool bDelLastPara = !aInsPos.nNode.GetNode().IsCntntNode();
+            bool bDelLastPara = !aInsPos.nNode.GetNode().IsContentNode();
 
             /* When copying to a non-content node Copy will
                insert a paragraph before that node and insert before
@@ -1909,7 +1909,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                        found. The new position to insert the moved
                        paragraph at is before the inserted
                        paragraph. */
-                    getIDocumentContentOperations().AppendTxtNode(*aInsPam.GetPoint());
+                    getIDocumentContentOperations().AppendTextNode(*aInsPam.GetPoint());
                     aInsPos = *aInsPam.GetPoint();
                 }
             }
@@ -1919,25 +1919,25 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             {
                 // We need to remove the last empty Node again
                 aIdx = aInsPos.nNode;
-                SwCntntNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
+                SwContentNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
                 aInsPos.nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 
                 // All, that are in the to-be-deleted Node, need to be
                 // moved to the next Node
-                for( sal_uInt16 n = 0; n < getIDocumentRedlineAccess().GetRedlineTbl().size(); ++n )
+                for( sal_uInt16 n = 0; n < getIDocumentRedlineAccess().GetRedlineTable().size(); ++n )
                 {
-                    SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ n ];
+                    SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ n ];
 
                     SwPosition* pPos;
                     if( ( pPos = &pTmp->GetBound(true))->nNode == aIdx )
                     {
                         ++pPos->nNode;
-                        pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0);
+                        pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0);
                     }
                     if( ( pPos = &pTmp->GetBound(false))->nNode == aIdx )
                     {
                         ++pPos->nNode;
-                        pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0);
+                        pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0);
                     }
                 }
                 CorrRel( aIdx, aInsPos, 0, false );
@@ -1947,7 +1947,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             }
 
             ++rOrigPam.GetPoint()->nNode;
-            rOrigPam.GetPoint()->nContent.Assign( rOrigPam.GetCntntNode(), 0 );
+            rOrigPam.GetPoint()->nContent.Assign( rOrigPam.GetContentNode(), 0 );
 
             RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
             GetDocumentRedlineManager().checkRedlining(eOld);
@@ -1979,7 +1979,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         }
     }
 
-    if( !pOwnRedl && !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pOwnRedl && !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         SwPaM aTemp(aIdx);
         getIDocumentRedlineAccess().SplitRedline(aTemp);
@@ -2020,12 +2020,12 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         if( pRStt->nNode.GetIndex() != nRedlSttNd )
         {
             pRStt->nNode = nRedlSttNd;
-            pRStt->nContent.Assign( pRStt->nNode.GetNode().GetCntntNode(),0);
+            pRStt->nContent.Assign( pRStt->nNode.GetNode().GetContentNode(),0);
         }
         if( pREnd->nNode.GetIndex() != nRedlEndNd )
         {
             pREnd->nNode = nRedlEndNd;
-            SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = pREnd->nNode.GetNode().GetContentNode();
             pREnd->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
         }
     }
@@ -2037,16 +2037,16 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
 bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
 {
     bool bResult = false;
-    SwTxtNode * pTxtNd = rIdx.GetNode().GetTxtNode();
+    SwTextNode * pTextNd = rIdx.GetNode().GetTextNode();
 
-    if (pTxtNd && pTxtNd->GetNumRule() != NULL &&
-        (pTxtNd->HasNumber() || pTxtNd->HasBullet()))
+    if (pTextNd && pTextNd->GetNumRule() != NULL &&
+        (pTextNd->HasNumber() || pTextNd->HasBullet()))
     {
-        if ( !pTxtNd->IsCountedInList() == !bDel)
+        if ( !pTextNd->IsCountedInList() == !bDel)
         {
             bool bOldNum = bDel;
             bool bNewNum = !bDel;
-            pTxtNd->SetCountedInList(bNewNum);
+            pTextNd->SetCountedInList(bNewNum);
 
             getIDocumentState().SetModified();
 
@@ -2060,11 +2060,11 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
         }
-        else if (bDel && pTxtNd->GetNumRule(false) &&
-                 pTxtNd->GetActualListLevel() >= 0 &&
-                 pTxtNd->GetActualListLevel() < MAXLEVEL)
+        else if (bDel && pTextNd->GetNumRule(false) &&
+                 pTextNd->GetActualListLevel() >= 0 &&
+                 pTextNd->GetActualListLevel() < MAXLEVEL)
         {
-            SwPaM aPam(*pTxtNd);
+            SwPaM aPam(*pTextNd);
             DelNumRules(aPam);
 
             bResult = true;
@@ -2077,7 +2077,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
 SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 {
     SwNumRule* pRet = NULL;
-    SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
 
     if ( pTNd != NULL )
     {
@@ -2089,8 +2089,8 @@ SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 
 sal_uInt16 SwDoc::FindNumRule( const OUString& rName ) const
 {
-    for( sal_uInt16 n = mpNumRuleTbl->size(); n; )
-        if( (*mpNumRuleTbl)[ --n ]->GetName() == rName )
+    for( sal_uInt16 n = mpNumRuleTable->size(); n; )
+        if( (*mpNumRuleTable)[ --n ]->GetName() == rName )
             return n;
 
     return USHRT_MAX;
@@ -2104,11 +2104,11 @@ SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 
     if ( !pResult )
     {
-        for (sal_uInt16 n = 0; n < mpNumRuleTbl->size(); ++n)
+        for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
         {
-            if ((*mpNumRuleTbl)[n]->GetName() == rName)
+            if ((*mpNumRuleTable)[n]->GetName() == rName)
             {
-                pResult = (*mpNumRuleTbl)[n];
+                pResult = (*mpNumRuleTable)[n];
 
                 break;
             }
@@ -2120,12 +2120,12 @@ SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 
 void SwDoc::AddNumRule(SwNumRule * pRule)
 {
-    if ((SAL_MAX_UINT16 - 1) <= mpNumRuleTbl->size())
+    if ((SAL_MAX_UINT16 - 1) <= mpNumRuleTable->size())
     {
         OSL_ENSURE(false, "SwDoc::AddNumRule: table full.");
         abort(); // this should never happen on real documents
     }
-    mpNumRuleTbl->push_back(pRule);
+    mpNumRuleTable->push_back(pRule);
     maNumRuleMap[pRule->GetName()] = pRule;
     pRule->SetNumRuleMap(&maNumRuleMap);
 
@@ -2146,12 +2146,12 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
 
         if( pNew->GetName() != rName )
         {
-            pNew->SetPoolFmtId( USHRT_MAX );
+            pNew->SetPoolFormatId( USHRT_MAX );
             pNew->SetPoolHelpId( USHRT_MAX );
             pNew->SetPoolHlpFileId( UCHAR_MAX );
             pNew->SetDefaultListId( OUString() );
         }
-        pNew->CheckCharFmts( this );
+        pNew->CheckCharFormats( this );
     }
     else
     {
@@ -2159,7 +2159,7 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
                               eDefaultNumberFormatPositionAndSpaceMode );
     }
 
-    sal_uInt16 nRet = mpNumRuleTbl->size();
+    sal_uInt16 nRet = mpNumRuleTable->size();
 
     AddNumRule(pNew);
 
@@ -2184,7 +2184,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     {
         OUString newName = "MailMergeNumRule"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpNumRuleTbl->size() + 1 );
+            + OUString::number( mpNumRuleTable->size() + 1 );
         return newName;
     }
 
@@ -2216,7 +2216,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
         aName = SW_RESSTR( STR_NUMRULE_DEFNAME );
     }
 
-    sal_uInt16 nNum(0), nTmp, nFlagSize = ( mpNumRuleTbl->size() / 8 ) +2;
+    sal_uInt16 nNum(0), nTmp, nFlagSize = ( mpNumRuleTable->size() / 8 ) +2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
@@ -2236,15 +2236,15 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     const SwNumRule* pNumRule;
     sal_uInt16 n;
 
-    for( n = 0; n < mpNumRuleTbl->size(); ++n )
-        if( 0 != ( pNumRule = (*mpNumRuleTbl)[ n ] ) )
+    for( n = 0; n < mpNumRuleTable->size(); ++n )
+        if( 0 != ( pNumRule = (*mpNumRuleTable)[ n ] ) )
         {
             const OUString sNm = pNumRule->GetName();
             if( sNm.startsWith( aName ) )
             {
                 // Determine Number and set the Flag
                 nNum = (sal_uInt16)sNm.copy( nNmLen ).toInt32();
-                if( nNum-- && nNum < mpNumRuleTbl->size() )
+                if( nNum-- && nNum < mpNumRuleTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if( pChkStr && *pChkStr==sNm )
@@ -2254,7 +2254,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     if( !pChkStr )
     {
         // All Numbers have been flagged accordingly, so identify the right Number
-        nNum = mpNumRuleTbl->size();
+        nNum = mpNumRuleTable->size();
         for( n = 0; n < nFlagSize; ++n )
             if( 0xff != ( nTmp = pSetFlags[ n ] ))
             {
@@ -2273,10 +2273,10 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
 
 void SwDoc::UpdateNumRule()
 {
-    const SwNumRuleTbl& rNmTbl = GetNumRuleTbl();
-    for( sal_uInt16 n = 0; n < rNmTbl.size(); ++n )
-        if( rNmTbl[ n ]->IsInvalidRule() )
-            rNmTbl[ n ]->Validate();
+    const SwNumRuleTable& rNmTable = GetNumRuleTable();
+    for( sal_uInt16 n = 0; n < rNmTable.size(); ++n )
+        if( rNmTable[ n ]->IsInvalidRule() )
+            rNmTable[ n ]->Validate();
 }
 
 void SwDoc::MarkListLevel( const OUString& sListId,
@@ -2303,10 +2303,10 @@ bool SwDoc::IsFirstOfNumRuleAtPos( const SwPosition & rPos )
 {
     bool bResult = false;
 
-    const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-    if ( pTxtNode != NULL )
+    const SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+    if ( pTextNode != NULL )
     {
-        bResult = pTxtNode->IsFirstOfNumRule();
+        bResult = pTextNode->IsFirstOfNumRule();
     }
 
     return bResult;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 421333156160..3f71cf9a11fc 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -54,13 +54,13 @@ using namespace com::sun::star;
 
     void sw_DebugRedline( const SwDoc* pDoc )
     {
-        static SwRedlineTbl::size_type nWatch = 0;
-        const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+        static SwRedlineTable::size_type nWatch = 0;
+        const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
         {
-            SwRedlineTbl::size_type nDummy = 0;
-            const SwRangeRedline* pCurrent = rTbl[ n ];
-            const SwRangeRedline* pNext = n+1 < rTbl.size() ? rTbl[ n+1 ] : 0;
+            SwRedlineTable::size_type nDummy = 0;
+            const SwRangeRedline* pCurrent = rTable[ n ];
+            const SwRangeRedline* pNext = n+1 < rTable.size() ? rTable[ n+1 ] : 0;
             if( pCurrent == pNext )
                 ++nDummy;
             if( n == nWatch )
@@ -71,14 +71,14 @@ using namespace com::sun::star;
 #endif
 
 
-SwExtraRedlineTbl::~SwExtraRedlineTbl()
+SwExtraRedlineTable::~SwExtraRedlineTable()
 {
     DeleteAndDestroyAll();
 }
 
-void SwExtraRedlineTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwExtraRedlineTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedlineTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedlineTable"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
 
     for (sal_uInt16 nCurExtraRedlinePos = 0; nCurExtraRedlinePos < GetSize(); ++nCurExtraRedlinePos)
@@ -118,7 +118,7 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
 }
 #endif
 
-bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -197,7 +197,7 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
     return bChg;
 }
 
-bool SwExtraRedlineTbl::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -244,7 +244,7 @@ bool SwExtraRedlineTbl::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& r
     return bChg;
 }
 
-bool SwExtraRedlineTbl::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -291,11 +291,11 @@ bool SwExtraRedlineTbl::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& r
     return bChg;
 }
 
-bool SwRedlineTbl::Insert( SwRangeRedline* p, bool bIns )
+bool SwRedlineTable::Insert( SwRangeRedline* p, bool bIns )
 {
     if( p->HasValidRange() )
     {
-        std::pair<_SwRedlineTbl::const_iterator, bool> rv = insert( p );
+        std::pair<_SwRedlineTable::const_iterator, bool> rv = insert( p );
         size_t nP = rv.first - begin();
         p->CallDisplayFunc(0, nP);
         return rv.second;
@@ -307,11 +307,11 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, bool bIns )
     return false;
 }
 
-bool SwRedlineTbl::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
+bool SwRedlineTable::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
 {
     if( p->HasValidRange() )
     {
-        std::pair<_SwRedlineTbl::const_iterator, bool> rv = insert( p );
+        std::pair<_SwRedlineTable::const_iterator, bool> rv = insert( p );
         rP = rv.first - begin();
         p->CallDisplayFunc(0, rP);
         return rv.second;
@@ -323,7 +323,7 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
     return false;
 }
 
-bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos )
+bool SwRedlineTable::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos )
 {
     // Create valid "sub-ranges" from the Selection
     bool bAnyIns = false;
@@ -331,9 +331,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
               * pEnd = pStt == p->GetPoint() ? p->GetMark() : p->GetPoint();
     SwPosition aNewStt( *pStt );
     SwNodes& rNds = aNewStt.nNode.GetNodes();
-    SwCntntNode* pC;
+    SwContentNode* pC;
 
-    if( !aNewStt.nNode.GetNode().IsCntntNode() )
+    if( !aNewStt.nNode.GetNode().IsContentNode() )
     {
         pC = rNds.GoNext( &aNewStt.nNode );
         if( pC )
@@ -388,8 +388,8 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
                             else
                                 break;
                         }
-                        else if( rCurNd.IsCntntNode() )
-                            pC = rCurNd.GetCntntNode();
+                        else if( rCurNd.IsContentNode() )
+                            pC = rCurNd.GetContentNode();
                         ++aNewStt.nNode;
                     } while( aNewStt.nNode.GetIndex() < pEnd->nNode.GetIndex() );
 
@@ -434,17 +434,17 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
     return bAnyIns;
 }
 
-bool CompareSwRedlineTbl::operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const
+bool CompareSwRedlineTable::operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const
 {
     return *lhs < *rhs;
 }
 
-_SwRedlineTbl::~_SwRedlineTbl()
+_SwRedlineTable::~_SwRedlineTable()
 {
     DeleteAndDestroyAll();
 }
 
-sal_uInt16 SwRedlineTbl::GetPos(const SwRangeRedline* p) const
+sal_uInt16 SwRedlineTable::GetPos(const SwRangeRedline* p) const
 {
     const_iterator it = find(const_cast<SwRangeRedline* const>(p));
     if( it == end() )
@@ -452,7 +452,7 @@ sal_uInt16 SwRedlineTbl::GetPos(const SwRangeRedline* p) const
     return it - begin();
 }
 
-bool SwRedlineTbl::Remove( const SwRangeRedline* p )
+bool SwRedlineTable::Remove( const SwRangeRedline* p )
 {
     const sal_uInt16 nPos = GetPos(p);
     if (nPos == USHRT_MAX)
@@ -461,7 +461,7 @@ bool SwRedlineTbl::Remove( const SwRangeRedline* p )
     return true;
 }
 
-void SwRedlineTbl::Remove( sal_uInt16 nP )
+void SwRedlineTable::Remove( sal_uInt16 nP )
 {
     SwDoc* pDoc = 0;
     if( !nP && 1 == size() )
@@ -475,12 +475,12 @@ void SwRedlineTbl::Remove( sal_uInt16 nP )
         pSh->InvalidateWindows( SwRect( 0, 0, SAL_MAX_INT32, SAL_MAX_INT32 ) );
 }
 
-void SwRedlineTbl::DeleteAndDestroyAll()
+void SwRedlineTable::DeleteAndDestroyAll()
 {
     DeleteAndDestroy(0, size());
 }
 
-void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
+void SwRedlineTable::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     SwDoc* pDoc = 0;
     if( !nP && nL && nL == size() )
@@ -496,14 +496,14 @@ void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
         pSh->InvalidateWindows( SwRect( 0, 0, SAL_MAX_INT32, SAL_MAX_INT32 ) );
 }
 
-sal_uInt16 SwRedlineTbl::FindNextOfSeqNo( sal_uInt16 nSttPos ) const
+sal_uInt16 SwRedlineTable::FindNextOfSeqNo( sal_uInt16 nSttPos ) const
 {
     return static_cast<size_t>(nSttPos) + 1 < size()
                 ? FindNextSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos+1 )
                 : USHRT_MAX;
 }
 
-sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
+sal_uInt16 SwRedlineTable::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
 {
     return nSttPos ? FindPrevSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos-1 )
                    : USHRT_MAX;
@@ -511,7 +511,7 @@ sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
 
 /// Find the next or preceding Redline with the same seq.no.
 /// We can limit the search using look ahead (0 searches the whole array).
-sal_uInt16 SwRedlineTbl::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+sal_uInt16 SwRedlineTable::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
                                     sal_uInt16 nLookahead ) const
 {
     sal_uInt16 nRet = USHRT_MAX;
@@ -537,7 +537,7 @@ sal_uInt16 SwRedlineTbl::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
     return nRet;
 }
 
-sal_uInt16 SwRedlineTbl::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+sal_uInt16 SwRedlineTable::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
                                     sal_uInt16 nLookahead ) const
 {
     sal_uInt16 nRet = USHRT_MAX;
@@ -558,7 +558,7 @@ sal_uInt16 SwRedlineTbl::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
     return nRet;
 }
 
-const SwRangeRedline* SwRedlineTbl::FindAtPosition( const SwPosition& rSttPos,
+const SwRangeRedline* SwRedlineTable::FindAtPosition( const SwPosition& rSttPos,
                                         sal_uInt16& rPos,
                                         bool bNext ) const
 {
@@ -586,12 +586,12 @@ const SwRangeRedline* SwRedlineTbl::FindAtPosition( const SwPosition& rSttPos,
     return pFnd;
 }
 
-void SwRedlineTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwRedlineTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swRedlineTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swRedlineTable"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
 
-    for (SwRedlineTbl::size_type nCurRedlinePos = 0; nCurRedlinePos < size(); ++nCurRedlinePos)
+    for (SwRedlineTable::size_type nCurRedlinePos = 0; nCurRedlinePos < size(); ++nCurRedlinePos)
         operator[](nCurRedlinePos)->dumpAsXml(pWriter);
 
     xmlTextWriterEndElement(pWriter);
@@ -610,44 +610,44 @@ bool SwRedlineExtraData::operator == ( const SwRedlineExtraData& ) const
     return false;
 }
 
-SwRedlineExtraData_FmtColl::SwRedlineExtraData_FmtColl( const OUString& rColl,
-                                                sal_uInt16 nPoolFmtId,
+SwRedlineExtraData_FormatColl::SwRedlineExtraData_FormatColl( const OUString& rColl,
+                                                sal_uInt16 nPoolFormatId,
                                                 const SfxItemSet* pItemSet )
-    : sFmtNm(rColl), pSet(0), nPoolId(nPoolFmtId)
+    : sFormatNm(rColl), pSet(0), nPoolId(nPoolFormatId)
 {
     if( pItemSet && pItemSet->Count() )
         pSet = new SfxItemSet( *pItemSet );
 }
 
-SwRedlineExtraData_FmtColl::~SwRedlineExtraData_FmtColl()
+SwRedlineExtraData_FormatColl::~SwRedlineExtraData_FormatColl()
 {
     delete pSet;
 }
 
-SwRedlineExtraData* SwRedlineExtraData_FmtColl::CreateNew() const
+SwRedlineExtraData* SwRedlineExtraData_FormatColl::CreateNew() const
 {
-    return new SwRedlineExtraData_FmtColl( sFmtNm, nPoolId, pSet );
+    return new SwRedlineExtraData_FormatColl( sFormatNm, nPoolId, pSet );
 }
 
-void SwRedlineExtraData_FmtColl::Reject( SwPaM& rPam ) const
+void SwRedlineExtraData_FormatColl::Reject( SwPaM& rPam ) const
 {
     SwDoc* pDoc = rPam.GetDoc();
 
     // What about Undo? Is it turned off?
-    SwTxtFmtColl* pColl = USHRT_MAX == nPoolId
-                            ? pDoc->FindTxtFmtCollByName( sFmtNm )
-                            : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId );
+    SwTextFormatColl* pColl = USHRT_MAX == nPoolId
+                            ? pDoc->FindTextFormatCollByName( sFormatNm )
+                            : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId );
     if( pColl )
-        pDoc->SetTxtFmtColl( rPam, pColl, false );
+        pDoc->SetTextFormatColl( rPam, pColl, false );
 
     if( pSet )
     {
         rPam.SetMark();
         SwPosition& rMark = *rPam.GetMark();
-        SwTxtNode* pTNd = rMark.nNode.GetNode().GetTxtNode();
+        SwTextNode* pTNd = rMark.nNode.GetNode().GetTextNode();
         if( pTNd )
         {
-            rMark.nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+            rMark.nContent.Assign(pTNd, pTNd->GetText().getLength());
 
             if( pTNd->HasSwAttrSet() )
             {
@@ -666,15 +666,15 @@ void SwRedlineExtraData_FmtColl::Reject( SwPaM& rPam ) const
     }
 }
 
-bool SwRedlineExtraData_FmtColl::operator == ( const SwRedlineExtraData& r) const
+bool SwRedlineExtraData_FormatColl::operator == ( const SwRedlineExtraData& r) const
 {
-    const SwRedlineExtraData_FmtColl& rCmp = static_cast<const SwRedlineExtraData_FmtColl&>(r);
-    return sFmtNm == rCmp.sFmtNm && nPoolId == rCmp.nPoolId &&
+    const SwRedlineExtraData_FormatColl& rCmp = static_cast<const SwRedlineExtraData_FormatColl&>(r);
+    return sFormatNm == rCmp.sFormatNm && nPoolId == rCmp.nPoolId &&
             ( ( !pSet && !rCmp.pSet ) ||
                ( pSet && rCmp.pSet && *pSet == *rCmp.pSet ) );
 }
 
-void SwRedlineExtraData_FmtColl::SetItemSet( const SfxItemSet& rSet )
+void SwRedlineExtraData_FormatColl::SetItemSet( const SfxItemSet& rSet )
 {
     delete pSet;
     if( rSet.Count() )
@@ -856,7 +856,7 @@ OUString SwRedlineData::GetDescr() const
 SwRangeRedline::SwRangeRedline(RedlineType_t eTyp, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     pRedlineData( new SwRedlineData( eTyp, GetDoc()->getIDocumentRedlineAccess().GetRedlineAuthor() ) ),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -867,7 +867,7 @@ SwRangeRedline::SwRangeRedline(RedlineType_t eTyp, const SwPaM& rPam )
 SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     pRedlineData( new SwRedlineData( rData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -878,7 +878,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
 SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rPos )
     : SwPaM( rPos ),
     pRedlineData( new SwRedlineData( rData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -887,7 +887,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rP
 SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
     : SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() ),
     pRedlineData( new SwRedlineData( *rCpy.pRedlineData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -897,12 +897,12 @@ SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
 
 SwRangeRedline::~SwRangeRedline()
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         // delete the ContentSection
         if( !GetDoc()->IsInDtor() )
-            GetDoc()->getIDocumentContentOperations().DeleteSection( &pCntntSect->GetNode() );
-        delete pCntntSect;
+            GetDoc()->getIDocumentContentOperations().DeleteSection( &pContentSect->GetNode() );
+        delete pContentSect;
     }
     delete pRedlineData;
 }
@@ -1067,12 +1067,12 @@ void SwRangeRedline::InvalidateRange()       // trigger the Layout
     {
         SwNode* pNode = rNds[n];
 
-        if (pNode && pNode->IsTxtNode())
+        if (pNode && pNode->IsTextNode())
         {
-            SwTxtNode* pNd = pNode->GetTxtNode();
+            SwTextNode* pNd = pNode->GetTextNode();
             SwUpdateAttr aHt(
                 n == nSttNd ? nSttCnt : 0,
-                n == nEndNd ? nEndCnt : pNd->GetTxt().getLength(),
+                n == nEndNd ? nEndCnt : pNd->GetText().getLength(),
                 RES_FMT_CHG);
 
             pNd->ModifyNotification(&aHt, &aHt);
@@ -1117,24 +1117,24 @@ void SwRangeRedline::CalcStartEnd( sal_uLong nNdIdx, sal_Int32& rStart, sal_Int3
 
 void SwRangeRedline::MoveToSection()
 {
-    if( !pCntntSect )
+    if( !pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
         SwDoc* pDoc = GetDoc();
         SwPaM aPam( *pStt, *pEnd );
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         if( !pCSttNd )
         {
             // In order to not move other Redlines' indices, we set them
             // to the end (is exclusive)
-            const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-            for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+            const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+            for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
             {
-                SwRangeRedline* pRedl = rTbl[ n ];
+                SwRangeRedline* pRedl = rTable[ n ];
                 if( pRedl->GetBound(true) == *pStt )
                     pRedl->GetBound(true) = *pEnd;
                 if( pRedl->GetBound(false) == *pStt )
@@ -1146,18 +1146,18 @@ void SwRangeRedline::MoveToSection()
         SwNodes& rNds = pDoc->GetNodes();
         if( pCSttNd || pCEndNd )
         {
-            SwTxtFmtColl* pColl = (pCSttNd && pCSttNd->IsTxtNode() )
-                                    ? pCSttNd->GetTxtNode()->GetTxtColl()
-                                    : (pCEndNd && pCEndNd->IsTxtNode() )
-                                        ? pCEndNd->GetTxtNode()->GetTxtColl()
-                                        : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+            SwTextFormatColl* pColl = (pCSttNd && pCSttNd->IsTextNode() )
+                                    ? pCSttNd->GetTextNode()->GetTextColl()
+                                    : (pCEndNd && pCEndNd->IsTextNode() )
+                                        ? pCEndNd->GetTextNode()->GetTextColl()
+                                        : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
 
             pSttNd = rNds.MakeTextSection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode, pColl );
-            SwTxtNode* pTxtNd = rNds[ pSttNd->GetIndex() + 1 ]->GetTxtNode();
+            SwTextNode* pTextNd = rNds[ pSttNd->GetIndex() + 1 ]->GetTextNode();
 
-            SwNodeIndex aNdIdx( *pTxtNd );
-            SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
+            SwNodeIndex aNdIdx( *pTextNd );
+            SwPosition aPos( aNdIdx, SwIndex( pTextNd ));
             if( pCSttNd && pCEndNd )
                 pDoc->getIDocumentContentOperations().MoveAndJoin( aPam, aPos, SwMoveFlags::DEFAULT );
             else
@@ -1177,7 +1177,7 @@ void SwRangeRedline::MoveToSection()
             pDoc->getIDocumentContentOperations().MoveRange( aPam, aPos,
                 SwMoveFlags::DEFAULT );
         }
-        pCntntSect = new SwNodeIndex( *pSttNd );
+        pContentSect = new SwNodeIndex( *pSttNd );
 
         if( pStt == GetPoint() )
             Exchange();
@@ -1190,13 +1190,13 @@ void SwRangeRedline::MoveToSection()
 
 void SwRangeRedline::CopyToSection()
 {
-    if( !pCntntSect )
+    if( !pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         SwStartNode* pSttNd;
         SwDoc* pDoc = GetDoc();
@@ -1215,29 +1215,29 @@ void SwRangeRedline::CopyToSection()
 
         if( pCSttNd )
         {
-            SwTxtFmtColl* pColl = (pCSttNd && pCSttNd->IsTxtNode() )
-                                    ? pCSttNd->GetTxtNode()->GetTxtColl()
-                                    : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+            SwTextFormatColl* pColl = (pCSttNd && pCSttNd->IsTextNode() )
+                                    ? pCSttNd->GetTextNode()->GetTextColl()
+                                    : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
 
             pSttNd = rNds.MakeTextSection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode, pColl );
 
             SwNodeIndex aNdIdx( *pSttNd, 1 );
-            SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
-            SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
+            SwTextNode* pTextNd = aNdIdx.GetNode().GetTextNode();
+            SwPosition aPos( aNdIdx, SwIndex( pTextNd ));
             pDoc->getIDocumentContentOperations().CopyRange( *this, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
 
             // Take over the style from the EndNode if needed
             // We don't want this in Doc::Copy
             if( pCEndNd && pCEndNd != pCSttNd )
             {
-                SwCntntNode* pDestNd = aPos.nNode.GetNode().GetCntntNode();
+                SwContentNode* pDestNd = aPos.nNode.GetNode().GetContentNode();
                 if( pDestNd )
                 {
-                    if( pDestNd->IsTxtNode() && pCEndNd->IsTxtNode() )
-                        pCEndNd->GetTxtNode()->CopyCollFmt(*pDestNd->GetTxtNode());
+                    if( pDestNd->IsTextNode() && pCEndNd->IsTextNode() )
+                        pCEndNd->GetTextNode()->CopyCollFormat(*pDestNd->GetTextNode());
                     else
-                        pDestNd->ChgFmtColl( pCEndNd->GetFmtColl() );
+                        pDestNd->ChgFormatColl( pCEndNd->GetFormatColl() );
                 }
             }
         }
@@ -1258,7 +1258,7 @@ void SwRangeRedline::CopyToSection()
                 pDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aInsPos );
             }
         }
-        pCntntSect = new SwNodeIndex( *pSttNd );
+        pContentSect = new SwNodeIndex( *pSttNd );
 
         pDoc->SetCopyIsMove( bSaveCopyFlag );
         pDoc->getIDocumentRedlineAccess().SetRedlineMove( bSaveRdlMoveFlg );
@@ -1267,24 +1267,24 @@ void SwRangeRedline::CopyToSection()
 
 void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
         SwDoc* pDoc = GetDoc();
         SwPaM aPam( *pStt, *pEnd );
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         if( !pCSttNd )
         {
             // In order to not move other Redlines' indices, we set them
             // to the end (is exclusive)
-            const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-            for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+            const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+            for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
             {
-                SwRangeRedline* pRedl = rTbl[ n ];
+                SwRangeRedline* pRedl = rTable[ n ];
                 if( pRedl->GetBound(true) == *pStt )
                     pRedl->GetBound(true) = *pEnd;
                 if( pRedl->GetBound(false) == *pStt )
@@ -1311,21 +1311,21 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
                 // table are sorted and the pEnd position is an endnode (see
                 // bDelLastPara condition above), only redlines before the
                 // current ones can be affected.
-                const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+                const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
                 size_t n = nMyPos;
                 OSL_ENSURE( n != USHRT_MAX, "How strange. We don't exist!" );
                 for( bool bBreak = false; !bBreak && n > 0; )
                 {
                     --n;
                     bBreak = true;
-                    if( rTbl[ n ]->GetBound(true) == *aPam.GetPoint() )
+                    if( rTable[ n ]->GetBound(true) == *aPam.GetPoint() )
                     {
-                        rTbl[ n ]->GetBound(true) = *pEnd;
+                        rTable[ n ]->GetBound(true) = *pEnd;
                         bBreak = false;
                     }
-                    if( rTbl[ n ]->GetBound(false) == *aPam.GetPoint() )
+                    if( rTable[ n ]->GetBound(false) == *aPam.GetPoint() )
                     {
-                        rTbl[ n ]->GetBound(false) = *pEnd;
+                        rTable[ n ]->GetBound(false) = *pEnd;
                         bBreak = false;
                     }
                 }
@@ -1355,27 +1355,27 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
 
 void SwRangeRedline::MoveFromSection(size_t nMyPos)
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         SwDoc* pDoc = GetDoc();
-        const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
         std::vector<SwPosition*> aBeforeArr, aBehindArr;
         OSL_ENSURE( this, "this is not in the array?" );
         bool bBreak = false;
-        SwRedlineTbl::size_type n;
+        SwRedlineTable::size_type n;
 
-        for( n = nMyPos+1; !bBreak && n < rTbl.size(); ++n )
+        for( n = nMyPos+1; !bBreak && n < rTable.size(); ++n )
         {
             bBreak = true;
-            if( rTbl[ n ]->GetBound(true) == *GetPoint() )
+            if( rTable[ n ]->GetBound(true) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBehindArr.push_back(&pRedl->GetBound(true));
                 bBreak = false;
             }
-            if( rTbl[ n ]->GetBound(false) == *GetPoint() )
+            if( rTable[ n ]->GetBound(false) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBehindArr.push_back(&pRedl->GetBound(false));
                 bBreak = false;
             }
@@ -1384,34 +1384,34 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
         {
             --n;
             bBreak = true;
-            if( rTbl[ n ]->GetBound(true) == *GetPoint() )
+            if( rTable[ n ]->GetBound(true) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBeforeArr.push_back(&pRedl->GetBound(true));
                 bBreak = false;
             }
-            if( rTbl[ n ]->GetBound(false) == *GetPoint() )
+            if( rTable[ n ]->GetBound(false) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBeforeArr.push_back(&pRedl->GetBound(false));
                 bBreak = false;
             }
         }
 
-        const SwNode* pKeptCntntSectNode( &pCntntSect->GetNode() ); // #i95711#
+        const SwNode* pKeptContentSectNode( &pContentSect->GetNode() ); // #i95711#
         {
-            SwPaM aPam( pCntntSect->GetNode(),
-                        *pCntntSect->GetNode().EndOfSectionNode(), 1,
+            SwPaM aPam( pContentSect->GetNode(),
+                        *pContentSect->GetNode().EndOfSectionNode(), 1,
                         ( bDelLastPara ? -2 : -1 ) );
-            SwCntntNode* pCNd = aPam.GetCntntNode();
+            SwContentNode* pCNd = aPam.GetContentNode();
             if( pCNd )
                 aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
             else
                 ++aPam.GetPoint()->nNode;
 
-            SwFmtColl* pColl = pCNd && pCNd->Len() && aPam.GetPoint()->nNode !=
+            SwFormatColl* pColl = pCNd && pCNd->Len() && aPam.GetPoint()->nNode !=
                                         aPam.GetMark()->nNode
-                                ? pCNd->GetFmtColl() : 0;
+                                ? pCNd->GetFormatColl() : 0;
 
             SwNodeIndex aNdIdx( GetPoint()->nNode, -1 );
             const sal_Int32 nPos = GetPoint()->nContent.GetIndex();
@@ -1421,7 +1421,7 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
             {
                 --aPos.nNode;
 
-                pDoc->getIDocumentContentOperations().AppendTxtNode( aPos );
+                pDoc->getIDocumentContentOperations().AppendTextNode( aPos );
             }
             else
             {
@@ -1432,35 +1432,35 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
             SetMark();
             *GetPoint() = aPos;
             GetMark()->nNode = aNdIdx.GetIndex() + 1;
-            pCNd = GetMark()->nNode.GetNode().GetCntntNode();
+            pCNd = GetMark()->nNode.GetNode().GetContentNode();
             GetMark()->nContent.Assign( pCNd, nPos );
 
             if( bDelLastPara )
             {
                 ++GetPoint()->nNode;
-                GetPoint()->nContent.Assign( pCNd = GetCntntNode(), 0 );
+                GetPoint()->nContent.Assign( pCNd = GetContentNode(), 0 );
                 bDelLastPara = false;
             }
             else if( pColl )
-                pCNd = GetCntntNode();
+                pCNd = GetContentNode();
 
             if( pColl && pCNd )
-                pCNd->ChgFmtColl( pColl );
+                pCNd->ChgFormatColl( pColl );
         }
 
         // #i95771#
         // Under certain conditions the previous <SwDoc::Move(..)> has already
         // removed the change tracking section of this <SwRangeRedline> instance from
         // the change tracking nodes area.
-        // Thus, check if <pCntntSect> still points to the change tracking section
+        // Thus, check if <pContentSect> still points to the change tracking section
         // by comparing it with the "indexed" <SwNode> instance copied before
         // perform the intrinsic move.
         // Note: Such condition is e.g. a "delete" change tracking only containing a table.
-        if ( &pCntntSect->GetNode() == pKeptCntntSectNode )
+        if ( &pContentSect->GetNode() == pKeptContentSectNode )
         {
-            pDoc->getIDocumentContentOperations().DeleteSection( &pCntntSect->GetNode() );
+            pDoc->getIDocumentContentOperations().DeleteSection( &pContentSect->GetNode() );
         }
-        delete pCntntSect, pCntntSect = 0;
+        delete pContentSect, pContentSect = 0;
 
         // adjustment of redline table positions must take start and
         // end into account, not point and mark.
@@ -1476,14 +1476,14 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
 // for Undo
 void SwRangeRedline::SetContentIdx( const SwNodeIndex* pIdx )
 {
-    if( pIdx && !pCntntSect )
+    if( pIdx && !pContentSect )
     {
-        pCntntSect = new SwNodeIndex( *pIdx );
+        pContentSect = new SwNodeIndex( *pIdx );
         bIsVisible = false;
     }
-    else if( !pIdx && pCntntSect )
+    else if( !pIdx && pContentSect )
     {
-        delete pCntntSect, pCntntSect = 0;
+        delete pContentSect, pContentSect = 0;
         bIsVisible = false;
     }
     else
@@ -1595,20 +1595,20 @@ OUString SwRangeRedline::GetDescr(sal_uInt16 nPos)
     bool bDeletePaM = false;
 
     // if this redline is visible the content is in this PaM
-    if (NULL == pCntntSect)
+    if (NULL == pContentSect)
     {
         pPaM = this;
     }
-    else // otherwise it is saved in pCntntSect
+    else // otherwise it is saved in pContentSect
     {
-        SwNodeIndex aTmpIdx( *pCntntSect->GetNode().EndOfSectionNode() );
-        pPaM = new SwPaM(*pCntntSect, aTmpIdx );
+        SwNodeIndex aTmpIdx( *pContentSect->GetNode().EndOfSectionNode() );
+        pPaM = new SwPaM(*pContentSect, aTmpIdx );
         bDeletePaM = true;
     }
 
     // replace $1 in description by description of the redlines text
     const OUString aTmpStr = SW_RESSTR(STR_START_QUOTE)
-        + ShortenString(pPaM->GetTxt(), nUndoStringLength, SW_RESSTR(STR_LDOTS))
+        + ShortenString(pPaM->GetText(), nUndoStringLength, SW_RESSTR(STR_LDOTS))
         + SW_RESSTR(STR_END_QUOTE);
 
     SwRewriter aRewriter;
@@ -1654,14 +1654,14 @@ void SwRangeRedline::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-bool SwExtraRedlineTbl::Insert( SwExtraRedline* p )
+bool SwExtraRedlineTable::Insert( SwExtraRedline* p )
 {
     m_aExtraRedlines.push_back( p );
     //p->CallDisplayFunc();
     return true;
 }
 
-void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
+void SwExtraRedlineTable::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     /*
     SwDoc* pDoc = 0;
@@ -1682,7 +1682,7 @@ void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
     */
 }
 
-void SwExtraRedlineTbl::DeleteAndDestroyAll()
+void SwExtraRedlineTable::DeleteAndDestroyAll()
 {
     DeleteAndDestroy(0, m_aExtraRedlines.size());
 }
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 6e3fb3d41489..f959d18999e8 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::i18n;
 /*
  * Members in the list:
  *   - String - the orig text
- *   - SwFmtRuby - the ruby attribute
+ *   - SwFormatRuby - the ruby attribute
  */
 sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                             sal_uInt16 nMode )
@@ -184,10 +184,10 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
 {
     // Point must be the startposition, Mark is optional the end position
     SwPosition* pPos = rPam.GetPoint();
-       const SwTxtNode* pTNd = pPos->nNode.GetNode().GetTxtNode();
-    OUString const& rTxt = pTNd->GetTxt();
+       const SwTextNode* pTNd = pPos->nNode.GetNode().GetTextNode();
+    OUString const& rText = pTNd->GetText();
     sal_Int32 nStart = pPos->nContent.GetIndex();
-    sal_Int32 nEnd = rTxt.getLength();
+    sal_Int32 nEnd = rText.getLength();
 
     bool bHasMark = rPam.HasMark();
     if( bHasMark )
@@ -206,12 +206,12 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     // search the start
     // look where a ruby attribute starts
     const SwpHints* pHts = pTNd->GetpSwpHints();
-    const SwTxtAttr* pAttr = 0;
+    const SwTextAttr* pAttr = 0;
     if( pHts )
     {
         for( size_t nHtIdx = 0; nHtIdx < pHts->Count(); ++nHtIdx )
         {
-            const SwTxtAttr* pHt = (*pHts)[ nHtIdx ];
+            const SwTextAttr* pHt = (*pHts)[ nHtIdx ];
             if( RES_TXTATR_CJK_RUBY == pHt->Which() &&
                 *pHt->GetAnyEnd() > nStart )
             {
@@ -233,7 +233,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     {
         // skip to the word begin!
         const sal_Int32 nWordStt = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            rTxt, nStart,
+                            rText, nStart,
                             g_pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
                             true ).startPos;
@@ -263,7 +263,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
             break;
         }
 
-        sal_Int32 nChType = rCC.getType(rTxt, nStart);
+        sal_Int32 nChType = rCC.getType(rText, nStart);
         bool bIgnoreChar = false, bIsAlphaNum = false, bChkNxtWrd = false;
         switch( nChType )
         {
@@ -303,7 +303,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
             {
                 // search the end of this word
                 nWordEnd = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            rTxt, nStart,
+                            rText, nStart,
                             g_pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
                             true ).endPos;
@@ -316,7 +316,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     }
 
     nStart = rPam.GetMark()->nContent.GetIndex();
-    rEntry.SetText( rTxt.copy( nStart,
+    rEntry.SetText( rText.copy( nStart,
                            rPam.GetPoint()->nContent.GetIndex() - nStart ));
     return rPam.HasMark();
 }
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 69ee652d16fd..7173e13f010b 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -63,7 +63,7 @@ LocaleDataWrapper*  SwSortElement::pLclData = 0;
 
 // List of all sorted elements
 
-typedef ::boost::ptr_multiset<SwSortTxtElement> SwSortTxtElements;
+typedef ::boost::ptr_multiset<SwSortTextElement> SwSortTextElements;
 typedef ::boost::ptr_multiset<SwSortBoxElement> SwSortBoxElements;
 
 /// Construct a SortElement for the Sort
@@ -185,23 +185,23 @@ double SwSortElement::GetValue( sal_uInt16 nKey ) const
 }
 
 /// SortingElement for Text
-SwSortTxtElement::SwSortTxtElement(const SwNodeIndex& rPos)
+SwSortTextElement::SwSortTextElement(const SwNodeIndex& rPos)
     : nOrg(rPos.GetIndex()), aPos(rPos)
 {
 }
 
-SwSortTxtElement::~SwSortTxtElement()
+SwSortTextElement::~SwSortTextElement()
 {
 }
 
-OUString SwSortTxtElement::GetKey(sal_uInt16 nId) const
+OUString SwSortTextElement::GetKey(sal_uInt16 nId) const
 {
-    SwTxtNode* pTxtNd = aPos.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = aPos.GetNode().GetTextNode();
+    if( !pTextNd )
         return OUString();
 
     // for TextNodes
-    const OUString& rStr = pTxtNd->GetTxt();
+    const OUString& rStr = pTextNd->GetText();
 
     sal_Unicode nDeli = pOptions->cDeli;
     sal_uInt16 nDCount = pOptions->aKeys[nId]->nColumnId, i = 1;
@@ -256,8 +256,8 @@ OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const
             // Iterate over all the Box's TextNodes
             const SwNode *pNd = 0, *pEndNd = pMyBox->GetSttNd()->EndOfSectionNode();
             for( sal_uLong nIdx = pMyBox->GetSttIdx() + 1; pNd != pEndNd; ++nIdx )
-                if( ( pNd = pDoc->GetNodes()[ nIdx ])->IsTxtNode() )
-                    aRetStr += pNd->GetTxtNode()->GetTxt();
+                if( ( pNd = pDoc->GetNodes()[ nIdx ])->IsTextNode() )
+                    aRetStr += pNd->GetTextNode()->GetText();
         }
     }
     return aRetStr;
@@ -276,11 +276,11 @@ double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const
     double nVal;
     if( pFndBox )
     {
-        const SwFmt *pFmt = pFndBox->GetBox()->GetFrmFmt();
-        if (pFmt->GetTblBoxNumFmt().GetValue() & css::util::NumberFormat::TEXT)
+        const SwFormat *pFormat = pFndBox->GetBox()->GetFrameFormat();
+        if (pFormat->GetTableBoxNumFormat().GetValue() & css::util::NumberFormat::TEXT)
             nVal = SwSortElement::GetValue( nKey );
         else
-            nVal = pFmt->GetTblBoxValue().GetValue();
+            nVal = pFormat->GetTableBoxValue().GetValue();
     }
     else
         nVal = 0;
@@ -295,10 +295,10 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     const SwPosition *pStart = rPaM.Start(), *pEnd = rPaM.End();
 
     // Set index to the Selection's start
-    for ( const auto *pFmt : *GetSpzFrmFmts() )
+    for ( const auto *pFormat : *GetSpzFrameFormats() )
     {
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
 
         if (pAPos && (FLY_AT_PARA == pAnchor->GetAnchorId()) &&
             pStart->nNode <= pAPos->nNode && pAPos->nNode <= pEnd->nNode )
@@ -311,7 +311,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
                         nEnd = pEnd->nNode.GetIndex();
         while( nStart <= nEnd )
             // Iterate over a selected range
-            if( !GetNodes()[ nStart++ ]->IsTxtNode() )
+            if( !GetNodes()[ nStart++ ]->IsTextNode() )
                 return false;
     }
 
@@ -325,11 +325,11 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     SwUndoRedlineSort* pRedlUndo = 0;
     SwUndoSort* pUndoSort = 0;
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         pRedlPam = new SwPaM( pStart->nNode, pEnd->nNode, -1, 1 );
-        SwCntntNode* pCNd = pRedlPam->GetCntntNode( false );
+        SwContentNode* pCNd = pRedlPam->GetContentNode( false );
         if( pCNd )
             pRedlPam->GetMark()->nContent = pCNd->Len();
 
@@ -349,14 +349,14 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
             getIDocumentRedlineAccess().DeleteRedline( *pRedlPam, true, USHRT_MAX );
 
             pRedlPam->GetMark()->nNode.Assign( pEnd->nNode.GetNode(), 1 );
-            pCNd = pRedlPam->GetCntntNode( false );
+            pCNd = pRedlPam->GetContentNode( false );
             pRedlPam->GetMark()->nContent.Assign( pCNd, 0 );
 
             pRedlPam->GetPoint()->nNode.Assign( aEndIdx.GetNode() );
-            pCNd = pRedlPam->GetCntntNode( true );
+            pCNd = pRedlPam->GetContentNode( true );
             sal_Int32 nCLen = 0;
             if( !pCNd &&
-                0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetCntntNode()))
+                0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetContentNode()))
             {
                 nCLen = pCNd->Len();
                 pRedlPam->GetPoint()->nNode.Assign( *pCNd );
@@ -375,11 +375,11 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
 
     SwNodeIndex aStart(pStart->nNode);
     SwSortElement::Init( this, rOpt );
-    SwSortTxtElements aSortSet;
+    SwSortTextElements aSortSet;
     while( aStart <= pEnd->nNode )
     {
         // Iterate over a selected range
-        SwSortTxtElement* pSE = new SwSortTxtElement( aStart );
+        SwSortTextElement* pSE = new SwSortTextElement( aStart );
         aSortSet.insert(pSE);
         ++aStart;
     }
@@ -397,7 +397,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     GetIDocumentUndoRedo().DoUndo(false);
 
     size_t n = 0;
-    for (SwSortTxtElements::const_iterator it = aSortSet.begin();
+    for (SwSortTextElements::const_iterator it = aSortSet.begin();
             it != aSortSet.end(); ++it, ++n)
     {
         aStart      = nBeg + n;
@@ -439,7 +439,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
         // pRedlPam points to nodes that may be deleted (hidden) by
         // AppendRedline, so adjust it beforehand to prevent ASSERT
         pRedlPam->GetPoint()->nNode = aSttIdx;
-        SwCntntNode* pCNd = aSttIdx.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aSttIdx.GetNode().GetContentNode();
         pRedlPam->GetPoint()->nContent.Assign( pCNd, 0 );
 
         getIDocumentRedlineAccess().AppendRedline(pDeleteRedline, true);
@@ -451,8 +451,8 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
         {
             SwNodeIndex aInsEndIdx( pRedlPam->GetMark()->nNode, -1 );
             pRedlPam->GetMark()->nNode = aInsEndIdx;
-            SwCntntNode *const pPrevNode =
-                pRedlPam->GetMark()->nNode.GetNode().GetCntntNode();
+            SwContentNode *const pPrevNode =
+                pRedlPam->GetMark()->nNode.GetNode().GetContentNode();
             pRedlPam->GetMark()->nContent.Assign( pPrevNode, pPrevNode->Len() );
 
             pRedlUndo->SetValues( *pRedlPam );
@@ -473,12 +473,12 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
 }
 
 /// Sort Table in the Document
-bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
+bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
 {
     // Via SwDoc for Undo!
     OSL_ENSURE( !rBoxes.empty(), "no valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // We begin sorting
@@ -486,17 +486,17 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
 
     if(aFndBox.GetLines().empty())
         return false;
 
-    if( !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() )
-        getIDocumentRedlineAccess().DeleteRedline( *pTblNd, true, USHRT_MAX );
+    if( !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() )
+        getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, USHRT_MAX );
 
     _FndLines::size_type nStart = 0;
-    if( pTblNd->GetTable().GetRowsToRepeat() > 0 && rOpt.eDirection == SRT_ROWS )
+    if( pTableNd->GetTable().GetRowsToRepeat() > 0 && rOpt.eDirection == SRT_ROWS )
     {
         // Uppermost selected Cell
         _FndLines& rLines = aFndBox.GetLines();
@@ -509,7 +509,7 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
             while ( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTblNd->GetTable().IsHeadline( *pLine ) )
+            if( pTableNd->GetTable().IsHeadline( *pLine ) )
                 nStart++;
             else
                 break;
@@ -520,9 +520,9 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     }
 
     // Switch to relative Formulas
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_RELBOXNAME;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_RELBOXNAME;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // Table as a flat array structure
     FlatFndBox aFlatBox(this, aFndBox);
@@ -531,14 +531,14 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
         return false;
 
     // Delete HTML layout
-    pTblNd->GetTable().SetHTMLTableLayout( 0 );
+    pTableNd->GetTable().SetHTMLTableLayout( 0 );
 
     // #i37739# A simple 'MakeFrms' after the node sorting
     // does not work if the table is inside a frame and has no prev/next.
-    SwNode2Layout aNode2Layout( *pTblNd );
+    SwNode2Layout aNode2Layout( *pTableNd );
 
     // Delete the Table's Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
     // ? TL_CHART2: ?
 
     SwUndoSort* pUndoSort = 0;
@@ -546,7 +546,7 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     {
         pUndoSort = new SwUndoSort( rBoxes[0]->GetSttIdx(),
                                     rBoxes.back()->GetSttIdx(),
-                                   *pTblNd, rOpt, aFlatBox.HasItemSets() );
+                                   *pTableNd, rOpt, aFlatBox.HasItemSets() );
         GetIDocumentUndoRedo().AppendUndo(pUndoSort);
     }
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -585,11 +585,11 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     // Restore table frames:
     // #i37739# A simple 'MakeFrms' after the node sorting
     // does not work if the table is inside a frame and has no prev/next.
-    const sal_uLong nIdx = pTblNd->GetIndex();
+    const sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
+    UpdateCharts( pTableNd->GetTable().GetFrameFormat()->GetName() );
 
     // Delete all Elements in the SortArray
     aSortList.clear();
@@ -622,22 +622,22 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 
         if( pS != pT )
         {
-            SwFrmFmt* pTFmt = pT->GetFrmFmt();
+            SwFrameFormat* pTFormat = pT->GetFrameFormat();
             const SfxItemSet* pSSet = rBox.GetItemSet( i, nS );
 
             if( pSSet ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_VALUE ) )
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_VALUE ) )
             {
-                pTFmt = const_cast<SwTableBox*>(pT)->ClaimFrmFmt();
-                pTFmt->LockModify();
-                if( pTFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
-                    pTFmt->ResetFmtAttr( RES_VERT_ORIENT );
+                pTFormat = const_cast<SwTableBox*>(pT)->ClaimFrameFormat();
+                pTFormat->LockModify();
+                if( pTFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
+                    pTFormat->ResetFormatAttr( RES_VERT_ORIENT );
 
                 if( pSSet )
-                    pTFmt->SetFmtAttr( *pSSet );
-                pTFmt->UnlockModify();
+                    pTFormat->SetFormatAttr( *pSSet );
+                pTFormat->UnlockModify();
             }
         }
     }
@@ -666,22 +666,22 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 
         if( pS != pT )
         {
-            SwFrmFmt* pTFmt = pT->GetFrmFmt();
+            SwFrameFormat* pTFormat = pT->GetFrameFormat();
             const SfxItemSet* pSSet = rBox.GetItemSet( nS, i );
 
             if( pSSet ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_VALUE ) )
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_VALUE ) )
             {
-                pTFmt = const_cast<SwTableBox*>(pT)->ClaimFrmFmt();
-                pTFmt->LockModify();
-                if( pTFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
-                    pTFmt->ResetFmtAttr( RES_VERT_ORIENT );
+                pTFormat = const_cast<SwTableBox*>(pT)->ClaimFrameFormat();
+                pTFormat->LockModify();
+                if( pTFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
+                    pTFormat->ResetFormatAttr( RES_VERT_ORIENT );
 
                 if( pSSet )
-                    pTFmt->SetFmtAttr( *pSSet );
-                pTFmt->UnlockModify();
+                    pTFormat->SetFormatAttr( *pSSet );
+                pTFormat->UnlockModify();
             }
         }
     }
@@ -707,8 +707,8 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
     // -> insert an empty Node and move the rest or the Mark
     // points to the first ContentNode
     if( pNd->StartOfSectionNode() == pSource->GetSttNd() )
-        pNd = pDoc->GetNodes().MakeTxtNode( aRg.aStart,
-                pDoc->GetDfltTxtFmtColl() );
+        pNd = pDoc->GetNodes().MakeTextNode( aRg.aStart,
+                pDoc->GetDfltTextFormatColl() );
     aRg.aEnd = *pNd->EndOfSectionNode();
 
     // If the Target is empty (there is one empty Node)
@@ -720,8 +720,8 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
     bool bDelFirst = false;
     if( nCount == 2 )
     {
-        OSL_ENSURE( pNd->GetCntntNode(), "No ContentNode");
-        bDelFirst = !pNd->GetCntntNode()->Len() && bMovedBefore;
+        OSL_ENSURE( pNd->GetContentNode(), "No ContentNode");
+        bDelFirst = !pNd->GetContentNode()->Len() && bMovedBefore;
     }
 
     if(!bDelFirst)
@@ -889,15 +889,15 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
                 *(pArr + nOff) = pBox;
 
                 // Save the Formula/Format/Value values
-                const SwFrmFmt* pFmt = pBox->GetBox()->GetFrmFmt();
-                if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                    SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                    SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE ) )
+                const SwFrameFormat* pFormat = pBox->GetBox()->GetFrameFormat();
+                if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                    SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                    SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE ) )
                 {
                     SfxItemSet* pSet = new SfxItemSet( pDoc->GetAttrPool(),
                                     RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                     RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
-                    pSet->Put( pFmt->GetAttrSet() );
+                    pSet->Put( pFormat->GetAttrSet() );
                     if( !ppItemSets )
                     {
                         size_t nCount = static_cast<size_t>(nRows) * nCols;
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index 235db23854cc..c34e8d094ba2 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -20,7 +20,7 @@
 #include <docstat.hxx>
 
 SwDocStat::SwDocStat() :
-    nTbl(0),
+    nTable(0),
     nGrf(0),
     nOLE(0),
     nPage(1),
@@ -35,7 +35,7 @@ SwDocStat::SwDocStat() :
 
 void SwDocStat::Reset()
 {
-    nTbl    = 0;
+    nTable    = 0;
     nGrf    = 0;
     nOLE    = 0;
     nPage   = 1;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index c64a438ff8ce..988c70eed5cd 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -93,9 +93,9 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) c
         const SwTOXType* pTOXType = pItem->GetTOXType();
         if ( !pTOXType || pTOXType->GetType()!=TOX_INDEX )
             continue;
-        const SwTxtTOXMark* pMark = pItem->GetTxtTOXMark();
-        if ( pMark && pMark->GetpTxtNd() &&
-             pMark->GetpTxtNd()->GetNodes().IsDocNodes() )
+        const SwTextTOXMark* pMark = pItem->GetTextTOXMark();
+        if ( pMark && pMark->GetpTextNd() &&
+             pMark->GetpTextNd()->GetNodes().IsDocNodes() )
         {
             const OUString sStr = TOI_PRIMARY == eTyp
                 ? pItem->GetPrimaryKey()
@@ -114,11 +114,11 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
                                 SwTOXMarks& rArr )
 {
     // search on Position rPos for all SwTOXMarks
-    SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( !pTxtNd || !pTxtNd->GetpSwpHints() )
+    SwTextNode *const pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( !pTextNd || !pTextNd->GetpSwpHints() )
         return 0;
 
-    const SwpHints & rHts = *pTxtNd->GetpSwpHints();
+    const SwpHints & rHts = *pTextNd->GetpSwpHints();
     sal_Int32 nSttIdx;
     const sal_Int32 *pEndIdx;
 
@@ -126,7 +126,7 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
 
     for( size_t n = 0; n < rHts.Count(); ++n )
     {
-        const SwTxtAttr* pHt = rHts[n];
+        const SwTextAttr* pHt = rHts[n];
         if( RES_TXTATR_TOXMARK != pHt->Which() )
             continue;
         if( ( nSttIdx = pHt->GetStart() ) < nAktPos )
@@ -150,75 +150,75 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
 /// Delete table of contents Mark
 void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
 {
-    const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark();
-    OSL_ENSURE( pTxtTOXMark, "No TxtTOXMark, cannot be deleted" );
+    const SwTextTOXMark* pTextTOXMark = pTOXMark->GetTextTOXMark();
+    OSL_ENSURE( pTextTOXMark, "No TextTOXMark, cannot be deleted" );
 
-    SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode());
-    OSL_ENSURE( rTxtNd.GetpSwpHints(), "cannot be deleted" );
+    SwTextNode& rTextNd = const_cast<SwTextNode&>(pTextTOXMark->GetTextNode());
+    OSL_ENSURE( rTextNd.GetpSwpHints(), "cannot be deleted" );
 
     std::unique_ptr<SwRegHistory> aRHst;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         // save attributes for Undo
         SwUndoResetAttr* pUndo = new SwUndoResetAttr(
-            SwPosition( rTxtNd, SwIndex( &rTxtNd, pTxtTOXMark->GetStart() ) ),
+            SwPosition( rTextNd, SwIndex( &rTextNd, pTextTOXMark->GetStart() ) ),
             RES_TXTATR_TOXMARK );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
 
-        aRHst.reset(new SwRegHistory(rTxtNd, &pUndo->GetHistory()));
-        rTxtNd.GetpSwpHints()->Register(aRHst.get());
+        aRHst.reset(new SwRegHistory(rTextNd, &pUndo->GetHistory()));
+        rTextNd.GetpSwpHints()->Register(aRHst.get());
     }
 
-    rTxtNd.DeleteAttribute( const_cast<SwTxtTOXMark*>(pTxtTOXMark) );
+    rTextNd.DeleteAttribute( const_cast<SwTextTOXMark*>(pTextTOXMark) );
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        if( rTxtNd.GetpSwpHints() )
-            rTxtNd.GetpSwpHints()->DeRegister();
+        if( rTextNd.GetpSwpHints() )
+            rTextNd.GetpSwpHints()->DeRegister();
     }
     getIDocumentState().SetModified();
 }
 
 /// Travel between table of content Marks
-class CompareNodeCntnt
+class CompareNodeContent
 {
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
 public:
-    CompareNodeCntnt( sal_uLong nNd, sal_Int32 nCnt )
-        : nNode( nNd ), nCntnt( nCnt ) {}
-
-    bool operator==( const CompareNodeCntnt& rCmp ) const
-        { return nNode == rCmp.nNode && nCntnt == rCmp.nCntnt; }
-    bool operator!=( const CompareNodeCntnt& rCmp ) const
-        { return nNode != rCmp.nNode || nCntnt != rCmp.nCntnt; }
-    bool operator< ( const CompareNodeCntnt& rCmp ) const
+    CompareNodeContent( sal_uLong nNd, sal_Int32 nCnt )
+        : nNode( nNd ), nContent( nCnt ) {}
+
+    bool operator==( const CompareNodeContent& rCmp ) const
+        { return nNode == rCmp.nNode && nContent == rCmp.nContent; }
+    bool operator!=( const CompareNodeContent& rCmp ) const
+        { return nNode != rCmp.nNode || nContent != rCmp.nContent; }
+    bool operator< ( const CompareNodeContent& rCmp ) const
         { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt < rCmp.nCntnt); }
-    bool operator<=( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent < rCmp.nContent); }
+    bool operator<=( const CompareNodeContent& rCmp ) const
         { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt <= rCmp.nCntnt); }
-    bool operator> ( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent <= rCmp.nContent); }
+    bool operator> ( const CompareNodeContent& rCmp ) const
         { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt > rCmp.nCntnt); }
-    bool operator>=( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent > rCmp.nContent); }
+    bool operator>=( const CompareNodeContent& rCmp ) const
         { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt >= rCmp.nCntnt); }
+            ( nNode == rCmp.nNode && nContent >= rCmp.nContent); }
 };
 
 const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
                                     SwTOXSearch eDir, bool bInReadOnly )
 {
-    const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark();
-    OSL_ENSURE(pMark, "pMark==0 invalid TxtTOXMark");
+    const SwTextTOXMark* pMark = rCurTOXMark.GetTextTOXMark();
+    OSL_ENSURE(pMark, "pMark==0 invalid TextTOXMark");
 
-    const SwTxtNode *pTOXSrc = pMark->GetpTxtNd();
+    const SwTextNode *pTOXSrc = pMark->GetpTextNd();
 
-    CompareNodeCntnt aAbsIdx( pTOXSrc->GetIndex(), pMark->GetStart() );
-    CompareNodeCntnt aPrevPos( 0, 0 );
-    CompareNodeCntnt aNextPos( ULONG_MAX, SAL_MAX_INT32 );
-    CompareNodeCntnt aMax( 0, 0 );
-    CompareNodeCntnt aMin( ULONG_MAX, SAL_MAX_INT32 );
+    CompareNodeContent aAbsIdx( pTOXSrc->GetIndex(), pMark->GetStart() );
+    CompareNodeContent aPrevPos( 0, 0 );
+    CompareNodeContent aNextPos( ULONG_MAX, SAL_MAX_INT32 );
+    CompareNodeContent aMax( 0, 0 );
+    CompareNodeContent aMin( ULONG_MAX, SAL_MAX_INT32 );
 
     const SwTOXMark*    pNew    = 0;
     const SwTOXMark*    pMax    = &rCurTOXMark;
@@ -234,22 +234,22 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
         if ( pTOXMark == &rCurTOXMark )
             continue;
 
-        pMark = pTOXMark->GetTxtTOXMark();
+        pMark = pTOXMark->GetTextTOXMark();
         if (!pMark)
             continue;
 
-        pTOXSrc = pMark->GetpTxtNd();
+        pTOXSrc = pMark->GetpTextNd();
         if (!pTOXSrc)
             continue;
 
         Point aPt;
-        const SwCntntFrm* pCFrm = pTOXSrc->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+        const SwContentFrm* pCFrm = pTOXSrc->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
         if (!pCFrm)
             continue;
 
         if ( bInReadOnly || !pCFrm->IsProtected() )
         {
-            CompareNodeCntnt aAbsNew( pTOXSrc->GetIndex(), pMark->GetStart() );
+            CompareNodeContent aAbsNew( pTOXSrc->GetIndex(), pMark->GetStart() );
             switch( eDir )
             {
             // The following (a bit more complicated) statements make it
@@ -341,7 +341,7 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
         InsertSwSection( aPam, aSectionData, & rTOX, pSet, false ));
     if (pNewSection)
     {
-        SwSectionNode *const pSectNd = pNewSection->GetFmt()->GetSectionNode();
+        SwSectionNode *const pSectNd = pNewSection->GetFormat()->GetSectionNode();
         pNewSection->SetTOXName(sSectNm); // rTOX may have had no name...
 
         if( bExpand )
@@ -357,15 +357,15 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
             // then insert the headline section
             SwNodeIndex aIdx( *pSectNd, +1 );
 
-            SwTxtNode* pHeadNd = GetNodes().MakeTxtNode( aIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+            SwTextNode* pHeadNd = GetNodes().MakeTextNode( aIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
 
             SwSectionData headerData( TOX_HEADER_SECTION, pNewSection->GetTOXName()+"_Head" );
 
             SwNodeIndex aStt( *pHeadNd ); --aIdx;
-            SwSectionFmt* pSectFmt = MakeSectionFmt( 0 );
+            SwSectionFormat* pSectFormat = MakeSectionFormat( 0 );
             GetNodes().InsertTextSection(
-                    aStt, *pSectFmt, headerData, 0, &aIdx, true, false);
+                    aStt, *pSectFormat, headerData, 0, &aIdx, true, false);
         }
     }
 
@@ -394,15 +394,15 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
     SwSectionData aSectionData( TOX_CONTENT_SECTION, sSectNm );
 
     SwNodeIndex aStt( GetNodes(), nSttNd ), aEnd( GetNodes(), nEndNd );
-    SwSectionFmt* pFmt = MakeSectionFmt( 0 );
+    SwSectionFormat* pFormat = MakeSectionFormat( 0 );
     if(pSet)
-        pFmt->SetFmtAttr(*pSet);
+        pFormat->SetFormatAttr(*pSet);
 
     SwSectionNode *const pNewSectionNode =
-        GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, &rTOX, &aEnd);
+        GetNodes().InsertTextSection(aStt, *pFormat, aSectionData, &rTOX, &aEnd);
     if (!pNewSectionNode)
     {
-        DelSectionFmt( pFmt );
+        DelSectionFormat( pFormat );
         return 0;
     }
 
@@ -438,9 +438,9 @@ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
-    SwSectionFmt const * pFmt = rTOXSect.GetFmt();
-    OSL_ENSURE( pFmt, "invalid TOXBaseSection!" );
-    return pFmt->GetAttrSet();
+    SwSectionFormat const * pFormat = rTOXSect.GetFormat();
+    OSL_ENSURE( pFormat, "invalid TOXBaseSection!" );
+    return pFormat->GetAttrSet();
 }
 
 const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
@@ -451,7 +451,7 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
     case  TOX_CONTENT:          prBase = &mpDefTOXBases->pContBase; break;
     case  TOX_INDEX:            prBase = &mpDefTOXBases->pIdxBase;  break;
     case  TOX_USER:             prBase = &mpDefTOXBases->pUserBase; break;
-    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTblBase;  break;
+    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTableBase;  break;
     case  TOX_OBJECTS:          prBase = &mpDefTOXBases->pObjBase;  break;
     case  TOX_ILLUSTRATIONS:    prBase = &mpDefTOXBases->pIllBase;  break;
     case  TOX_AUTHORITIES:      prBase = &mpDefTOXBases->pAuthBase; break;
@@ -477,7 +477,7 @@ void    SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
     case  TOX_CONTENT:          prBase = &mpDefTOXBases->pContBase; break;
     case  TOX_INDEX:            prBase = &mpDefTOXBases->pIdxBase;  break;
     case  TOX_USER:             prBase = &mpDefTOXBases->pUserBase; break;
-    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTblBase;  break;
+    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTableBase;  break;
     case  TOX_OBJECTS:          prBase = &mpDefTOXBases->pObjBase;  break;
     case  TOX_ILLUSTRATIONS:    prBase = &mpDefTOXBases->pIllBase;  break;
     case  TOX_AUTHORITIES:      prBase = &mpDefTOXBases->pAuthBase; break;
@@ -498,9 +498,9 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
 
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
-    SwSectionFmt const * pFmt = rTOXSect.GetFmt();
+    SwSectionFormat const * pFormat = rTOXSect.GetFormat();
     /* Save the start node of the TOX' section. */
-    SwSectionNode const * pMyNode = pFmt ? pFmt->GetSectionNode() : NULL;
+    SwSectionNode const * pMyNode = pFormat ? pFormat->GetSectionNode() : NULL;
     if (pMyNode)
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_CLEARTOXRANGE, NULL );
@@ -542,7 +542,7 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
                    TOX'. Append text node behind TOX' section. */
 
                 SwPosition aInsPos(*pMyNode->EndOfSectionNode());
-                getIDocumentContentOperations().AppendTxtNode(aInsPos);
+                getIDocumentContentOperations().AppendTextNode(aInsPos);
 
                 SwPaM aTmpPam1(aInsPos);
                 aSearchPam = aTmpPam1;
@@ -558,17 +558,17 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
         if( !bDelNodes )
         {
             SwSections aArr( 0 );
-            pFmt->GetChildSections( aArr, SORTSECT_NOT, false );
+            pFormat->GetChildSections( aArr, SORTSECT_NOT, false );
             for( const auto pSect : aArr )
             {
                 if( TOX_HEADER_SECTION == pSect->GetType() )
                 {
-                    DelSectionFmt( pSect->GetFmt(), bDelNodes );
+                    DelSectionFormat( pSect->GetFormat(), bDelNodes );
                 }
             }
         }
 
-        DelSectionFmt( const_cast<SwSectionFmt *>(pFmt), bDelNodes );
+        DelSectionFormat( const_cast<SwSectionFormat *>(pFormat), bDelNodes );
 
         GetIDocumentUndoRedo().EndUndo( UNDO_CLEARTOXRANGE, NULL );
         bRet = true;
@@ -610,7 +610,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     {
         OUString newName = "MailMergeTOX"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpSectionFmtTbl->size() + 1 );
+            + OUString::number( mpSectionFormatTable->size() + 1 );
         if( !sChkStr.isEmpty())
             newName += sChkStr;
         return newName;
@@ -620,14 +620,14 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     const OUString aName( rType.GetTypeName() );
     const sal_Int32 nNmLen = aName.getLength();
 
-    SwSectionFmts::size_type nNum = 0;
-    const SwSectionFmts::size_type nFlagSize = ( mpSectionFmtTbl->size() / 8 ) +2;
+    SwSectionFormats::size_type nNum = 0;
+    const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) +2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( auto pSectionFmt : *mpSectionFmtTbl )
+    for( auto pSectionFormat : *mpSectionFormatTable )
     {
-        const SwSectionNode *pSectNd = pSectionFmt->GetSectionNode( false );
+        const SwSectionNode *pSectNd = pSectionFormat->GetSectionNode( false );
         if ( !pSectNd )
             continue;
 
@@ -639,7 +639,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
             {
                 // Calculate number and set the Flag
                 nNum = rNm.copy( nNmLen ).toInt32();
-                if( nNum-- && nNum < mpSectionFmtTbl->size() )
+                if( nNum-- && nNum < mpSectionFormatTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if ( bUseChkStr && sChkStr==rNm )
@@ -650,8 +650,8 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     if( !bUseChkStr )
     {
         // All Numbers have been flagged accordingly, so get the right Number
-        nNum = mpSectionFmtTbl->size();
-        for( SwSectionFmts::size_type n = 0; n < nFlagSize; ++n )
+        nNum = mpSectionFormatTable->size();
+        for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n )
         {
             sal_uInt8 nTmp = pSetFlags[ n ];
             if( nTmp != 0xff )
@@ -689,7 +689,7 @@ bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName)
     return false;
 }
 
-static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
+static const SwTextNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
 {
     const SwNode* pNd = &rNd;
     if( pNd->GetNodes().GetEndOfExtras().GetIndex() > pNd->GetIndex() )
@@ -702,7 +702,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
         if( pFrm )
         {
             SwPosition aPos( *pNd );
-            pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm );
+            pNd = GetBodyTextNode( *pNd->GetDoc(), aPos, *pFrm );
             OSL_ENSURE( pNd, "Where's the paragraph?" );
         }
     }
@@ -710,9 +710,9 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
 }
 
 // Table of contents class
-SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
+SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFormat & rFormat)
     : SwTOXBase( rBase )
-    , SwSection( TOX_CONTENT_SECTION, OUString(), rFmt )
+    , SwSection( TOX_CONTENT_SECTION, OUString(), rFormat )
 {
     SetProtect( rBase.IsProtected() );
     SetSectionName( GetTOXName() );
@@ -727,10 +727,10 @@ SwTOXBaseSection::~SwTOXBaseSection()
 bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
 {
     bool bRet = false;
-    const SwSectionNode* pSectNd = GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = GetFormat()->GetSectionNode();
     if( pSectNd )
     {
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         sal_Int32 nC = 0;
         if( bAtStart )
         {
@@ -755,7 +755,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 {
     const SwSectionNode* pSectNd;
     if( !SwTOXBase::GetRegisteredIn()->HasWriterListeners() ||
-        !GetFmt() || 0 == (pSectNd = GetFmt()->GetSectionNode() ) ||
+        !GetFormat() || 0 == (pSectNd = GetFormat()->GetSectionNode() ) ||
         !pSectNd->GetNodes().IsDocNodes() ||
         IsHiddenFlag() )
     {
@@ -771,15 +771,15 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     assert(pDoc); //Where is the document?
 
-    if (pAttr && GetFmt())
-        pDoc->ChgFmt(*GetFmt(), *pAttr);
+    if (pAttr && GetFormat())
+        pDoc->ChgFormat(*GetFormat(), *pAttr);
 
     // determine default page description, which will be used by the content nodes,
     // if no appropriate one is found.
     const SwPageDesc* pDefaultPageDesc;
     {
         pDefaultPageDesc =
-            pSectNd->GetSection().GetFmt()->GetPageDesc().GetPageDesc();
+            pSectNd->GetSection().GetFormat()->GetPageDesc().GetPageDesc();
         if ( !_bNewTOX && !pDefaultPageDesc )
         {
             // determine page description of table-of-content
@@ -799,7 +799,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         {
             // determine page description of content after table-of-content
             SwNodeIndex aIdx( *(pSectNd->EndOfSectionNode()) );
-            const SwCntntNode* pNdAfterTOX = pSectNd->GetNodes().GoNext( &aIdx );
+            const SwContentNode* pNdAfterTOX = pSectNd->GetNodes().GoNext( &aIdx );
             const SwAttrSet& aNdAttrSet = pNdAfterTOX->GetSwAttrSet();
             const SvxBreak eBreak = aNdAttrSet.GetBreak().GetBreak();
             if ( !( eBreak == SVX_BREAK_PAGE_BEFORE ||
@@ -842,7 +842,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     // find the first layout node for this TOX, if it only find the content
     // in his own chapter
-    const SwTxtNode* pOwnChapterNode = IsFromChapter()
+    const SwTextNode* pOwnChapterNode = IsFromChapter()
             ? ::lcl_FindChapterNode( *pSectNd, 0 )
             : 0;
 
@@ -850,19 +850,19 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
     const_cast<SwSectionNode*>(pSectNd)->DelFrms();
 
     // remove old content an insert one empty textnode (to hold the layout!)
-    SwTxtNode* pFirstEmptyNd;
+    SwTextNode* pFirstEmptyNd;
     {
         pDoc->getIDocumentRedlineAccess().DeleteRedline( *pSectNd, true, USHRT_MAX );
 
         SwNodeIndex aSttIdx( *pSectNd, +1 );
         SwNodeIndex aEndIdx( *pSectNd->EndOfSectionNode() );
-        pFirstEmptyNd = pDoc->GetNodes().MakeTxtNode( aEndIdx,
-                        pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        pFirstEmptyNd = pDoc->GetNodes().MakeTextNode( aEndIdx,
+                        pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
 
         {
             // Task 70995 - save and restore PageDesc and Break Attributes
             SwNodeIndex aNxtIdx( aSttIdx );
-            const SwCntntNode* pCNd = aNxtIdx.GetNode().GetCntntNode();
+            const SwContentNode* pCNd = aNxtIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = pDoc->GetNodes().GoNext( &aNxtIdx );
             if( pCNd->HasSwAttrSet() )
@@ -891,16 +891,16 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         // then insert the headline section
         SwNodeIndex aIdx( *pSectNd, +1 );
 
-        SwTxtNode* pHeadNd = pDoc->GetNodes().MakeTxtNode( aIdx,
-                                GetTxtFmtColl( FORM_TITLE ) );
+        SwTextNode* pHeadNd = pDoc->GetNodes().MakeTextNode( aIdx,
+                                GetTextFormatColl( FORM_TITLE ) );
         pHeadNd->InsertText( GetTitle(), SwIndex( pHeadNd ) );
 
         SwSectionData headerData( TOX_HEADER_SECTION, GetTOXName()+"_Head" );
 
         SwNodeIndex aStt( *pHeadNd ); --aIdx;
-        SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
+        SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( 0 );
         pDoc->GetNodes().InsertTextSection(
-                aStt, *pSectFmt, headerData, 0, &aIdx, true, false);
+                aStt, *pSectFormat, headerData, 0, &aIdx, true, false);
     }
 
     // This would be a good time to update the Numbering
@@ -917,7 +917,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     if( GetCreateType() & nsSwTOXElement::TOX_OLE ||
             TOX_OBJECTS == SwTOXBase::GetType())
-        UpdateCntnt( nsSwTOXElement::TOX_OLE, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_OLE, pOwnChapterNode );
 
     if( GetCreateType() & nsSwTOXElement::TOX_TABLE ||
             (TOX_TABLES == SwTOXBase::GetType() && IsFromObjectNames()) )
@@ -925,7 +925,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     if( GetCreateType() & nsSwTOXElement::TOX_GRAPHIC ||
         (TOX_ILLUSTRATIONS == SwTOXBase::GetType() && IsFromObjectNames()))
-        UpdateCntnt( nsSwTOXElement::TOX_GRAPHIC, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_GRAPHIC, pOwnChapterNode );
 
     if( !GetSequenceName().isEmpty() && !IsFromObjectNames() &&
         (TOX_TABLES == SwTOXBase::GetType() ||
@@ -933,7 +933,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         UpdateSequence( pOwnChapterNode );
 
     if( GetCreateType() & nsSwTOXElement::TOX_FRAME )
-        UpdateCntnt( nsSwTOXElement::TOX_FRAME, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_FRAME, pOwnChapterNode );
 
     if(TOX_AUTHORITIES == SwTOXBase::GetType())
         UpdateAuthorities( aIntl );
@@ -944,7 +944,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         InsertAlphaDelimitter( aIntl );
 
     // Sort the List of all TOC Marks and TOC Sections
-    std::vector<SwTxtFmtColl*> aCollArr( GetTOXForm().GetFormMax(), 0 );
+    std::vector<SwTextFormatColl*> aCollArr( GetTOXForm().GetFormMax(), 0 );
     SwNodeIndex aInsPos( *pFirstEmptyNd, 1 );
     for( SwTOXSortTabBases::size_type nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
     {
@@ -952,15 +952,15 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
         // Put the Text into the TOC
         sal_uInt16 nLvl = aSortArr[ nCnt ]->GetLevel();
-        SwTxtFmtColl* pColl = aCollArr[ nLvl ];
+        SwTextFormatColl* pColl = aCollArr[ nLvl ];
         if( !pColl )
         {
-            pColl = GetTxtFmtColl( nLvl );
+            pColl = GetTextFormatColl( nLvl );
             aCollArr[ nLvl ] = pColl;
         }
 
         // Generate: Set dynamic TabStops
-        SwTxtNode* pTOXNd = pDoc->GetNodes().MakeTxtNode( aInsPos , pColl );
+        SwTextNode* pTOXNd = pDoc->GetNodes().MakeTextNode( aInsPos , pColl );
         aSortArr[ nCnt ]->pTOXNd = pTOXNd;
 
         // Generate: Evaluate Form and insert the place holder for the
@@ -971,13 +971,13 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                 GetTOXForm().IsCommaSeparated() &&
                 aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTxtMark->GetTOXMark();
+            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString sPrimKey = rMark.GetPrimaryKey();
             const OUString sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = 0;
             while(aSortArr.size() > (nCnt + nRange)&&
                     aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTxtMark->GetTOXMark())) &&
+                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -993,7 +993,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_INDENT :
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_PAGE);
         sw::ToxTextGenerator ttgn(GetTOXForm(), tabStopTokenHandler);
-        ttgn.GenerateText(GetFmt()->GetDoc(), aSortArr, nCnt, nRange);
+        ttgn.GenerateText(GetFormat()->GetDoc(), aSortArr, nCnt, nRange);
         nCnt += nRange - 1;
     }
 
@@ -1014,7 +1014,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                 aEndIdx = *pSectNd;
             else
                 aEndIdx = *pFirstEmptyNd;
-            SwCntntNode* pCNd = pDoc->GetNodes().GoNext( &aEndIdx );
+            SwContentNode* pCNd = pDoc->GetNodes().GoNext( &aEndIdx );
             if( pCNd ) // Robust against defect documents, e.g. i60336
                 pCNd->SetAttr( *pFirstEmptyNd->GetpSwAttrSet() );
         }
@@ -1038,7 +1038,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
 void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     OUString sLastDeli;
     SwTOXSortTabBases::size_type i = 0;
     while( i < aSortArr.size() )
@@ -1051,7 +1051,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
         if( nLevel == FORM_ALPHA_DELIMITTER )
             continue;
 
-        const OUString sDeli = rIntl.GetIndexKey( aSortArr[i]->GetTxt(),
+        const OUString sDeli = rIntl.GetIndexKey( aSortArr[i]->GetText(),
                                    aSortArr[i]->GetLocale() );
 
         // Do we already have a Delimitter?
@@ -1077,87 +1077,87 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
 }
 
 /// Evaluate Template
-SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
+SwTextFormatColl* SwTOXBaseSection::GetTextFormatColl( sal_uInt16 nLevel )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     const OUString& rName = GetTOXForm().GetTemplate( nLevel );
-    SwTxtFmtColl* pColl = !rName.isEmpty() ? pDoc->FindTxtFmtCollByName(rName) :0;
+    SwTextFormatColl* pColl = !rName.isEmpty() ? pDoc->FindTextFormatCollByName(rName) :0;
     if( !pColl )
     {
-        sal_uInt16 nPoolFmt = 0;
+        sal_uInt16 nPoolFormat = 0;
         const TOXTypes eMyType = SwTOXBase::GetType();
         switch( eMyType )
         {
-        case TOX_INDEX:         nPoolFmt = RES_POOLCOLL_TOX_IDXH;       break;
+        case TOX_INDEX:         nPoolFormat = RES_POOLCOLL_TOX_IDXH;       break;
         case TOX_USER:
             if( nLevel < 6 )
-                nPoolFmt = RES_POOLCOLL_TOX_USERH;
+                nPoolFormat = RES_POOLCOLL_TOX_USERH;
             else
-                nPoolFmt = RES_POOLCOLL_TOX_USER6 - 6;
+                nPoolFormat = RES_POOLCOLL_TOX_USER6 - 6;
             break;
-        case TOX_ILLUSTRATIONS: nPoolFmt = RES_POOLCOLL_TOX_ILLUSH;     break;
-        case TOX_OBJECTS:       nPoolFmt = RES_POOLCOLL_TOX_OBJECTH;    break;
-        case TOX_TABLES:        nPoolFmt = RES_POOLCOLL_TOX_TABLESH;    break;
+        case TOX_ILLUSTRATIONS: nPoolFormat = RES_POOLCOLL_TOX_ILLUSH;     break;
+        case TOX_OBJECTS:       nPoolFormat = RES_POOLCOLL_TOX_OBJECTH;    break;
+        case TOX_TABLES:        nPoolFormat = RES_POOLCOLL_TOX_TABLESH;    break;
         case TOX_AUTHORITIES:
         case TOX_BIBLIOGRAPHY:
-            nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
+            nPoolFormat = RES_POOLCOLL_TOX_AUTHORITIESH; break;
         case  TOX_CITATION: /** TODO */break;
         case TOX_CONTENT:
             // There's a jump in the ContentArea!
             if( nLevel < 6 )
-                nPoolFmt = RES_POOLCOLL_TOX_CNTNTH;
+                nPoolFormat = RES_POOLCOLL_TOX_CNTNTH;
             else
-                nPoolFmt = RES_POOLCOLL_TOX_CNTNT6 - 6;
+                nPoolFormat = RES_POOLCOLL_TOX_CNTNT6 - 6;
             break;
         }
 
         if(eMyType == TOX_AUTHORITIES && nLevel)
-            nPoolFmt = nPoolFmt + 1;
+            nPoolFormat = nPoolFormat + 1;
         else if(eMyType == TOX_INDEX && nLevel)
         {
             // pool: Level 1,2,3, Delimiter
             // SwForm: Delimiter, Level 1,2,3
-            nPoolFmt += 1 == nLevel ? nLevel + 3 : nLevel - 1;
+            nPoolFormat += 1 == nLevel ? nLevel + 3 : nLevel - 1;
         }
         else
-            nPoolFmt = nPoolFmt + nLevel;
-        pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolFmt );
+            nPoolFormat = nPoolFormat + nLevel;
+        pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolFormat );
     }
     return pColl;
 }
 
 /// Create from Marks
 void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
-                                    const SwTxtNode* pOwnChapterNode )
+                                    const SwTextNode* pOwnChapterNode )
 {
     const SwTOXType* pType = static_cast<SwTOXType*>( SwTOXBase::GetRegisteredIn() );
     if( !pType->HasWriterListeners() )
         return;
 
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     TOXTypes eTOXTyp = GetTOXType()->GetType();
     SwIterator<SwTOXMark,SwTOXType> aIter( *pType );
 
-    SwTxtTOXMark* pTxtMark;
+    SwTextTOXMark* pTextMark;
     SwTOXMark* pMark;
     for( pMark = aIter.First(); pMark; pMark = aIter.Next() )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         if( pMark->GetTOXType()->GetType() == eTOXTyp &&
-            0 != ( pTxtMark = pMark->GetTxtTOXMark() ) )
+            0 != ( pTextMark = pMark->GetTextTOXMark() ) )
         {
-            const SwTxtNode* pTOXSrc = pTxtMark->GetpTxtNd();
+            const SwTextNode* pTOXSrc = pTextMark->GetpTextNd();
             // Only insert TOXMarks from the Doc, not from the
             // UNDO.
 
             // If selected use marks from the same chapter only
             if( pTOXSrc->GetNodes().IsDocNodes() &&
-                pTOXSrc->GetTxt().getLength() && pTOXSrc->HasWriterListeners() &&
+                pTOXSrc->GetText().getLength() && pTOXSrc->HasWriterListeners() &&
                 pTOXSrc->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
                (!IsFromChapter() || ::lcl_FindChapterNode( *pTOXSrc, 0 ) == pOwnChapterNode ) &&
                !pTOXSrc->HasHiddenParaField() &&
-               !SwScriptInfo::IsInHiddenRange( *pTOXSrc, pTxtMark->GetStart() ) )
+               !SwScriptInfo::IsInHiddenRange( *pTOXSrc, pTextMark->GetStart() ) )
             {
                 SwTOXSortTabBase* pBase = 0;
                 if(TOX_INDEX == eTOXTyp)
@@ -1167,21 +1167,21 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
                     if ( g_pBreakIt->GetBreakIter().is() )
                     {
                         aLocale = g_pBreakIt->GetLocale(
-                                        pTOXSrc->GetLang( pTxtMark->GetStart() ) );
+                                        pTOXSrc->GetLang( pTextMark->GetStart() ) );
                     }
 
-                    pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                    pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                             GetOptions(), FORM_ENTRY, rIntl, aLocale );
                     InsertSorted(pBase);
                     if(GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY &&
-                        !pTxtMark->GetTOXMark().GetPrimaryKey().isEmpty())
+                        !pTextMark->GetTOXMark().GetPrimaryKey().isEmpty())
                     {
-                        pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                        pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                                 GetOptions(), FORM_PRIMARY_KEY, rIntl, aLocale );
                         InsertSorted(pBase);
-                        if (!pTxtMark->GetTOXMark().GetSecondaryKey().isEmpty())
+                        if (!pTextMark->GetTOXMark().GetSecondaryKey().isEmpty())
                         {
-                            pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                            pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                                     GetOptions(), FORM_SECONDARY_KEY, rIntl, aLocale );
                             InsertSorted(pBase);
                         }
@@ -1191,7 +1191,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
                     pMark->GetLevel() <= GetLevel())
                 {   // table of content mark
                     // also used for user marks
-                    pBase = new SwTOXContent( *pTOXSrc, pTxtMark, rIntl );
+                    pBase = new SwTOXContent( *pTOXSrc, pTextMark, rIntl );
                     InsertSorted(pBase);
                 }
             }
@@ -1200,34 +1200,34 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
 }
 
 /// Generate table of contents from outline
-void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
 
     const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
     for( auto pOutlineNode : rOutlNds )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
-        SwTxtNode* pTxtNd = pOutlineNode->GetTxtNode();
-        if( pTxtNd && pTxtNd->Len() && pTxtNd->HasWriterListeners() &&
-            sal_uInt16( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() &&
-            pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
-           !pTxtNd->HasHiddenParaField() &&
-           !pTxtNd->HasHiddenCharAttribute( true ) &&
+        SwTextNode* pTextNd = pOutlineNode->GetTextNode();
+        if( pTextNd && pTextNd->Len() && pTextNd->HasWriterListeners() &&
+            sal_uInt16( pTextNd->GetAttrOutlineLevel()) <= GetLevel() &&
+            pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+           !pTextNd->HasHiddenParaField() &&
+           !pTextNd->HasHiddenCharAttribute( true ) &&
             ( !IsFromChapter() ||
-               ::lcl_FindChapterNode( *pTxtNd, 0 ) == pOwnChapterNode ))
+               ::lcl_FindChapterNode( *pTextNd, 0 ) == pOwnChapterNode ))
         {
-            SwTOXPara * pNew = new SwTOXPara( *pTxtNd, nsSwTOXElement::TOX_OUTLINELEVEL );
+            SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_OUTLINELEVEL );
             InsertSorted( pNew );
         }
     }
 }
 
 /// Generate table of contents from template areas
-void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateTemplate( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
         const OUString sTmpStyleNames = GetStyleNames(i);
@@ -1237,7 +1237,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
         sal_Int32 nIndex = 0;
         while (nIndex >= 0)
         {
-            SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(
+            SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName(
                                     sTmpStyleNames.getToken( 0, TOX_STYLE_DELIMITER, nIndex ));
             //TODO: no outline Collections in content indexes if OutlineLevels are already included
             if( !pColl ||
@@ -1246,18 +1246,18 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
                     pColl->IsAssignedToListLevelOfOutlineStyle()) )
                 continue;
 
-            SwIterator<SwTxtNode,SwFmtColl> aIter( *pColl );
-            for( SwTxtNode* pTxtNd = aIter.First(); pTxtNd; pTxtNd = aIter.Next() )
+            SwIterator<SwTextNode,SwFormatColl> aIter( *pColl );
+            for( SwTextNode* pTextNd = aIter.First(); pTextNd; pTextNd = aIter.Next() )
             {
                 ::SetProgressState( 0, pDoc->GetDocShell() );
 
-                if (pTxtNd->GetTxt().getLength() &&
-                    pTxtNd->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-                    pTxtNd->GetNodes().IsDocNodes() &&
+                if (pTextNd->GetText().getLength() &&
+                    pTextNd->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+                    pTextNd->GetNodes().IsDocNodes() &&
                     ( !IsFromChapter() || pOwnChapterNode ==
-                        ::lcl_FindChapterNode( *pTxtNd, 0 ) ) )
+                        ::lcl_FindChapterNode( *pTextNd, 0 ) ) )
                 {
-                    SwTOXPara * pNew = new SwTOXPara( *pTxtNd, nsSwTOXElement::TOX_TEMPLATE, i + 1 );
+                    SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_TEMPLATE, i + 1 );
                     InsertSorted(pNew);
                 }
             }
@@ -1266,42 +1266,42 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
 }
 
 /// Generate content from sequence fields
-void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateSequence( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
-    SwFieldType* pSeqFld = pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, GetSequenceName(), false);
-    if(!pSeqFld)
+    SwDoc* pDoc = GetFormat()->GetDoc();
+    SwFieldType* pSeqField = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, GetSequenceName(), false);
+    if(!pSeqField)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pSeqFld );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *pSeqField );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if(!pTxtFld)
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if(!pTextField)
             continue;
-        const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+        const SwTextNode& rTextNode = pTextField->GetTextNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        if (rTxtNode.GetTxt().getLength() &&
-            rTxtNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-            rTxtNode.GetNodes().IsDocNodes() &&
+        if (rTextNode.GetText().getLength() &&
+            rTextNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+            rTextNode.GetNodes().IsDocNodes() &&
             ( !IsFromChapter() ||
-                ::lcl_FindChapterNode( rTxtNode, 0 ) == pOwnChapterNode ) )
+                ::lcl_FindChapterNode( rTextNode, 0 ) == pOwnChapterNode ) )
         {
-            const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFmtFld->GetField()));
+            const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFormatField->GetField()));
             const OUString sName = GetSequenceName()
                 + OUStringLiteral1<cSequenceMarkSeparator>()
                 + OUString::number( rSeqField.GetSeqNumber() );
-            SwTOXPara * pNew = new SwTOXPara( rTxtNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
+            SwTOXPara * pNew = new SwTOXPara( rTextNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
             // set indexes if the number or the reference text are to be displayed
             if( GetCaptionDisplay() == CAPTION_TEXT )
             {
                 pNew->SetStartIndex(
-                    SwGetExpField::GetReferenceTextPos( *pFmtFld, *pDoc ));
+                    SwGetExpField::GetReferenceTextPos( *pFormatField, *pDoc ));
             }
             else if(GetCaptionDisplay() == CAPTION_NUMBER)
             {
-                pNew->SetEndIndex(pTxtFld->GetStart() + 1);
+                pNew->SetEndIndex(pTextField->GetStart() + 1);
             }
             InsertSorted(pNew);
         }
@@ -1310,34 +1310,34 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
 
 void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
-    SwFieldType* pAuthFld = pDoc->getIDocumentFieldsAccess().GetFldType(RES_AUTHORITY, OUString(), false);
-    if(!pAuthFld)
+    SwDoc* pDoc = GetFormat()->GetDoc();
+    SwFieldType* pAuthField = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_AUTHORITY, OUString(), false);
+    if(!pAuthField)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pAuthFld );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *pAuthField );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+        const SwTextField* pTextField = pFormatField->GetTextField();
         // undo
-        if(!pTxtFld)
+        if(!pTextField)
             continue;
-        const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+        const SwTextNode& rTextNode = pTextField->GetTextNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        if (rTxtNode.GetTxt().getLength() &&
-            rTxtNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-            rTxtNode.GetNodes().IsDocNodes() )
+        if (rTextNode.GetText().getLength() &&
+            rTextNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+            rTextNode.GetNodes().IsDocNodes() )
         {
             //#106485# the body node has to be used!
-            SwCntntFrm *pFrm = rTxtNode.getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
-            SwPosition aFldPos(rTxtNode);
-            const SwTxtNode* pTxtNode = 0;
+            SwContentFrm *pFrm = rTextNode.getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwPosition aFieldPos(rTextNode);
+            const SwTextNode* pTextNode = 0;
             if(pFrm && !pFrm->IsInDocBody())
-                pTxtNode = GetBodyTxtNode( *pDoc, aFldPos, *pFrm );
-            if(!pTxtNode)
-                pTxtNode = &rTxtNode;
-            SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, rIntl );
+                pTextNode = GetBodyTextNode( *pDoc, aFieldPos, *pFrm );
+            if(!pTextNode)
+                pTextNode = &rTextNode;
+            SwTOXAuthority* pNew = new SwTOXAuthority( *pTextNode, *pFormatField, rIntl );
 
             InsertSorted(pNew);
         }
@@ -1393,10 +1393,10 @@ static long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
     return nRet;
 }
 
-void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
-                                    const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateContent( SwTOXElement eMyType,
+                                    const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
     // on the 1st Node of the 1st Section
     sal_uLong nIdx = rNds.GetEndOfAutotext().StartOfSectionIndex() + 2,
@@ -1407,13 +1407,13 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         SwNode* pNd = rNds[ nIdx ];
-        SwCntntNode* pCNd = 0;
+        SwContentNode* pCNd = 0;
         switch( eMyType )
         {
         case nsSwTOXElement::TOX_FRAME:
-            if( !pNd->IsNoTxtNode() )
+            if( !pNd->IsNoTextNode() )
             {
-                pCNd = pNd->GetCntntNode();
+                pCNd = pNd->GetContentNode();
                 if( !pCNd )
                 {
                     SwNodeIndex aTmp( *pNd );
@@ -1423,7 +1423,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
             break;
         case nsSwTOXElement::TOX_GRAPHIC:
             if( pNd->IsGrfNode() )
-                pCNd = static_cast<SwCntntNode*>(pNd);
+                pCNd = static_cast<SwContentNode*>(pNd);
             break;
         case nsSwTOXElement::TOX_OLE:
             if( pNd->IsOLENode() )
@@ -1450,7 +1450,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
                 }
 
                 if(bInclude)
-                    pCNd = static_cast<SwCntntNode*>(pNd);
+                    pCNd = static_cast<SwContentNode*>(pNd);
             }
             break;
         default: break;
@@ -1467,13 +1467,13 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
                     TOX_ILLUSTRATIONS != SwTOXBase::GetType() &&
                     TOX_OBJECTS != SwTOXBase::GetType() )
             {
-                const SwTxtNode* pOutlNd = ::lcl_FindChapterNode( *pCNd,
+                const SwTextNode* pOutlNd = ::lcl_FindChapterNode( *pCNd,
                                                         MAXLEVEL - 1 );
                 if( pOutlNd )
                 {
-                    if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
+                    if( pOutlNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle())
                     {
-                        nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
+                        nSetLevel = pOutlNd->GetTextColl()->GetAttrOutlineLevel();
                     }
                 }
             }
@@ -1494,27 +1494,27 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
 }
 
 /// Collect table entries
-void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateTable( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
-    const SwFrmFmts& rArr = *pDoc->GetTblFrmFmts();
+    const SwFrameFormats& rArr = *pDoc->GetTableFrameFormats();
 
-    for( auto pFrmFmt : rArr )
+    for( auto pFrameFormat : rArr )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        SwTable* pTmpTbl = SwTable::FindTable( pFrmFmt );
+        SwTable* pTmpTable = SwTable::FindTable( pFrameFormat );
         SwTableBox* pFBox;
-        if( pTmpTbl && 0 != (pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+        if( pTmpTable && 0 != (pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
             pFBox->GetSttNd() && pFBox->GetSttNd()->GetNodes().IsDocNodes() )
         {
-            const SwTableNode* pTblNd = pFBox->GetSttNd()->FindTableNode();
-            SwNodeIndex aCntntIdx( *pTblNd, 1 );
+            const SwTableNode* pTableNd = pFBox->GetSttNd()->FindTableNode();
+            SwNodeIndex aContentIdx( *pTableNd, 1 );
 
-            SwCntntNode* pCNd;
-            while( 0 != ( pCNd = rNds.GoNext( &aCntntIdx ) ) &&
-                aCntntIdx.GetIndex() < pTblNd->EndOfSectionIndex() )
+            SwContentNode* pCNd;
+            while( 0 != ( pCNd = rNds.GoNext( &aContentIdx ) ) &&
+                aContentIdx.GetIndex() < pTableNd->EndOfSectionIndex() )
             {
                 if( pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) && (!IsFromChapter() ||
                     ::lcl_FindChapterNode( *pCNd, 0 ) == pOwnChapterNode ))
@@ -1522,13 +1522,13 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
                     SwTOXTable * pNew = new SwTOXTable( *pCNd );
                     if( IsLevelFromChapter() && TOX_TABLES != SwTOXBase::GetType())
                     {
-                        const SwTxtNode* pOutlNd =
+                        const SwTextNode* pOutlNd =
                             ::lcl_FindChapterNode( *pCNd, MAXLEVEL - 1 );
                         if( pOutlNd )
                         {
-                            if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
+                            if( pOutlNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle())
                             {
-                                const int nTmp = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
+                                const int nTmp = pOutlNd->GetTextColl()->GetAttrOutlineLevel();
                                 pNew->SetLevel(static_cast<sal_uInt16>(nTmp));
                             }
                         }
@@ -1550,7 +1550,7 @@ void SwTOXBaseSection::UpdatePageNum()
     // Insert the current PageNumber into the TOC
     SwPageFrm*  pAktPage    = 0;
     sal_uInt16      nPage       = 0;
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
 
     SwTOXInternational aIntl( GetLanguage(),
                               TOX_INDEX == GetTOXType()->GetType() ?
@@ -1569,13 +1569,13 @@ void SwTOXBaseSection::UpdatePageNum()
         if(GetTOXForm().IsCommaSeparated() &&
                 aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTxtMark->GetTOXMark();
+            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString sPrimKey = rMark.GetPrimaryKey();
             const OUString sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = 0;
             while(aSortArr.size() > (nCnt + nRange)&&
                     aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTxtMark->GetTOXMark())) &&
+                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -1594,15 +1594,15 @@ void SwTOXBaseSection::UpdatePageNum()
                 SwTOXSource& rTOXSource = pSortBase->aTOXSources[j];
                 if( rTOXSource.pNd )
                 {
-                    SwCntntFrm* pFrm = rTOXSource.pNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+                    SwContentFrm* pFrm = rTOXSource.pNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
                     OSL_ENSURE( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found");
                     if( !pFrm )
                         continue;
-                    if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->HasFollow() )
+                    if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->HasFollow() )
                     {
                         // find the right one
-                        SwTxtFrm* pNext;
-                        while( 0 != ( pNext = static_cast<SwTxtFrm*>(pFrm->GetFollow()) )
+                        SwTextFrm* pNext;
+                        while( 0 != ( pNext = static_cast<SwTextFrm*>(pFrm->GetFollow()) )
                                 && rTOXSource.nPos >= pNext->GetOfst() )
                             pFrm = pNext;
                     }
@@ -1638,10 +1638,10 @@ void SwTOXBaseSection::UpdatePageNum()
             const SwTOXSortTabBase* pBase = aSortArr[ nCnt ];
             if(pBase->pTOXNd)
             {
-                const SwTxtNode* pTxtNd = pBase->pTOXNd->GetTxtNode();
-                OSL_ENSURE( pTxtNd, "no TextNode, wrong TOC" );
+                const SwTextNode* pTextNd = pBase->pTOXNd->GetTextNode();
+                OSL_ENSURE( pTextNd, "no TextNode, wrong TOC" );
 
-                _UpdatePageNum( const_cast<SwTxtNode*>(pTxtNd), aNums, aDescs, pMainNums,
+                _UpdatePageNum( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums,
                                 aIntl );
             }
             DELETEZ(pMainNums);
@@ -1667,7 +1667,7 @@ static bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal
     return false;
 }
 
-void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
+void SwTOXBaseSection::_UpdatePageNum( SwTextNode* pNd,
                                     const std::vector<sal_uInt16>& rNums,
                                     const std::vector<SwPageDesc*>& rDescs,
                                     const std::vector<sal_uInt16>* pMainEntryNums,
@@ -1678,10 +1678,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 
     OUString sSrchStr = OUStringBuffer().append(C_NUM_REPL).
         append(S_PAGE_DELI).append(C_NUM_REPL).makeStringAndClear();
-    sal_Int32 nStartPos = pNd->GetTxt().indexOf(sSrchStr);
+    sal_Int32 nStartPos = pNd->GetText().indexOf(sSrchStr);
     sSrchStr = OUStringBuffer().append(C_NUM_REPL).
         append(C_END_PAGE_NUM).makeStringAndClear();
-    sal_Int32 nEndPos = pNd->GetTxt().indexOf(sSrchStr);
+    sal_Int32 nEndPos = pNd->GetText().indexOf(sSrchStr);
 
     if (-1 == nEndPos || rNums.empty())
         return;
@@ -1701,18 +1701,18 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 
     // Delete place holder
     SwIndex aPos(pNd, nStartPos);
-    SwCharFmt* pPageNoCharFmt = 0;
+    SwCharFormat* pPageNoCharFormat = 0;
     SwpHints* pHints = pNd->GetpSwpHints();
     if(pHints)
         for(size_t nHintIdx = 0; nHintIdx < pHints->GetStartCount(); ++nHintIdx)
         {
-            SwTxtAttr* pAttr = pHints->GetStart(nHintIdx);
+            SwTextAttr* pAttr = pHints->GetStart(nHintIdx);
             const sal_Int32 nTmpEnd = pAttr->End() ? *pAttr->End() : 0;
             if( nStartPos >= pAttr->GetStart() &&
                 (nStartPos + 2) <= nTmpEnd &&
                 pAttr->Which() == RES_TXTATR_CHARFMT)
             {
-                pPageNoCharFmt = pAttr->GetCharFmt().GetCharFmt();
+                pPageNoCharFormat = pAttr->GetCharFormat().GetCharFormat();
                 break;
             }
         }
@@ -1791,10 +1791,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
         }
     }
     pNd->InsertText( aNumStr, aPos, SwInsertFlags::EMPTYEXPAND | SwInsertFlags::FORCEHINTEXPAND );
-    if(pPageNoCharFmt)
+    if(pPageNoCharFormat)
     {
-        SwFmtCharFmt aCharFmt( pPageNoCharFmt );
-        pNd->InsertItem(aCharFmt, nStartPos, nStartPos + aNumStr.getLength(), SetAttrMode::DONTEXPAND);
+        SwFormatCharFormat aCharFormat( pPageNoCharFormat );
+        pNd->InsertItem(aCharFormat, nStartPos, nStartPos + aNumStr.getLength(), SetAttrMode::DONTEXPAND);
     }
 
     // The main entries should get their character style
@@ -1807,22 +1807,22 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
         // search by name
         SwDoc* pDoc = pNd->GetDoc();
         sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( GetMainEntryCharStyle(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-        SwCharFmt* pCharFmt = 0;
+        SwCharFormat* pCharFormat = 0;
         if(USHRT_MAX != nPoolId)
-            pCharFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(nPoolId);
+            pCharFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(nPoolId);
         else
-            pCharFmt = pDoc->FindCharFmtByName( GetMainEntryCharStyle() );
-        if(!pCharFmt)
-            pCharFmt = pDoc->MakeCharFmt(GetMainEntryCharStyle(), 0);
+            pCharFormat = pDoc->FindCharFormatByName( GetMainEntryCharStyle() );
+        if(!pCharFormat)
+            pCharFormat = pDoc->MakeCharFormat(GetMainEntryCharStyle(), 0);
 
         // find the page numbers in aNumStr and set the character style
-        sal_Int32 nOffset = pNd->GetTxt().getLength() - aNumStr.getLength();
-        SwFmtCharFmt aCharFmt(pCharFmt);
+        sal_Int32 nOffset = pNd->GetText().getLength() - aNumStr.getLength();
+        SwFormatCharFormat aCharFormat(pCharFormat);
         for (sal_uInt16 j = 0; j < xCharStyleIdx->size(); j += 2)
         {
             sal_Int32 nStartIdx = (*xCharStyleIdx)[j] + nOffset;
             sal_Int32 nEndIdx   = (*xCharStyleIdx)[j + 1]  + nOffset;
-            pNd->InsertItem(aCharFmt, nStartIdx, nEndIdx, SetAttrMode::DONTEXPAND);
+            pNd->InsertItem(aCharFormat, nStartIdx, nEndIdx, SetAttrMode::DONTEXPAND);
         }
 
     }
@@ -1831,9 +1831,9 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
 {
     Range aRange(0, aSortArr.size());
-    if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTxtMark )
+    if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTextMark )
     {
-        const SwTOXMark& rMark = pNew->pTxtMark->GetTOXMark();
+        const SwTOXMark& rMark = pNew->pTextMark->GetTOXMark();
         // Evaluate Key
         // Calculate the range where to insert
         if( 0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY) &&
@@ -1942,7 +1942,7 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
     {
         SwTOXSortTabBase* pBase = aSortArr[i];
 
-        if( rIntl.IsEqual( pBase->GetTxt(), pBase->GetLocale(),
+        if( rIntl.IsEqual( pBase->GetText(), pBase->GetLocale(),
                            aToCompare, rNew.GetLocale() )  &&
                     pBase->GetLevel() == nLevel )
             break;
@@ -1975,10 +1975,10 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
 bool SwTOXBase::IsTOXBaseInReadonly() const
 {
     const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-    if (!pSect || !pSect->GetFmt())
+    if (!pSect || !pSect->GetFormat())
         return false;
 
-    const SwSectionNode* pSectNode = pSect->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNode = pSect->GetFormat()->GetSectionNode();
     if (!pSectNode)
         return false;
 
@@ -1999,16 +1999,16 @@ bool SwTOXBase::IsTOXBaseInReadonly() const
 const SfxItemSet* SwTOXBase::GetAttrSet() const
 {
     const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-    if(pSect && pSect->GetFmt())
-        return &pSect->GetFmt()->GetAttrSet();
+    if(pSect && pSect->GetFormat())
+        return &pSect->GetFormat()->GetAttrSet();
     return 0;
 }
 
 void SwTOXBase::SetAttrSet( const SfxItemSet& rSet )
 {
     SwTOXBaseSection *pSect = dynamic_cast<SwTOXBaseSection*>(this);
-    if( pSect && pSect->GetFmt() )
-        pSect->GetFmt()->SetFmtAttr( rSet );
+    if( pSect && pSect->GetFormat() )
+        pSect->GetFormat()->SetFormatAttr( rSet );
 }
 
 bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const
@@ -2018,8 +2018,8 @@ bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const
     case RES_CONTENT_VISIBLE:
         {
             const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-            if( pSect && pSect->GetFmt() )
-                pSect->GetFmt()->GetInfo( rInfo );
+            if( pSect && pSect->GetFormat() )
+                pSect->GetFormat()->GetInfo( rInfo );
         }
         return false;
     }
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 052b555108dd..362842a2fce9 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -51,7 +51,7 @@ SwExtTextInput::~SwExtTextInput()
     SwDoc *const pDoc = GetDoc();
     if (pDoc->IsInDtor()) { return; /* #i58606# */ }
 
-    SwTxtNode* pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if( pTNd )
     {
         SwIndex& rIdx = GetPoint()->nContent;
@@ -85,10 +85,10 @@ SwExtTextInput::~SwExtTextInput()
                 }
             }
             rIdx = nSttCnt;
-            const OUString sTxt( pTNd->GetTxt().copy(nSttCnt, nEndCnt - nSttCnt));
+            const OUString sText( pTNd->GetText().copy(nSttCnt, nEndCnt - nSttCnt));
             if( bIsOverwriteCursor && !sOverwriteText.isEmpty() )
             {
-                const sal_Int32 nLen = sTxt.getLength();
+                const sal_Int32 nLen = sText.getLength();
                 const sal_Int32 nOWLen = sOverwriteText.getLength();
                 if( nLen > nOWLen )
                 {
@@ -100,8 +100,8 @@ SwExtTextInput::~SwExtTextInput()
                     {
                         rIdx = nSttCnt;
                         pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_OVERWRITE, NULL );
-                        pDoc->getIDocumentContentOperations().Overwrite( *this, sTxt.copy( 0, nOWLen ) );
-                        pDoc->getIDocumentContentOperations().InsertString( *this, sTxt.copy( nOWLen ) );
+                        pDoc->getIDocumentContentOperations().Overwrite( *this, sText.copy( 0, nOWLen ) );
+                        pDoc->getIDocumentContentOperations().InsertString( *this, sText.copy( nOWLen ) );
                         pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_OVERWRITE, NULL );
                     }
                 }
@@ -111,7 +111,7 @@ SwExtTextInput::~SwExtTextInput()
                     if( bInsText )
                     {
                         rIdx = nSttCnt;
-                        pDoc->getIDocumentContentOperations().Overwrite( *this, sTxt );
+                        pDoc->getIDocumentContentOperations().Overwrite( *this, sText );
                     }
                 }
             }
@@ -121,7 +121,7 @@ SwExtTextInput::~SwExtTextInput()
 
                 if( bInsText )
                 {
-                    pDoc->getIDocumentContentOperations().InsertString( *this, sTxt );
+                    pDoc->getIDocumentContentOperations().InsertString( *this, sText );
                 }
             }
         }
@@ -130,7 +130,7 @@ SwExtTextInput::~SwExtTextInput()
 
 void SwExtTextInput::SetInputData( const CommandExtTextInputData& rData )
 {
-    SwTxtNode* pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if( pTNd )
     {
         sal_Int32 nSttCnt = GetPoint()->nContent.GetIndex();
@@ -208,12 +208,12 @@ void SwExtTextInput::SetOverwriteCursor( bool bFlag )
     if (!bIsOverwriteCursor)
         return;
 
-    const SwTxtNode *const pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode *const pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if (pTNd)
     {
         const sal_Int32 nSttCnt = GetPoint()->nContent.GetIndex();
         const sal_Int32 nEndCnt = GetMark()->nContent.GetIndex();
-        sOverwriteText = pTNd->GetTxt().copy( std::min(nSttCnt, nEndCnt) );
+        sOverwriteText = pTNd->GetText().copy( std::min(nSttCnt, nEndCnt) );
         if( !sOverwriteText.isEmpty() )
         {
             const sal_Int32 nInPos = sOverwriteText.indexOf( CH_TXTATR_INWORD );
@@ -257,7 +257,7 @@ void SwDoc::DeleteExtTextInput( SwExtTextInput* pDel )
 }
 
 SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
-                                        sal_Int32 nCntntPos ) const
+                                        sal_Int32 nContentPos ) const
 {
     SwExtTextInput* pRet = 0;
     if( mpExtInputRing )
@@ -277,8 +277,8 @@ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
             }
 
             if( nMk <= nNdIdx && nNdIdx <= nPt &&
-                ( nCntntPos<0 ||
-                    ( nMkCnt <= nCntntPos && nCntntPos <= nPtCnt )))
+                ( nContentPos<0 ||
+                    ( nMkCnt <= nContentPos && nContentPos <= nPtCnt )))
             {
                 pRet = pTmp;
                 break;
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index cafbb4791bdc..299a8cb6fc91 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -35,88 +35,88 @@
 #include <calbck.hxx>
 #include <svl/intitem.hxx>
 
-TYPEINIT1( SwTxtFmtColl, SwFmtColl );
-TYPEINIT1( SwGrfFmtColl, SwFmtColl );
-TYPEINIT1( SwConditionTxtFmtColl, SwTxtFmtColl );
+TYPEINIT1( SwTextFormatColl, SwFormatColl );
+TYPEINIT1( SwGrfFormatColl, SwFormatColl );
+TYPEINIT1( SwConditionTextFormatColl, SwTextFormatColl );
 TYPEINIT1( SwCollCondition, SwClient );
 
-namespace TxtFmtCollFunc
+namespace TextFormatCollFunc
 {
     // #i71574#
-    void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
-                                            SwFmt* pFmt,
+    void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
+                                            SwFormat* pFormat,
                                             const SwNumRuleItem* pNewNumRuleItem )
     {
-        SwTxtFmtColl* pTxtFmtColl = dynamic_cast<SwTxtFmtColl*>(pFmt);
-        if ( !pTxtFmtColl )
+        SwTextFormatColl* pTextFormatColl = dynamic_cast<SwTextFormatColl*>(pFormat);
+        if ( !pTextFormatColl )
         {
-            OSL_FAIL( "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" );
+            OSL_FAIL( "<TextFormatCollFunc::CheckTextFormatCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTextFormatColl>" );
             return;
         }
 
         // #i73790#
-        if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() &&
-             pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+        if ( !pTextFormatColl->StayAssignedToListLevelOfOutlineStyle() &&
+             pTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             if ( !pNewNumRuleItem )
             {
-                pTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNewNumRuleItem) );
+                pTextFormatColl->GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNewNumRuleItem) );
             }
             if ( pNewNumRuleItem )
             {
                 OUString sNumRuleName = pNewNumRuleItem->GetValue();
                 if ( sNumRuleName.isEmpty() ||
-                     sNumRuleName != pTxtFmtColl->GetDoc()->GetOutlineNumRule()->GetName() )
+                     sNumRuleName != pTextFormatColl->GetDoc()->GetOutlineNumRule()->GetName() )
                 {
                     // delete assignment of paragraph style to list level of outline style.
-                    pTxtFmtColl->DeleteAssignmentToListLevelOfOutlineStyle();
+                    pTextFormatColl->DeleteAssignmentToListLevelOfOutlineStyle();
                 }
             }
         }
     }
 
-    SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl )
+    SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl )
     {
         SwNumRule* pNumRule( 0 );
 
         const SwNumRuleItem* pNumRuleItem( 0 );
-        rTxtFmtColl.GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNumRuleItem) );
+        rTextFormatColl.GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNumRuleItem) );
         if ( pNumRuleItem )
         {
             const OUString sNumRuleName = pNumRuleItem->GetValue();
             if ( !sNumRuleName.isEmpty() )
             {
-                pNumRule = rTxtFmtColl.GetDoc()->FindNumRulePtr( sNumRuleName );
+                pNumRule = rTextFormatColl.GetDoc()->FindNumRulePtr( sNumRuleName );
             }
         }
 
         return pNumRule;
     }
 
-    void AddToNumRule( SwTxtFmtColl& rTxtFmtColl )
+    void AddToNumRule( SwTextFormatColl& rTextFormatColl )
     {
-        SwNumRule* pNumRule = GetNumRule( rTxtFmtColl );
+        SwNumRule* pNumRule = GetNumRule( rTextFormatColl );
         if ( pNumRule )
         {
-            pNumRule->AddParagraphStyle( rTxtFmtColl );
+            pNumRule->AddParagraphStyle( rTextFormatColl );
         }
     }
 
-    void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl )
+    void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl )
     {
-        SwNumRule* pNumRule = GetNumRule( rTxtFmtColl );
+        SwNumRule* pNumRule = GetNumRule( rTextFormatColl );
         if ( pNumRule )
         {
-            pNumRule->RemoveParagraphStyle( rTxtFmtColl );
+            pNumRule->RemoveParagraphStyle( rTextFormatColl );
         }
     }
-} // end of namespace TxtFmtCollFunc
+} // end of namespace TextFormatCollFunc
 
-void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwTextFormatColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if( GetDoc()->IsInDtor() )
     {
-        SwFmtColl::Modify( pOld, pNew );
+        SwFormatColl::Modify( pOld, pNew );
         return;
     }
 
@@ -200,7 +200,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     // #i70223#
     if ( bAssignedToListLevelOfOutlineStyle && pNewNumRuleItem )
     {
-        TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
+        TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
                                                         this, pNewNumRuleItem );
     }
 
@@ -229,16 +229,16 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                 bChg |= nTmp != aNew.GetRight();
             }
             // We had a relative value -> recalculate
-            if( 100 != aNew.GetPropTxtFirstLineOfst() )
+            if( 100 != aNew.GetPropTextFirstLineOfst() )
             {
-                short nTmp = aNew.GetTxtFirstLineOfst();    // keep so that we can compare
-                aNew.SetTxtFirstLineOfst( pNewLRSpace->GetTxtFirstLineOfst(),
-                                            aNew.GetPropTxtFirstLineOfst() );
-                bChg |= nTmp != aNew.GetTxtFirstLineOfst();
+                short nTmp = aNew.GetTextFirstLineOfst();    // keep so that we can compare
+                aNew.SetTextFirstLineOfst( pNewLRSpace->GetTextFirstLineOfst(),
+                                            aNew.GetPropTextFirstLineOfst() );
+                bChg |= nTmp != aNew.GetTextFirstLineOfst();
             }
             if( bChg )
             {
-                SetFmtAttr( aNew );
+                SetFormatAttr( aNew );
                 bContinue = 0 != pOldChgSet || bNewParent;
             }
             // We set it to absolute -> do not propagate it further, unless
@@ -270,7 +270,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         }
         if( bChg )
         {
-            SetFmtAttr( aNew );
+            SetFormatAttr( aNew );
             bContinue = 0 != pOldChgSet || bNewParent;
         }
         // We set it to absolute -> do not propagate it further, unless
@@ -305,7 +305,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                                 pOldFSize->GetPropUnit() );
                 if( nTmp != aNew.GetHeight() )
                 {
-                    SetFmtAttr( aNew );
+                    SetFormatAttr( aNew );
                     bContinue = 0 != pOldChgSet || bNewParent;
                 }
                 // We set it to absolute -> do not propagate it further, unless
@@ -317,58 +317,58 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 
     if( bContinue )
-        SwFmtColl::Modify( pOld, pNew );
+        SwFormatColl::Modify( pOld, pNew );
 }
 
-bool SwTxtFmtColl::IsAtDocNodeSet() const
+bool SwTextFormatColl::IsAtDocNodeSet() const
 {
-    SwIterator<SwCntntNode,SwFmtColl> aIter( *this );
+    SwIterator<SwContentNode,SwFormatColl> aIter( *this );
     const SwNodes& rNds = GetDoc()->GetNodes();
-    for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() )
+    for( SwContentNode* pNode = aIter.First(); pNode; pNode = aIter.Next() )
         if( &(pNode->GetNodes()) == &rNds )
             return true;
 
     return false;
 }
 
-bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwTextFormatColl::SetFormatAttr( const SfxPoolItem& rAttr )
 {
     const bool bIsNumRuleItem = rAttr.Which() == RES_PARATR_NUMRULE;
     if ( bIsNumRuleItem )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::SetFmtAttr( rAttr );
+    const bool bRet = SwFormatColl::SetFormatAttr( rAttr );
 
     if ( bIsNumRuleItem )
     {
-        TxtFmtCollFunc::AddToNumRule( *this );
+        TextFormatCollFunc::AddToNumRule( *this );
     }
 
     return bRet;
 }
 
-bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
+bool SwTextFormatColl::SetFormatAttr( const SfxItemSet& rSet )
 {
     const bool bIsNumRuleItemAffected =
                 rSet.GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::SET;
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::SetFmtAttr( rSet );
+    const bool bRet = SwFormatColl::SetFormatAttr( rSet );
 
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::AddToNumRule( *this );
+        TextFormatCollFunc::AddToNumRule( *this );
     }
 
     return bRet;
 }
 
-bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwTextFormatColl::ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     const bool bIsNumRuleItemAffected =
                 ( nWhich2 != 0 && nWhich2 > nWhich1 )
@@ -377,16 +377,16 @@ bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
                 : nWhich1 == RES_PARATR_NUMRULE;
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 );
+    const bool bRet = SwFormatColl::ResetFormatAttr( nWhich1, nWhich2 );
 
     return bRet;
 }
 
 // #i73790#
-sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
+sal_uInt16 SwTextFormatColl::ResetAllFormatAttr()
 {
     const bool bOldState( mbStayAssignedToListLevelOfOutlineStyle );
     mbStayAssignedToListLevelOfOutlineStyle = true;
@@ -398,7 +398,7 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
                                      ? GetAssignedOutlineStyleLevel()
                                      : -1;
 
-    sal_uInt16 nRet = SwFmtColl::ResetAllFmtAttr();
+    sal_uInt16 nRet = SwFormatColl::ResetAllFormatAttr();
 
     // #i70748#
     if ( nAssignedOutlineStyleLevel != -1 )
@@ -411,7 +411,7 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
     return nRet;
 }
 
-bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
+bool SwTextFormatColl::AreListLevelIndentsApplicable() const
 {
     bool bAreListLevelIndentsApplicable( true );
 
@@ -437,7 +437,7 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
         // paragraph style has no hard-set indent attributes
 
         // check parent paragraph styles
-        const SwTxtFmtColl* pColl = dynamic_cast<const SwTxtFmtColl*>(DerivedFrom());
+        const SwTextFormatColl* pColl = dynamic_cast<const SwTextFormatColl*>(DerivedFrom());
         while ( pColl )
         {
             if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, false ) == SfxItemState::SET )
@@ -455,46 +455,46 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
                 break;
             }
 
-            pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom());
+            pColl = dynamic_cast<const SwTextFormatColl*>(pColl->DerivedFrom());
             OSL_ENSURE( pColl,
-                    "<SwTxtFmtColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." );
+                    "<SwTextFormatColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." );
         }
     }
 
     return bAreListLevelIndentsApplicable;
 }
 
-void SwTxtFmtColl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextFormatColl::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtFmtColl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextFormatColl"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     GetAttrSet().dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextFormatColls::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtFmtColls"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextFormatColls"));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
 //FEATURE::CONDCOLL
 
-SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                                 sal_uLong nSubCond )
     : SwClient( pColl ), nCondition( nMasterCond )
 {
     aSubCondition.nSubCondition = nSubCond;
 }
 
-SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                                     const OUString& rSubExp )
     : SwClient( pColl ), nCondition( nMasterCond )
 {
     if( USRFLD_EXPRESSION & nCondition )
-        aSubCondition.pFldExpression = new OUString( rSubExp );
+        aSubCondition.pFieldExpression = new OUString( rSubExp );
     else
         aSubCondition.nSubCondition = 0;
 }
@@ -503,7 +503,7 @@ SwCollCondition::SwCollCondition( const SwCollCondition& rCopy )
     : SwClient( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ), nCondition( rCopy.nCondition )
 {
     if( USRFLD_EXPRESSION & rCopy.nCondition )
-        aSubCondition.pFldExpression = new OUString( *rCopy.GetFldExpression() );
+        aSubCondition.pFieldExpression = new OUString( *rCopy.GetFieldExpression() );
     else
         aSubCondition.nSubCondition = rCopy.aSubCondition.nSubCondition;
 }
@@ -511,12 +511,12 @@ SwCollCondition::SwCollCondition( const SwCollCondition& rCopy )
 SwCollCondition::~SwCollCondition()
 {
     if( USRFLD_EXPRESSION & nCondition )
-        delete aSubCondition.pFldExpression;
+        delete aSubCondition.pFieldExpression;
 }
 
-void SwCollCondition::RegisterToFormat( SwFmt& rFmt )
+void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
@@ -527,14 +527,14 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
         if( USRFLD_EXPRESSION & nCondition )
         {
             // The SubCondition contains the expression for the UserField
-            const OUString* pTmp = aSubCondition.pFldExpression;
+            const OUString* pTmp = aSubCondition.pFieldExpression;
             if( !pTmp )
-                pTmp = rCmp.aSubCondition.pFldExpression;
+                pTmp = rCmp.aSubCondition.pFieldExpression;
             if( pTmp )
             {
-                SwTxtFmtColl* pColl = GetTxtFmtColl();
+                SwTextFormatColl* pColl = GetTextFormatColl();
                 if( !pColl )
-                    pColl = rCmp.GetTxtFmtColl();
+                    pColl = rCmp.GetTextFormatColl();
 
                 if( pColl )
                 {
@@ -553,16 +553,16 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
 void SwCollCondition::SetCondition( sal_uLong nCond, sal_uLong nSubCond )
 {
     if( USRFLD_EXPRESSION & nCondition )
-        delete aSubCondition.pFldExpression;
+        delete aSubCondition.pFieldExpression;
     nCondition = nCond;
     aSubCondition.nSubCondition = nSubCond;
 }
 
-SwConditionTxtFmtColl::~SwConditionTxtFmtColl()
+SwConditionTextFormatColl::~SwConditionTextFormatColl()
 {
 }
 
-const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
+const SwCollCondition* SwConditionTextFormatColl::HasCondition(
                         const SwCollCondition& rCond ) const
 {
     for( const auto &rFnd : aCondColls )
@@ -572,9 +572,9 @@ const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
     return nullptr;
 }
 
-void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
+void SwConditionTextFormatColl::InsertCondition( const SwCollCondition& rCond )
 {
-    for( SwFmtCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
+    for( SwFormatCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
         if( aCondColls[ n ] == rCond )
         {
             aCondColls.erase( aCondColls.begin() + n );
@@ -586,10 +586,10 @@ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
     aCondColls.push_back( pNew );
 }
 
-bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
+bool SwConditionTextFormatColl::RemoveCondition( const SwCollCondition& rCond )
 {
     bool bRet = false;
-    for( SwFmtCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
+    for( SwFormatCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
         if( aCondColls[ n ] == rCond )
         {
             aCondColls.erase( aCondColls.begin() + n );
@@ -599,20 +599,20 @@ bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
     return bRet;
 }
 
-void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
+void SwConditionTextFormatColl::SetConditions( const SwFormatCollConditions& rCndClls )
 {
     // Copy the Conditions, but first delete the old ones
     aCondColls.clear();
     SwDoc& rDoc = *GetDoc();
     for( const auto &rFnd : rCndClls )
     {
-        SwTxtFmtColl* pTmpColl = rFnd.GetTxtFmtColl()
-                                    ? rDoc.CopyTxtColl( *rFnd.GetTxtFmtColl() )
+        SwTextFormatColl* pTmpColl = rFnd.GetTextFormatColl()
+                                    ? rDoc.CopyTextColl( *rFnd.GetTextFormatColl() )
                                     : 0;
         SwCollCondition* pNew;
         if( USRFLD_EXPRESSION & rFnd.GetCondition() )
             pNew = new SwCollCondition( pTmpColl, rFnd.GetCondition(),
-                                        *rFnd.GetFldExpression() );
+                                        *rFnd.GetFieldExpression() );
         else
             pNew = new SwCollCondition( pTmpColl, rFnd.GetCondition(),
                                         rFnd.GetSubCondition() );
@@ -621,59 +621,59 @@ void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
 }
 
 // FEATURE::CONDCOLL
-void SwTxtFmtColl::SetAttrOutlineLevel( int nLevel)
+void SwTextFormatColl::SetAttrOutlineLevel( int nLevel)
 {
-    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" );
-    SetFmtAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
+    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTextFormatColl: Level Out Of Range" );
+    SetFormatAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
                             static_cast<sal_uInt16>(nLevel) ) );
 }
 
-int SwTxtFmtColl::GetAttrOutlineLevel() const
+int SwTextFormatColl::GetAttrOutlineLevel() const
 {
-    return static_cast<const SfxUInt16Item &>(GetFmtAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
+    return static_cast<const SfxUInt16Item &>(GetFormatAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
 }
 
-int SwTxtFmtColl::GetAssignedOutlineStyleLevel() const
+int SwTextFormatColl::GetAssignedOutlineStyleLevel() const
 {
     OSL_ENSURE( IsAssignedToListLevelOfOutlineStyle(),
-        "<SwTxtFmtColl::GetAssignedOutlineStyleLevel()> - misuse of method");
+        "<SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method");
     return GetAttrOutlineLevel() - 1;
 }
 
-void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
+void SwTextFormatColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
 {
     mbAssignedToOutlineStyle = true;
     SetAttrOutlineLevel(nAssignedListLevel+1);
 
     // #i100277#
-    SwIterator<SwTxtFmtColl,SwFmtColl> aIter( *this );
-    SwTxtFmtColl* pDerivedTxtFmtColl = aIter.First();
-    while ( pDerivedTxtFmtColl != 0 )
+    SwIterator<SwTextFormatColl,SwFormatColl> aIter( *this );
+    SwTextFormatColl* pDerivedTextFormatColl = aIter.First();
+    while ( pDerivedTextFormatColl != 0 )
     {
-        if ( !pDerivedTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+        if ( !pDerivedTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::DEFAULT )
+            if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::DEFAULT )
             {
                 SwNumRuleItem aItem(aEmptyOUStr);
-                pDerivedTxtFmtColl->SetFmtAttr( aItem );
+                pDerivedTextFormatColl->SetFormatAttr( aItem );
             }
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SfxItemState::DEFAULT )
+            if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SfxItemState::DEFAULT )
             {
-                pDerivedTxtFmtColl->SetAttrOutlineLevel( 0 );
+                pDerivedTextFormatColl->SetAttrOutlineLevel( 0 );
             }
         }
 
-        pDerivedTxtFmtColl = aIter.Next();
+        pDerivedTextFormatColl = aIter.Next();
     }
 }
 
-void SwTxtFmtColl::DeleteAssignmentToListLevelOfOutlineStyle(
+void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle(
     const bool bResetOutlineLevel)
 {
     mbAssignedToOutlineStyle = false;
     if (bResetOutlineLevel)
     {
-        ResetFmtAttr(RES_PARATR_OUTLINELEVEL);
+        ResetFormatAttr(RES_PARATR_OUTLINELEVEL);
     }
 }
 
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 998996988767..c65ec4d42cf8 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -29,14 +29,14 @@
 #include <fmtftntx.hxx>
 #include <rootfrm.hxx>
 
-bool CompareSwFtnIdxs::operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const
+bool CompareSwFootnoteIdxs::operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const
 {
-    sal_uLong nIdxLHS = _SwTxtFtn_GetIndex( lhs );
-    sal_uLong nIdxRHS = _SwTxtFtn_GetIndex( rhs );
+    sal_uLong nIdxLHS = _SwTextFootnote_GetIndex( lhs );
+    sal_uLong nIdxRHS = _SwTextFootnote_GetIndex( rhs );
     return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) || nIdxLHS < nIdxRHS;
 }
 
-void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
+void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
 {
     if( empty() )
         return;
@@ -45,14 +45,14 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
     SwDoc* pDoc = rStt.GetNode().GetDoc();
     if( pDoc->IsInReading() )
         return ;
-    SwTxtFtn* pTxtFtn;
+    SwTextFootnote* pTextFootnote;
 
     const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
-    const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+    const SwFootnoteInfo& rFootnoteInfo = pDoc->GetFootnoteInfo();
 
     // For normal foot notes we treat per-chapter and per-document numbering
     // separately. For Endnotes we only have per-document numbering.
-    if( FTNNUM_CHAPTER == rFtnInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
     {
         const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
         const SwNode* pCapStt = &pDoc->GetNodes().GetEndOfExtras();
@@ -65,11 +65,11 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
             for( ; n < rOutlNds.size(); ++n )
                 if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
                     break;      // found it!
-                else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+                else if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
                     pCapStt = rOutlNds[ n ];    // Beginning of a new Chapter
             // now find the end of the range
             for( ; n < rOutlNds.size(); ++n )
-                if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+                if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
                 {
                     nCapEnd = rOutlNds[ n ]->GetIndex();    // End of the found Chapter
                     break;
@@ -77,12 +77,12 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
         }
 
         size_t nPos = 0;
-        size_t nFtnNo = 1;
+        size_t nFootnoteNo = 1;
         if( SeekEntry( *pCapStt, &nPos ) && nPos )
         {
             // Step forward until the Index is not the same anymore
             const SwNode* pCmpNd = &rStt.GetNode();
-            while( nPos && pCmpNd == &((*this)[ --nPos ]->GetTxtNode()) )
+            while( nPos && pCmpNd == &((*this)[ --nPos ]->GetTextNode()) )
                 ;
             ++nPos;
         }
@@ -91,47 +91,47 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
             return;
 
         if( rOutlNds.empty() )
-            nFtnNo = nPos+1;
+            nFootnoteNo = nPos+1;
 
         for( ; nPos < size(); ++nPos )
         {
-            pTxtFtn = (*this)[ nPos ];
-            if( pTxtFtn->GetTxtNode().GetIndex() >= nCapEnd )
+            pTextFootnote = (*this)[ nPos ];
+            if( pTextFootnote->GetTextNode().GetIndex() >= nCapEnd )
                 break;
 
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr().isEmpty() && !rFtn.IsEndNote() &&
-                !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr().isEmpty() && !rFootnote.IsEndNote() &&
+                !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
             {
-                pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nFtnNo++, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nFootnoteNo++, rFootnote.GetNumStr() );
             }
         }
     }
 
-    SwUpdFtnEndNtAtEnd aNumArr;
+    SwUpdFootnoteEndNtAtEnd aNumArr;
 
     // unless we have per-document numbering, only look at endnotes here
-    const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
 
     size_t nPos;
-    size_t nFtnNo = 1;
+    size_t nFootnoteNo = 1;
     size_t nEndNo = 1;
     sal_uLong nUpdNdIdx = rStt.GetIndex();
     for( nPos = 0; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        if( nUpdNdIdx <= pTxtFtn->GetTxtNode().GetIndex() )
+        pTextFootnote = (*this)[ nPos ];
+        if( nUpdNdIdx <= pTextFootnote->GetTextNode().GetIndex() )
             break;
 
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            if( !aNumArr.ChkNumber( *pTxtFtn ) )
+            if( !aNumArr.ChkNumber( *pTextFootnote ) )
             {
-                if( pTxtFtn->GetFtn().IsEndNote() )
+                if( pTextFootnote->GetFootnote().IsEndNote() )
                     nEndNo++;
                 else
-                    nFtnNo++;
+                    nFootnoteNo++;
             }
         }
     }
@@ -139,111 +139,111 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
     // Set the array number for all footnotes starting from nPos
     for( ; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        pTextFootnote = (*this)[ nPos ];
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTxtFtn );
-            if( !nSectNo && ( rFtn.IsEndNote() || !bEndNoteOnly ))
-                nSectNo = rFtn.IsEndNote()
-                            ? rEndInfo.nFtnOffset + nEndNo++
-                            : rFtnInfo.nFtnOffset + nFtnNo++;
+            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTextFootnote );
+            if( !nSectNo && ( rFootnote.IsEndNote() || !bEndNoteOnly ))
+                nSectNo = rFootnote.IsEndNote()
+                            ? rEndInfo.nFootnoteOffset + nEndNo++
+                            : rFootnoteInfo.nFootnoteOffset + nFootnoteNo++;
 
             if( nSectNo )
             {
-                pTxtFtn->SetNumber( nSectNo, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( nSectNo, rFootnote.GetNumStr() );
             }
         }
     }
 }
 
-void SwFtnIdxs::UpdateAllFtn()
+void SwFootnoteIdxs::UpdateAllFootnote()
 {
     if( empty() )
         return;
 
     // Get the NodesArray via the StartIndex of the first Footnote
-    SwDoc* pDoc = const_cast<SwDoc*>((*this)[ 0 ]->GetTxtNode().GetDoc());
-    SwTxtFtn* pTxtFtn;
+    SwDoc* pDoc = const_cast<SwDoc*>((*this)[ 0 ]->GetTextNode().GetDoc());
+    SwTextFootnote* pTextFootnote;
     const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
-    const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+    const SwFootnoteInfo& rFootnoteInfo = pDoc->GetFootnoteInfo();
 
-    SwUpdFtnEndNtAtEnd aNumArr;
+    SwUpdFootnoteEndNtAtEnd aNumArr;
 
     SwRootFrm* pTmpRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
     std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts();
     // For normal Footnotes per-chapter and per-document numbering are treated separately.
     // For Endnotes we only have document-wise numbering.
-    if( FTNNUM_CHAPTER == rFtnInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
     {
         const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
         sal_uInt16 nNo = 1;     // Number for the Footnotes
-        size_t nFtnIdx = 0;     // Index into theFtnIdx array
+        size_t nFootnoteIdx = 0;     // Index into theFootnoteIdx array
         for( size_t n = 0; n < rOutlNds.size(); ++n )
         {
-            if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+            if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
             {
                 sal_uLong nCapStt = rOutlNds[ n ]->GetIndex();  // Start of a new chapter
-                for( ; nFtnIdx < size(); ++nFtnIdx )
+                for( ; nFootnoteIdx < size(); ++nFootnoteIdx )
                 {
-                    pTxtFtn = (*this)[ nFtnIdx ];
-                    if( pTxtFtn->GetTxtNode().GetIndex() >= nCapStt )
+                    pTextFootnote = (*this)[ nFootnoteIdx ];
+                    if( pTextFootnote->GetTextNode().GetIndex() >= nCapStt )
                         break;
 
                     // Endnotes are per-document only
-                    const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                    if( !rFtn.IsEndNote() && rFtn.GetNumStr().isEmpty() &&
-                        !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+                    const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                    if( !rFootnote.IsEndNote() && rFootnote.GetNumStr().isEmpty() &&
+                        !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
                     {
-                        pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nNo++, rFtn.GetNumStr() );
+                        pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nNo++, rFootnote.GetNumStr() );
                     }
                 }
-                if( nFtnIdx >= size() )
+                if( nFootnoteIdx >= size() )
                     break;          // ok, everything is updated
                 nNo = 1;
             }
         }
 
-        for( nNo = 1; nFtnIdx < size(); ++nFtnIdx )
+        for( nNo = 1; nFootnoteIdx < size(); ++nFootnoteIdx )
         {
             // Endnotes are per-document
-            pTxtFtn = (*this)[ nFtnIdx ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if( !rFtn.IsEndNote() && rFtn.GetNumStr().isEmpty() &&
-                !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+            pTextFootnote = (*this)[ nFootnoteIdx ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if( !rFootnote.IsEndNote() && rFootnote.GetNumStr().isEmpty() &&
+                !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
             {
-                pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nNo++, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nNo++, rFootnote.GetNumStr() );
             }
         }
     }
 
     // We use bool here, so that we also iterate through the Endnotes with a chapter setting.
-    const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
-    sal_uInt16 nFtnNo = 0, nEndNo = 0;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
+    sal_uInt16 nFootnoteNo = 0, nEndNo = 0;
     for( size_t nPos = 0; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        pTextFootnote = (*this)[ nPos ];
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTxtFtn );
-            if( !nSectNo && ( rFtn.IsEndNote() || !bEndNoteOnly ))
-                nSectNo = rFtn.IsEndNote()
-                                ? rEndInfo.nFtnOffset + (++nEndNo)
-                                : rFtnInfo.nFtnOffset + (++nFtnNo);
+            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTextFootnote );
+            if( !nSectNo && ( rFootnote.IsEndNote() || !bEndNoteOnly ))
+                nSectNo = rFootnote.IsEndNote()
+                                ? rEndInfo.nFootnoteOffset + (++nEndNo)
+                                : rFootnoteInfo.nFootnoteOffset + (++nFootnoteNo);
 
             if( nSectNo )
             {
-                pTxtFtn->SetNumber( nSectNo, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( nSectNo, rFootnote.GetNumStr() );
             }
         }
     }
 
-    if( pTmpRoot && FTNNUM_PAGE == rFtnInfo.eNum )
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
+    if( pTmpRoot && FTNNUM_PAGE == rFootnoteInfo.eNum )
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
 }
 
-SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
+SwTextFootnote* SwFootnoteIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
 {
     sal_uLong nIdx = rPos.GetIndex();
 
@@ -255,7 +255,7 @@ SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
         while( nU <= nO )
         {
             const size_t nM = nU + ( nO - nU ) / 2;
-            sal_uLong nNdIdx = _SwTxtFtn_GetIndex( (*this)[ nM ] );
+            sal_uLong nNdIdx = _SwTextFootnote_GetIndex( (*this)[ nM ] );
             if( nNdIdx == nIdx )
             {
                 if( pFndPos )
@@ -279,29 +279,29 @@ SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
     return 0;
 }
 
-const SwSectionNode* SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr(
-                const SwTxtFtn& rTxtFtn )
+const SwSectionNode* SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr(
+                const SwTextFootnote& rTextFootnote )
 {
-    sal_uInt16 nWh = static_cast<sal_uInt16>( rTxtFtn.GetFtn().IsEndNote() ?
+    sal_uInt16 nWh = static_cast<sal_uInt16>( rTextFootnote.GetFootnote().IsEndNote() ?
                         RES_END_AT_TXTEND : RES_FTN_AT_TXTEND );
     sal_uInt16 nVal;
-    const SwSectionNode* pNd = rTxtFtn.GetTxtNode().FindSectionNode();
+    const SwSectionNode* pNd = rTextFootnote.GetTextNode().FindSectionNode();
     while( pNd && FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal =
-            static_cast<const SwFmtFtnEndAtTxtEnd&>(pNd->GetSection().GetFmt()->
-            GetFmtAttr( nWh, true )).GetValue() ) &&
+            static_cast<const SwFormatFootnoteEndAtTextEnd&>(pNd->GetSection().GetFormat()->
+            GetFormatAttr( nWh, true )).GetValue() ) &&
             FTNEND_ATTXTEND_OWNNUMANDFMT != nVal )
         pNd = pNd->StartOfSectionNode()->FindSectionNode();
 
     return pNd;
 }
 
-sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
+sal_uInt16 SwUpdFootnoteEndNtAtEnd::GetNumber( const SwTextFootnote& rTextFootnote,
                                     const SwSectionNode& rNd )
 {
     sal_uInt16 nRet = 0, nWh;
     std::vector<const SwSectionNode*>* pArr;
     std::vector<sal_uInt16> *pNum;
-    if( rTxtFtn.GetFtn().IsEndNote() )
+    if( rTextFootnote.GetFootnote().IsEndNote() )
     {
         pArr = &aEndSects;
         pNum = &aEndNums;
@@ -309,8 +309,8 @@ sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
     }
     else
     {
-        pArr = &aFtnSects;
-        pNum = &aFtnNums;
+        pArr = &aFootnoteSects;
+        pNum = &aFootnoteNums;
         nWh = RES_FTN_AT_TXTEND;
     }
 
@@ -324,18 +324,18 @@ sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
     if( !nRet )
     {
         pArr->push_back( &rNd );
-        nRet = static_cast<const SwFmtFtnEndAtTxtEnd&>(rNd.GetSection().GetFmt()->
-                                GetFmtAttr( nWh )).GetOffset();
+        nRet = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rNd.GetSection().GetFormat()->
+                                GetFormatAttr( nWh )).GetOffset();
         ++nRet;
         pNum->push_back( nRet );
     }
     return nRet;
 }
 
-sal_uInt16 SwUpdFtnEndNtAtEnd::ChkNumber( const SwTxtFtn& rTxtFtn )
+sal_uInt16 SwUpdFootnoteEndNtAtEnd::ChkNumber( const SwTextFootnote& rTextFootnote )
 {
-    const SwSectionNode* pSectNd = FindSectNdWithEndAttr( rTxtFtn );
-    return pSectNd ? GetNumber( rTxtFtn, *pSectNd ) : 0;
+    const SwSectionNode* pSectNd = FindSectNdWithEndAttr( rTextFootnote );
+    return pSectNd ? GetNumber( rTextFootnote, *pSectNd ) : 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index f5c7b75df09e..fa94c9ab4eed 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -30,11 +30,11 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
     return bTop ? pBox->GetTop() : pBox->GetBottom();
 }
 
-bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
+bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat )
 {
     const SvxBorderLine* pBrd;
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == rFmt.GetItemState( RES_BOX, true, &pItem ) &&
+    if( SfxItemState::SET == rFormat.GetItemState( RES_BOX, true, &pItem ) &&
         0 != ( pBrd = static_cast<const SvxBoxItem*>(pItem)->GetLeft() ) )
     {
         if( *pBrdLn == *pBrd )
@@ -66,7 +66,7 @@ static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd
         return true;
     }
 
-    return pPara->CheckLeftBorderOfFormat( *pBox->GetFrmFmt() );
+    return pPara->CheckLeftBorderOfFormat( *pBox->GetFrameFormat() );
 }
 
 static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPara );
@@ -91,7 +91,7 @@ static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPa
 }
 
 // Find the "end" of the passed BorderLine. Returns the "Layout"Pos!
-static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
+static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTableLineBoxes& rCollTLB,
                         const SvxBorderLine& rBrdLn, size_t& rStt, bool bTop )
 {
     sal_uInt16 nPos, nLastPos = 0;
@@ -101,7 +101,7 @@ static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
         const SvxBorderLine* pBrd;
         const SwTableBox& rBox = rCollTLB.GetBox( rStt, &nPos );
 
-        if( SfxItemState::SET != rBox.GetFrmFmt()->GetItemState(RES_BOX,true, &pItem )
+        if( SfxItemState::SET != rBox.GetFrameFormat()->GetItemState(RES_BOX,true, &pItem )
             || 0 == ( pBrd = GetLineTB( static_cast<const SvxBoxItem*>(pItem), bTop ))
             || !( *pBrd == rBrdLn ))
             break;
@@ -114,17 +114,17 @@ static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBo
                                                 bool bTop,
                                                 const SfxPoolItem** ppItem )
 {
-    return SfxItemState::SET == rBox.GetFrmFmt()->GetItemState( RES_BOX, true, ppItem )
+    return SfxItemState::SET == rBox.GetFrameFormat()->GetItemState( RES_BOX, true, ppItem )
             ? GetLineTB( static_cast<const SvxBoxItem*>(*ppItem), bTop )
             : 0;
 }
 
-static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
+static void lcl_GCBorder_DelBorder( const SwCollectTableLineBoxes& rCollTLB,
                                 size_t& rStt, bool bTop,
                                 const SvxBorderLine& rLine,
                                 const SfxPoolItem* pItem,
                                 sal_uInt16 nEndPos,
-                                SwShareBoxFmts* pShareFmts )
+                                SwShareBoxFormats* pShareFormats )
 {
     SwTableBox* pBox = const_cast<SwTableBox*>(&rCollTLB.GetBox( rStt ));
     sal_uInt16 nNextPos;
@@ -139,10 +139,10 @@ static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
             else
                 aBox.SetLine( 0, SvxBoxItemLine::BOTTOM );
 
-            if( pShareFmts )
-                pShareFmts->SetAttr( *pBox, aBox );
+            if( pShareFormats )
+                pShareFormats->SetAttr( *pBox, aBox );
             else
-                pBox->ClaimFrmFmt()->SetFmtAttr( aBox );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aBox );
         }
 
         if( ++rStt >= rCollTLB.Count() )
@@ -181,7 +181,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
             for( SwTableBoxes::size_type i = aBoxes.size(); i; )
             {
                 SwTableBox* pBox;
-                if( SfxItemState::SET == (pBox = aBoxes[ --i ])->GetFrmFmt()->
+                if( SfxItemState::SET == (pBox = aBoxes[ --i ])->GetFrameFormat()->
                     GetItemState( RES_BOX, true, &pItem ) &&
                     0 != ( pBrd = static_cast<const SvxBoxItem*>(pItem)->GetRight() ) )
                 {
@@ -192,10 +192,10 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     {
                         SvxBoxItem aBox( *static_cast<const SvxBoxItem*>(pItem) );
                         aBox.SetLine( 0, SvxBoxItemLine::RIGHT );
-                        if( pGCPara->pShareFmts )
-                            pGCPara->pShareFmts->SetAttr( *pBox, aBox );
+                        if( pGCPara->pShareFormats )
+                            pGCPara->pShareFormats->SetAttr( *pBox, aBox );
                         else
-                            pBox->ClaimFrmFmt()->SetFmtAttr( aBox );
+                            pBox->ClaimFrameFormat()->SetFormatAttr( aBox );
                     }
                 }
             }
@@ -207,8 +207,8 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
     // And now the own bottom edge with the succeeding top edge
     if( !pGCPara->IsLastLine() )
     {
-        SwCollectTblLineBoxes aBottom( false );
-        SwCollectTblLineBoxes aTop( true );
+        SwCollectTableLineBoxes aBottom( false );
+        SwCollectTableLineBoxes aTop( true );
 
         sw_Line_CollectBox( pLine, &aBottom );
 
@@ -254,7 +254,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     if( nTopPos <= nBtmEndPos )
                         lcl_GCBorder_DelBorder( aTop, --nSttTop, true,
                                             *pBtmLine, pTopItem, nBtmEndPos,
-                                            pGCPara->pShareFmts );
+                                            pGCPara->pShareFormats );
                     else
                         nSttBtm = nSavSttBtm;
                 }
@@ -265,7 +265,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     if( nBtmPos <= nTopEndPos )
                         lcl_GCBorder_DelBorder( aBottom, --nSttBtm, false,
                                             *pTopLine, pBtmItem, nTopEndPos,
-                                            pGCPara->pShareFmts );
+                                            pGCPara->pShareFormats );
                     else
                         nSttTop = nSavSttTop;
                 }
@@ -313,7 +313,7 @@ static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
     if( !pBox->GetTabLines().empty() )
     {
         _SwGCLineBorder aPara( *pBox );
-        aPara.pShareFmts = pPara->pShareFmts;
+        aPara.pShareFormats = pPara->pShareFormats;
         for( const SwTableLine* pLine : pBox->GetTabLines() )
             sw_GC_Line_Border( pLine, &aPara );
     }
@@ -322,32 +322,32 @@ static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
 struct _GCLinePara
 {
     SwTableLines* pLns;
-    SwShareBoxFmts* pShareFmts;
+    SwShareBoxFormats* pShareFormats;
 
     _GCLinePara( SwTableLines& rLns, _GCLinePara* pPara = 0 )
-        : pLns( &rLns ), pShareFmts( pPara ? pPara->pShareFmts : 0 )
+        : pLns( &rLns ), pShareFormats( pPara ? pPara->pShareFormats : 0 )
     {}
 };
 
 static bool lcl_MergeGCLine(SwTableLine* pLine, _GCLinePara* pPara);
 
-static bool lcl_MergeGCBox(SwTableBox* pTblBox, _GCLinePara* pPara)
+static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara)
 {
-    if( !pTblBox->GetTabLines().empty() )
+    if( !pTableBox->GetTabLines().empty() )
     {
         // ATTENTION: The Line count can change!
-        _GCLinePara aPara( pTblBox->GetTabLines(), pPara );
+        _GCLinePara aPara( pTableBox->GetTabLines(), pPara );
         for( SwTableLines::size_type n = 0;
-            n < pTblBox->GetTabLines().size() && lcl_MergeGCLine( pTblBox->GetTabLines()[n], &aPara );
+            n < pTableBox->GetTabLines().size() && lcl_MergeGCLine( pTableBox->GetTabLines()[n], &aPara );
             ++n )
             ;
 
-        if( 1 == pTblBox->GetTabLines().size() )
+        if( 1 == pTableBox->GetTabLines().size() )
         {
             // we have a box with a single line, so we just replace it by the line's boxes
-            SwTableLine* pInsLine = pTblBox->GetUpper();
-            SwTableLine* pCpyLine = pTblBox->GetTabLines()[0];
-            SwTableBoxes::iterator it = std::find( pInsLine->GetTabBoxes().begin(), pInsLine->GetTabBoxes().end(), pTblBox );
+            SwTableLine* pInsLine = pTableBox->GetUpper();
+            SwTableLine* pCpyLine = pTableBox->GetTabLines()[0];
+            SwTableBoxes::iterator it = std::find( pInsLine->GetTabBoxes().begin(), pInsLine->GetTabBoxes().end(), pTableBox );
             for( auto pTabBox : pCpyLine->GetTabBoxes() )
                 pTabBox->SetUpper( pInsLine );
 
@@ -357,7 +357,7 @@ static bool lcl_MergeGCBox(SwTableBox* pTblBox, _GCLinePara* pPara)
             pInsLine->GetTabBoxes().insert( it, pCpyLine->GetTabBoxes().begin(), pCpyLine->GetTabBoxes().end());
             pCpyLine->GetTabBoxes().clear();
             // destroy the removed box
-            delete pTblBox;
+            delete pTableBox;
 
             return false; // set up anew
         }
@@ -396,14 +396,14 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara)
             // JP 31.03.99: Bug 60000
             // Pass the attributes of the to-be-deleted Lines to the "inserted" one
             const SfxPoolItem* pItem;
-            if( SfxItemState::SET == pLn->GetFrmFmt()->GetItemState(
+            if( SfxItemState::SET == pLn->GetFrameFormat()->GetItemState(
                                     RES_BACKGROUND, true, &pItem ))
             {
                 SwTableLines& rBoxLns = pBox->GetTabLines();
                 for( auto pBoxLine : rBoxLns )
-                    if( SfxItemState::SET != pBoxLine->GetFrmFmt()->
+                    if( SfxItemState::SET != pBoxLine->GetFrameFormat()->
                             GetItemState( RES_BACKGROUND, true ))
-                        pGCPara->pShareFmts->SetAttr( *pBoxLine, *pItem );
+                        pGCPara->pShareFormats->SetAttr( *pBoxLine, *pItem );
             }
 
             pBox->GetTabLines().erase( pBox->GetTabLines().begin(), pBox->GetTabLines().begin() + nLines );  // Remove Lines from the array
@@ -431,8 +431,8 @@ void SwTable::GCLines()
 {
     // ATTENTION: The Line count can change!
     _GCLinePara aPara( GetTabLines() );
-    SwShareBoxFmts aShareFmts;
-    aPara.pShareFmts = &aShareFmts;
+    SwShareBoxFormats aShareFormats;
+    aPara.pShareFormats = &aShareFormats;
     for( SwTableLines::size_type n = 0; n < GetTabLines().size() &&
             lcl_MergeGCLine( GetTabLines()[n], &aPara ); ++n )
         ;
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index b88f026580d4..7ed7668f10db 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -319,7 +319,7 @@ void SwHTMLTableLayout::AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax,
 void SwHTMLTableLayout::SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol,
                              sal_uInt16 nColSpan ) const
 {
-    SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
+    SwFrameFormat *pFrameFormat = pBox->GetFrameFormat();
 
     // calculate the box's width
     SwTwips nFrmWidth = 0;
@@ -327,7 +327,7 @@ void SwHTMLTableLayout::SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol,
         nFrmWidth += GetColumn( nCol++ )->GetRelColWidth();
 
     // and reset
-    pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nFrmWidth, 0 ));
+    pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nFrmWidth, 0 ));
 }
 
 void SwHTMLTableLayout::GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan,
@@ -385,7 +385,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm(
         // width is relevant not the frame's width.
         // For paragraph-bound frames we don't respect paragraph indents.
         const SwFrm *pAnchor = static_cast<const SwFlyFrm *>(pUpper)->GetAnchorFrm();
-        if( pAnchor->IsTxtFrm() )
+        if( pAnchor->IsTextFrm() )
             nWidth = pAnchor->Frm().Width();
         else
             nWidth = pAnchor->Prt().Width();
@@ -407,7 +407,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm(
 sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTable( const SwDoc& rDoc ) const
 {
     sal_uInt16 nBrowseWidth = 0;
-    SwTabFrm* pFrm = SwIterator<SwTabFrm,SwFmt>( *pSwTable->GetFrmFmt() ).First();
+    SwTabFrm* pFrm = SwIterator<SwTabFrm,SwFormat>( *pSwTable->GetFrameFormat() ).First();
     if( pFrm )
     {
         nBrowseWidth = GetBrowseWidthByTabFrm( *pFrm );
@@ -437,18 +437,18 @@ const SwStartNode *SwHTMLTableLayout::GetAnyBoxStartNode() const
     return pBoxSttNd;
 }
 
-SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const
+SwFrameFormat *SwHTMLTableLayout::FindFlyFrameFormat() const
 {
-    const SwTableNode *pTblNd = GetAnyBoxStartNode()->FindTableNode();
-    OSL_ENSURE( pTblNd, "Kein Table-Node?" );
-    return pTblNd->GetFlyFmt();
+    const SwTableNode *pTableNd = GetAnyBoxStartNode()->FindTableNode();
+    OSL_ENSURE( pTableNd, "Kein Table-Node?" );
+    return pTableNd->GetFlyFormat();
 }
 
 static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlignCnts,
                         sal_uLong& rAbsMinNoAlignCnts,
-                        SwTxtNode *pTxtNd, sal_uLong nIdx, bool bNoBreak )
+                        SwTextNode *pTextNd, sal_uLong nIdx, bool bNoBreak )
 {
-    pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
+    pTextNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
                            rAbsMinNoAlignCnts );
     OSL_ENSURE( rAbsMinNoAlignCnts <= rMinNoAlignCnts,
             "GetMinMaxSize: absmin > min" );
@@ -456,16 +456,16 @@ static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlig
             "GetMinMaxSize: max > min" );
 
     // The maximal width for a <PRE> paragraph is the minimal width
-    const SwFmtColl *pColl = &pTxtNd->GetAnyFmtColl();
+    const SwFormatColl *pColl = &pTextNd->GetAnyFormatColl();
     while( pColl && !pColl->IsDefault() &&
-            (USER_FMT & pColl->GetPoolFmtId()) )
+            (USER_FMT & pColl->GetPoolFormatId()) )
     {
-        pColl = static_cast<const SwFmtColl *>(pColl->DerivedFrom());
+        pColl = static_cast<const SwFormatColl *>(pColl->DerivedFrom());
     }
 
     // <NOBR> in the whole cell apply to text but not to tables.
     // Netscape only considers this for graphics.
-    if( (pColl && RES_POOLCOLL_HTML_PRE==pColl->GetPoolFmtId()) || bNoBreak )
+    if( (pColl && RES_POOLCOLL_HTML_PRE==pColl->GetPoolFormatId()) || bNoBreak )
     {
         rMinNoAlignCnts = rMaxNoAlignCnts;
         rAbsMinNoAlignCnts = rMaxNoAlignCnts;
@@ -522,8 +522,8 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                         sal_uLong nIdx = pSttNd->GetIndex();
                         while( !(pDoc->GetNodes()[nIdx])->IsEndNode() )
                         {
-                            SwTxtNode *pTxtNd = (pDoc->GetNodes()[nIdx])->GetTxtNode();
-                            if( pTxtNd )
+                            SwTextNode *pTextNd = (pDoc->GetNodes()[nIdx])->GetTextNode();
+                            if( pTextNd )
                             {
                                 sal_uLong nMinNoAlignCnts = 0;
                                 sal_uLong nMaxNoAlignCnts = 0;
@@ -532,7 +532,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                                 lcl_GetMinMaxSize( nMinNoAlignCnts,
                                                    nMaxNoAlignCnts,
                                                    nAbsMinNoAlignCnts,
-                                                   pTxtNd, nIdx,
+                                                   pTextNd, nIdx,
                                                    pCnts->HasNoBreakTag() );
 
                                 if( nMinNoAlignCnts > nMinNoAlignCell )
@@ -1576,12 +1576,12 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth )
         sal_uInt16 nWidth = 0;
         for( const SwTableLine *pLine : pBox->GetTabLines() )
             lcl_ResizeLine( pLine, &nWidth );
-        pBox->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
+        pBox->GetFrameFormat()->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
         *pWidth = *pWidth + nWidth;
     }
     else
     {
-        *pWidth = *pWidth + (sal_uInt16)pBox->GetFrmFmt()->GetFrmSize().GetSize().Width();
+        *pWidth = *pWidth + (sal_uInt16)pBox->GetFrameFormat()->GetFrmSize().GetSize().Width();
     }
 }
 
@@ -1620,10 +1620,10 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
         {
             SwHTMLTableLayoutCell *pCell = GetCell( i, j );
 
-            SwHTMLTableLayoutCnts* pCntnts = pCell->GetContents();
-            while( pCntnts && !pCntnts->IsWidthSet(nWidthSet) )
+            SwHTMLTableLayoutCnts* pContents = pCell->GetContents();
+            while( pContents && !pContents->IsWidthSet(nWidthSet) )
             {
-                SwTableBox *pBox = pCntnts->GetTableBox();
+                SwTableBox *pBox = pContents->GetTableBox();
                 if( pBox )
                 {
                     SetBoxWidth( pBox, j, pCell->GetColSpan() );
@@ -1640,13 +1640,13 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
                         nRSpace = GetRightCellSpace( j, nColSpan );
                         nInhSpace = GetInhCellSpace( j, nColSpan );
                     }
-                    pCntnts->GetTable()->SetWidths( bCallPass2, nAbs, nRel,
+                    pContents->GetTable()->SetWidths( bCallPass2, nAbs, nRel,
                                                     nLSpace, nRSpace,
                                                     nInhSpace );
                 }
 
-                pCntnts->SetWidthSet( nWidthSet );
-                pCntnts = pCntnts->GetNext();
+                pContents->SetWidthSet( nWidthSet );
+                pContents = pContents->GetNext();
             }
         }
     }
@@ -1668,24 +1668,24 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
         // Lock the table format when altering it, or else the box formats
         // are altered again.
         // Also, we need to preserve a percent setting if it exists.
-        SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
+        SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
         const_cast<SwTable *>(pSwTable)->LockModify();
-        SwFmtFrmSize aFrmSize( pFrmFmt->GetFrmSize() );
+        SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() );
         aFrmSize.SetWidth( nRelTabWidth );
         bool bRel = bUseRelWidth &&
-                    text::HoriOrientation::FULL!=pFrmFmt->GetHoriOrient().GetHoriOrient();
+                    text::HoriOrientation::FULL!=pFrameFormat->GetHoriOrient().GetHoriOrient();
         aFrmSize.SetWidthPercent( (sal_uInt8)(bRel ? nWidthOption : 0) );
-        pFrmFmt->SetFmtAttr( aFrmSize );
+        pFrameFormat->SetFormatAttr( aFrmSize );
         const_cast<SwTable *>(pSwTable)->UnlockModify();
 
         // If the table is located in a frame, we also need to adapt the
         // frame's width.
         if( MayBeInFlyFrame() )
         {
-            SwFrmFmt *pFlyFrmFmt = FindFlyFrmFmt();
-            if( pFlyFrmFmt )
+            SwFrameFormat *pFlyFrameFormat = FindFlyFrameFormat();
+            if( pFlyFrameFormat )
             {
-                SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, nRelTabWidth, MINLAY );
+                SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, nRelTabWidth, MINLAY );
 
                 if( bUseRelWidth )
                 {
@@ -1694,14 +1694,14 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
                                                             : nMin );
                     aFlyFrmSize.SetWidthPercent( (sal_uInt8)nWidthOption );
                 }
-                pFlyFrmFmt->SetFmtAttr( aFlyFrmSize );
+                pFlyFrameFormat->SetFormatAttr( aFlyFrmSize );
             }
         }
 
 #ifdef DBG_UTIL
         {
             // check if the tables have correct widths
-            SwTwips nSize = pSwTable->GetFrmFmt()->GetFrmSize().GetWidth();
+            SwTwips nSize = pSwTable->GetFrameFormat()->GetFrmSize().GetWidth();
             const SwTableLines& rLines = pSwTable->GetTabLines();
             for (size_t n = 0; n < rLines.size(); ++n)
             {
@@ -1715,13 +1715,13 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
     {
         if( pLeftFillerBox )
         {
-            pLeftFillerBox->GetFrmFmt()->SetFmtAttr(
-                SwFmtFrmSize( ATT_VAR_SIZE, nRelLeftFill, 0 ));
+            pLeftFillerBox->GetFrameFormat()->SetFormatAttr(
+                SwFormatFrmSize( ATT_VAR_SIZE, nRelLeftFill, 0 ));
         }
         if( pRightFillerBox )
         {
-            pRightFillerBox->GetFrmFmt()->SetFmtAttr(
-                SwFmtFrmSize( ATT_VAR_SIZE, nRelRightFill, 0 ));
+            pRightFillerBox->GetFrameFormat()->SetFormatAttr(
+                SwFormatFrmSize( ATT_VAR_SIZE, nRelRightFill, 0 ));
         }
     }
 }
@@ -1774,7 +1774,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->GetViewOptions()->getBrowseMode() )
     {
         const sal_uInt16 nVisAreaWidth = GetBrowseWidthByVisArea( *pDoc );
-        if( nVisAreaWidth < nAbsAvail && !FindFlyFrmFmt() )
+        if( nVisAreaWidth < nAbsAvail && !FindFlyFrameFormat() )
             nAbsAvail = nVisAreaWidth;
     }
 
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index e000b9181292..578b5767c8a6 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -39,8 +39,8 @@ void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew )
         pTmpRoot->StartAllAction();
         // FME 2007-08-14 #i80120# Invalidate size, because ChgThisLines()
         // is only (onny may only be) called by the formatting routines
-        //pTmpRoot->InvalidateAllCntnt( INV_LINENUM | INV_SIZE );
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_LINENUM | INV_SIZE));
+        //pTmpRoot->InvalidateAllContent( INV_LINENUM | INV_SIZE );
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_LINENUM | INV_SIZE));
          pTmpRoot->EndAllAction();
     }
     *mpLineNumberInfo = rNew;
@@ -116,26 +116,26 @@ bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const
             bRestartEachPage == rInf.IsRestartEachPage();
 }
 
-SwCharFmt* SwLineNumberInfo::GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const
+SwCharFormat* SwLineNumberInfo::GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const
 {
     if ( !GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rIDSPA.GetCharFmtFromPool( RES_POOLCHR_LINENUM );
-        pFmt->Add( (SwClient*)this );
+        SwCharFormat* pFormat = rIDSPA.GetCharFormatFromPool( RES_POOLCHR_LINENUM );
+        pFormat->Add( (SwClient*)this );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn()));
 }
 
-void SwLineNumberInfo::SetCharFmt( SwCharFmt *pChFmt )
+void SwLineNumberInfo::SetCharFormat( SwCharFormat *pChFormat )
 {
-    OSL_ENSURE( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
-    pChFmt->Add( this );
+    OSL_ENSURE( pChFormat, "SetCharFormat, 0 is not a valid pointer" );
+    pChFormat->Add( this );
 }
 
 void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     CheckRegistration( pOld, pNew );
-    SwDoc *pDoc = static_cast<SwCharFmt*>(GetRegisteredIn())->GetDoc();
+    SwDoc *pDoc = static_cast<SwCharFormat*>(GetRegisteredIn())->GetDoc();
     SwRootFrm* pRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
     if( pRoot )
     {
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d94c17966e12..893104502584 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -82,19 +82,19 @@
 
 using namespace com::sun::star;
 
-inline bool GetRealURL( const SwGrfNode& rNd, OUString& rTxt )
+inline bool GetRealURL( const SwGrfNode& rNd, OUString& rText )
 {
-    bool bRet = rNd.GetFileFilterNms( &rTxt, 0 );
+    bool bRet = rNd.GetFileFilterNms( &rText, 0 );
     if( bRet )
-        rTxt = URIHelper::removePassword( rTxt, INetURLObject::WAS_ENCODED,
+        rText = URIHelper::removePassword( rText, INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
-    if (rTxt.startsWith("data:image")) rTxt = "inline image";
+    if (rText.startsWith("data:image")) rText = "inline image";
 
     return bRet;
 }
 
 static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
-                           const SwViewShell &rSh, const SwNoTxtFrm *pFrm,
+                           const SwViewShell &rSh, const SwNoTextFrm *pFrm,
                            bool bDefect )
 {
     static vcl::Font *pFont = 0;
@@ -110,7 +110,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
 
     Color aCol( COL_RED );
     FontUnderline eUnderline = UNDERLINE_NONE;
-    const SwFmtURL &rURL = pFrm->FindFlyFrm()->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFrm->FindFlyFrm()->GetFormat()->GetURL();
     if( !rURL.GetURL().isEmpty() || rURL.GetMap() )
     {
         bool bVisited = false;
@@ -130,10 +130,10 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
         else if ( !rURL.GetURL().isEmpty() )
             bVisited = rSh.GetDoc()->IsVisitedURL( rURL.GetURL() );
 
-        SwFmt *pFmt = rSh.GetDoc()->getIDocumentStylePoolAccess().GetFmtFromPool( static_cast<sal_uInt16>
+        SwFormat *pFormat = rSh.GetDoc()->getIDocumentStylePoolAccess().GetFormatFromPool( static_cast<sal_uInt16>
             (bVisited ? RES_POOLCHR_INET_VISIT : RES_POOLCHR_INET_NORMAL ) );
-        aCol = pFmt->GetColor().GetValue();
-        eUnderline = pFmt->GetUnderline().GetLineStyle();
+        aCol = pFormat->GetColor().GetValue();
+        eUnderline = pFormat->GetUnderline().GetLineStyle();
     }
 
     pFont->SetUnderline( eUnderline );
@@ -143,31 +143,31 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
     Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() );
 }
 
-SwNoTxtFrm::SwNoTxtFrm(SwNoTxtNode * const pNode, SwFrm* pSib )
-    : SwCntntFrm( pNode, pSib )
+SwNoTextFrm::SwNoTextFrm(SwNoTextNode * const pNode, SwFrm* pSib )
+    : SwContentFrm( pNode, pSib )
 {
     InitCtor();
 }
 
 /// Initialization: Currently add the Frame to the Cache
-void SwNoTxtFrm::InitCtor()
+void SwNoTextFrm::InitCtor()
 {
     mnFrmType = FRM_NOTXT;
 }
 
-SwCntntFrm *SwNoTxtNode::MakeFrm( SwFrm* pSib )
+SwContentFrm *SwNoTextNode::MakeFrm( SwFrm* pSib )
 {
-    return new SwNoTxtFrm(this, pSib);
+    return new SwNoTextFrm(this, pSib);
 }
 
-void SwNoTxtFrm::DestroyImpl()
+void SwNoTextFrm::DestroyImpl()
 {
     StopAnimation();
 
-    SwCntntFrm::DestroyImpl();
+    SwContentFrm::DestroyImpl();
 }
 
-SwNoTxtFrm::~SwNoTxtFrm()
+SwNoTextFrm::~SwNoTextFrm()
 {
 }
 
@@ -215,7 +215,7 @@ static void lcl_ClearArea( const SwFrm &rFrm,
     }
 }
 
-void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
+void SwNoTextFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 {
     if ( Frm().IsEmpty() )
         return;
@@ -227,13 +227,13 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // #i6467# - no paint of placeholder for page preview
         if ( pSh->GetWin() && !pSh->IsPreview() )
         {
-            const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode();
-            OUString aTxt( pNd->GetTitle() );
-            if ( aTxt.isEmpty() && pNd->IsGrfNode() )
-                GetRealURL( *static_cast<const SwGrfNode*>(pNd), aTxt );
-            if( aTxt.isEmpty() )
-                aTxt = FindFlyFrm()->GetFmt()->GetName();
-            lcl_PaintReplacement( Frm(), aTxt, *pSh, this, false );
+            const SwNoTextNode* pNd = GetNode()->GetNoTextNode();
+            OUString aText( pNd->GetTitle() );
+            if ( aText.isEmpty() && pNd->IsGrfNode() )
+                GetRealURL( *static_cast<const SwGrfNode*>(pNd), aText );
+            if( aText.isEmpty() )
+                aText = FindFlyFrm()->GetFormat()->GetName();
+            lcl_PaintReplacement( Frm(), aText, *pSh, this, false );
         }
         return;
     }
@@ -250,7 +250,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     bool bClip = true;
     tools::PolyPolygon aPoly;
 
-    SwNoTxtNode& rNoTNd = const_cast<SwNoTxtNode&>(*static_cast<const SwNoTxtNode*>(GetNode()));
+    SwNoTextNode& rNoTNd = const_cast<SwNoTextNode&>(*static_cast<const SwNoTextNode*>(GetNode()));
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     if( pGrfNd )
         pGrfNd->SetFrameInPaint( true );
@@ -337,7 +337,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
 }
 
 /** Calculate the Bitmap's position and the size within the passed rectangle */
-void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
+void SwNoTextFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
                              bool ) const
 {
     // Currently only used for scaling, cropping and mirroring the contour of graphics!
@@ -367,7 +367,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
     // We read graphic from the Node, if needed.
     // It may fail, however.
     long nLeftCrop, nRightCrop, nTopCrop, nBottomCrop;
-    Size aOrigSz( static_cast<const SwNoTxtNode*>(GetNode())->GetTwipSize() );
+    Size aOrigSz( static_cast<const SwNoTextNode*>(GetNode())->GetTwipSize() );
     if ( !aOrigSz.Width() )
     {
         aOrigSz.Width() = Prt().Width();
@@ -455,7 +455,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
 }
 
 /** By returning the surrounding Fly's size which equals the graphic's size */
-const Size& SwNoTxtFrm::GetSize() const
+const Size& SwNoTextFrm::GetSize() const
 {
     // Return the Frame's size
     const SwFrm *pFly = FindFlyFrm();
@@ -464,9 +464,9 @@ const Size& SwNoTxtFrm::GetSize() const
     return pFly->Prt().SSize();
 }
 
-void SwNoTxtFrm::MakeAll()
+void SwNoTextFrm::MakeAll()
 {
-    SwCntntNotify aNotify( this );
+    SwContentNotify aNotify( this );
     SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
     const SwBorderAttrs &rAttrs = *aAccess.Get();
 
@@ -487,7 +487,7 @@ void SwNoTxtFrm::MakeAll()
 }
 
 /** Calculate the Bitmap's site, if needed */
-void SwNoTxtFrm::Format( const SwBorderAttrs * )
+void SwNoTextFrm::Format( const SwBorderAttrs * )
 {
     const Size aNewSize( GetSize() );
 
@@ -501,7 +501,7 @@ void SwNoTxtFrm::Format( const SwBorderAttrs * )
         Shrink( std::min(Prt().Height(), -nChgHght) );
 }
 
-bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
+bool SwNoTextFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
                               SwCrsrMoveState *pCMS ) const
 {
     if ( &rPos.nNode.GetNode() != (SwNode*)GetNode() )
@@ -537,10 +537,10 @@ bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
     return true;
 }
 
-bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
+bool SwNoTextFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
                              SwCrsrMoveState*, bool ) const
 {
-    SwCntntNode* pCNd = const_cast<SwCntntNode*>(GetNode());
+    SwContentNode* pCNd = const_cast<SwContentNode*>(GetNode());
     pPos->nNode = *pCNd;
     pPos->nContent.Assign( pCNd, 0 );
     return true;
@@ -548,25 +548,25 @@ bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
 
 #define CLEARCACHE {\
     SwFlyFrm* pFly = FindFlyFrm();\
-    if( pFly && pFly->GetFmt()->GetSurround().IsContour() )\
+    if( pFly && pFly->GetFormat()->GetSurround().IsContour() )\
     {\
         ClrContourCache( pFly->GetVirtDrawObj() );\
         pFly->NotifyBackground( FindPageFrm(), Prt(), PREP_FLY_ATTR_CHG );\
     }\
 }
 
-void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwNoTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     sal_uInt16 nWhich = pNew ? pNew->Which() : pOld ? pOld->Which() : 0;
 
     // #i73788#
-    // no <SwCntntFrm::Modify(..)> for RES_LINKED_GRAPHIC_STREAM_ARRIVED
+    // no <SwContentFrm::Modify(..)> for RES_LINKED_GRAPHIC_STREAM_ARRIVED
     if ( RES_GRAPHIC_PIECE_ARRIVED != nWhich &&
          RES_GRAPHIC_ARRIVED != nWhich &&
          RES_GRF_REREAD_AND_INCACHE != nWhich &&
          RES_LINKED_GRAPHIC_STREAM_ARRIVED != nWhich )
     {
-        SwCntntFrm::Modify( pOld, pNew );
+        SwContentFrm::Modify( pOld, pNew );
     }
 
     bool bComplete = true;
@@ -832,11 +832,11 @@ void paintGraphicUsingPrimitivesHelper(vcl::RenderContext & rOutputDevice,
 
     @todo use aligned rectangle for drawing graphic.
     @todo pixel-align coordinations for drawing graphic. */
-void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea ) const
+void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea ) const
 {
     SwViewShell* pShell = getRootFrm()->GetCurrShell();
 
-    SwNoTxtNode& rNoTNd = const_cast<SwNoTxtNode&>(*static_cast<const SwNoTxtNode*>(GetNode()));
+    SwNoTextNode& rNoTNd = const_cast<SwNoTextNode&>(*static_cast<const SwNoTextNode*>(GetNode()));
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     SwOLENode* pOLENd = rNoTNd.GetOLENode();
 
@@ -901,14 +901,14 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
                 if( !pGrfObj ||
                     !pGrfObj->IsDataComplete() ||
                     !(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
-                    !aTmpSz.Height() || !pGrfNd->GetAutoFmtLvl() )
+                    !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() )
                 {
                     pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788#
                 }
-                OUString aTxt( pGrfNd->GetTitle() );
-                if ( aTxt.isEmpty() )
-                    GetRealURL( *pGrfNd, aTxt );
-                ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, false );
+                OUString aText( pGrfNd->GetTitle() );
+                if ( aText.isEmpty() )
+                    GetRealURL( *pGrfNd, aText );
+                ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false );
                 bContinue = false;
             }
         }
@@ -1060,7 +1060,7 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
     }
 }
 
-bool SwNoTxtFrm::IsTransparent() const
+bool SwNoTextFrm::IsTransparent() const
 {
     const SwViewShell* pSh = getRootFrm()->GetCurrShell();
     if ( !pSh || !pSh->GetViewOptions()->IsGraphic() )
@@ -1074,7 +1074,7 @@ bool SwNoTxtFrm::IsTransparent() const
     return true;
 }
 
-void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
+void SwNoTextFrm::StopAnimation( OutputDevice* pOut ) const
 {
     // Stop animated graphics
     const SwGrfNode* pGrfNd = dynamic_cast< const SwGrfNode* >(GetNode()->GetGrfNode());
@@ -1085,7 +1085,7 @@ void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
     }
 }
 
-bool SwNoTxtFrm::HasAnimation() const
+bool SwNoTextFrm::HasAnimation() const
 {
     const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
     return pGrfNd && pGrfNd->IsAnimated();
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 085f5021a4bc..0a22fc1b13d7 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -57,10 +57,10 @@
 using namespace ::com::sun::star;
 
 sal_uInt16 SwNumRule::mnRefCount = 0;
-SwNumFmt* SwNumRule::maBaseFmts[ RULE_END ][ MAXLEVEL ] = {
+SwNumFormat* SwNumRule::maBaseFormats[ RULE_END ][ MAXLEVEL ] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
 
-SwNumFmt* SwNumRule::maLabelAlignmentBaseFmts[ RULE_END ][ MAXLEVEL ] = {
+SwNumFormat* SwNumRule::maLabelAlignmentBaseFormats[ RULE_END ][ MAXLEVEL ] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
 
 const sal_uInt16 SwNumRule::maDefNumIndents[ MAXLEVEL ] = {
@@ -74,24 +74,24 @@ OUString SwNumRule::GetOutlineRuleName()
     return OUString("Outline");
 }
 
-const SwNumFmt& SwNumRule::Get( sal_uInt16 i ) const
+const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const
 {
     OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
-    return maFmts[ i ]
-           ? *maFmts[ i ]
+    return maFormats[ i ]
+           ? *maFormats[ i ]
            : ( meDefaultNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION
-               ? *maBaseFmts[ meRuleType ][ i ]
-               : *maLabelAlignmentBaseFmts[ meRuleType ][ i ] );
+               ? *maBaseFormats[ meRuleType ][ i ]
+               : *maLabelAlignmentBaseFormats[ meRuleType ][ i ] );
 }
 
-const SwNumFmt* SwNumRule::GetNumFmt( sal_uInt16 i ) const
+const SwNumFormat* SwNumRule::GetNumFormat( sal_uInt16 i ) const
 {
-    const SwNumFmt * pResult = NULL;
+    const SwNumFormat * pResult = NULL;
 
     OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
     if ( i < MAXLEVEL && meRuleType < RULE_END)
     {
-        pResult = maFmts[ i ];
+        pResult = maFormats[ i ];
     }
 
     return pResult;
@@ -118,35 +118,35 @@ void SwNumRule::SetName( const OUString & rName,
     }
 }
 
-void SwNumRule::GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const
+void SwNumRule::GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const
 {
-    rTxtNodeList = maTxtNodeList;
+    rTextNodeList = maTextNodeList;
 }
 
-SwNumRule::tTxtNodeList::size_type SwNumRule::GetTxtNodeListSize() const
+SwNumRule::tTextNodeList::size_type SwNumRule::GetTextNodeListSize() const
 {
-    return maTxtNodeList.size();
+    return maTextNodeList.size();
 }
 
-void SwNumRule::AddTxtNode( SwTxtNode& rTxtNode )
+void SwNumRule::AddTextNode( SwTextNode& rTextNode )
 {
-    tTxtNodeList::iterator aIter =
-        std::find( maTxtNodeList.begin(), maTxtNodeList.end(), &rTxtNode );
+    tTextNodeList::iterator aIter =
+        std::find( maTextNodeList.begin(), maTextNodeList.end(), &rTextNode );
 
-    if ( aIter == maTxtNodeList.end() )
+    if ( aIter == maTextNodeList.end() )
     {
-        maTxtNodeList.push_back( &rTxtNode );
+        maTextNodeList.push_back( &rTextNode );
     }
 }
 
-void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode )
+void SwNumRule::RemoveTextNode( SwTextNode& rTextNode )
 {
-    tTxtNodeList::iterator aIter =
-        std::find( maTxtNodeList.begin(), maTxtNodeList.end(), &rTxtNode );
+    tTextNodeList::iterator aIter =
+        std::find( maTextNodeList.begin(), maTextNodeList.end(), &rTextNode );
 
-    if ( aIter != maTxtNodeList.end() )
+    if ( aIter != maTextNodeList.end() )
     {
-        maTxtNodeList.erase( aIter );
+        maTextNodeList.erase( aIter );
     }
 }
 
@@ -168,70 +168,70 @@ sal_uInt16 SwNumRule::GetBullIndent( sal_uInt8 nLvl )
     return maDefNumIndents[ nLvl ];
 }
 
-static void lcl_SetRuleChgd( SwTxtNode& rNd, sal_uInt8 nLevel )
+static void lcl_SetRuleChgd( SwTextNode& rNd, sal_uInt8 nLevel )
 {
     if( rNd.GetActualListLevel() == nLevel )
         rNd.NumRuleChgd();
 }
 
-SwNumFmt::SwNumFmt() :
+SwNumFormat::SwNumFormat() :
     SvxNumberFormat(SVX_NUM_ARABIC),
     SwClient( 0 ),
-    pVertOrient(new SwFmtVertOrient( 0, text::VertOrientation::NONE))
+    pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE))
     ,cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within bullet
 {
 }
 
-SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
-    SvxNumberFormat(rFmt),
-    SwClient( rFmt.GetRegisteredInNonConst() ),
-    pVertOrient(new SwFmtVertOrient( 0, rFmt.GetVertOrient()))
-    ,cGrfBulletCP(rFmt.cGrfBulletCP)//For i120928,record the cp info of graphic within bullet
+SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) :
+    SvxNumberFormat(rFormat),
+    SwClient( rFormat.GetRegisteredInNonConst() ),
+    pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient()))
+    ,cGrfBulletCP(rFormat.cGrfBulletCP)//For i120928,record the cp info of graphic within bullet
 {
-    sal_Int16 eMyVertOrient = rFmt.GetVertOrient();
-    SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
+    sal_Int16 eMyVertOrient = rFormat.GetVertOrient();
+    SetGraphicBrush( rFormat.GetBrush(), &rFormat.GetGraphicSize(),
                                                 &eMyVertOrient);
 }
 
-SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc)
-    : SvxNumberFormat(rNumFmt)
-    , pVertOrient(new SwFmtVertOrient( 0, rNumFmt.GetVertOrient()))
+SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat, SwDoc* pDoc)
+    : SvxNumberFormat(rNumFormat)
+    , pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient()))
     , cGrfBulletCP(USHRT_MAX)
 {
-    sal_Int16 eMyVertOrient = rNumFmt.GetVertOrient();
-    SetGraphicBrush( rNumFmt.GetBrush(), &rNumFmt.GetGraphicSize(),
+    sal_Int16 eMyVertOrient = rNumFormat.GetVertOrient();
+    SetGraphicBrush( rNumFormat.GetBrush(), &rNumFormat.GetGraphicSize(),
                                                 &eMyVertOrient);
-    const OUString rCharStyleName = rNumFmt.SvxNumberFormat::GetCharFmtName();
+    const OUString rCharStyleName = rNumFormat.SvxNumberFormat::GetCharFormatName();
     if( !rCharStyleName.isEmpty() )
     {
-        SwCharFmt* pCFmt = pDoc->FindCharFmtByName( rCharStyleName );
-        if( !pCFmt )
+        SwCharFormat* pCFormat = pDoc->FindCharFormatByName( rCharStyleName );
+        if( !pCFormat )
         {
             sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCharStyleName,
                                             nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-            pCFmt = nId != USHRT_MAX
-                        ? pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId )
-                        : pDoc->MakeCharFmt( rCharStyleName, 0 );
+            pCFormat = nId != USHRT_MAX
+                        ? pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId )
+                        : pDoc->MakeCharFormat( rCharStyleName, 0 );
         }
-        pCFmt->Add( this );
+        pCFormat->Add( this );
     }
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
 }
 
-SwNumFmt::~SwNumFmt()
+SwNumFormat::~SwNumFormat()
 {
     delete pVertOrient;
 }
 
-void SwNumFmt::NotifyGraphicArrived()
+void SwNumFormat::NotifyGraphicArrived()
 {
-    if( GetCharFmt() )
-        UpdateNumNodes( GetCharFmt()->GetDoc() );
+    if( GetCharFormat() )
+        UpdateNumNodes( GetCharFormat()->GetDoc() );
 }
 
 // #i22362#
-bool SwNumFmt::IsEnumeration() const
+bool SwNumFormat::IsEnumeration() const
 {
     // #i30655# native numbering did not work any longer
     // using this code. Therefore HBRINKM and I agreed upon defining
@@ -239,7 +239,7 @@ bool SwNumFmt::IsEnumeration() const
     return !IsItemize();
 }
 
-bool SwNumFmt::IsItemize() const
+bool SwNumFormat::IsItemize() const
 {
     bool bResult;
 
@@ -259,67 +259,67 @@ bool SwNumFmt::IsItemize() const
 
 }
 
-SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
+SwNumFormat& SwNumFormat::operator=( const SwNumFormat& rNumFormat)
 {
-    SvxNumberFormat::operator=(rNumFmt);
-    if( rNumFmt.GetRegisteredIn() )
-        rNumFmt.GetRegisteredInNonConst()->Add( this );
+    SvxNumberFormat::operator=(rNumFormat);
+    if( rNumFormat.GetRegisteredIn() )
+        rNumFormat.GetRegisteredInNonConst()->Add( this );
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
     //For i120928,record the cp info of graphic within bullet
-    cGrfBulletCP = rNumFmt.cGrfBulletCP;
+    cGrfBulletCP = rNumFormat.cGrfBulletCP;
     return *this;
 }
 
-bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
+bool SwNumFormat::operator==( const SwNumFormat& rNumFormat) const
 {
-    bool bRet = SvxNumberFormat::operator==(rNumFmt) &&
-        GetRegisteredIn() == rNumFmt.GetRegisteredIn();
+    bool bRet = SvxNumberFormat::operator==(rNumFormat) &&
+        GetRegisteredIn() == rNumFormat.GetRegisteredIn();
     return bRet;
 }
 
-void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
+void SwNumFormat::SetCharFormat( SwCharFormat* pChFormat)
 {
-    if( pChFmt )
-        pChFmt->Add( this );
+    if( pChFormat )
+        pChFormat->Add( this );
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
 }
 
-void SwNumFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwNumFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     // Look for the NumRules object in the Doc where this NumFormat is set.
     // The format does not need to exist!
-    const SwCharFmt* pFmt = 0;
+    const SwCharFormat* pFormat = 0;
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
     switch( nWhich )
     {
     case RES_ATTRSET_CHG:
     case RES_FMT_CHG:
-        pFmt = GetCharFmt();
+        pFormat = GetCharFormat();
         break;
     }
 
-    if( pFmt && !pFmt->GetDoc()->IsInDtor() )
-        UpdateNumNodes( const_cast<SwDoc*>(pFmt->GetDoc()) );
+    if( pFormat && !pFormat->GetDoc()->IsInDtor() )
+        UpdateNumNodes( const_cast<SwDoc*>(pFormat->GetDoc()) );
     else
         CheckRegistration( pOld, pNew );
 }
 
-void SwNumFmt::SetCharFmtName(const OUString& rSet)
+void SwNumFormat::SetCharFormatName(const OUString& rSet)
 {
-    SvxNumberFormat::SetCharFmtName(rSet);
+    SvxNumberFormat::SetCharFormatName(rSet);
 }
 
-OUString SwNumFmt::GetCharFmtName() const
+OUString SwNumFormat::GetCharFormatName() const
 {
-    if(static_cast<const SwCharFmt*>(GetRegisteredIn()))
-        return static_cast<const SwCharFmt*>(GetRegisteredIn())->GetName();
+    if(static_cast<const SwCharFormat*>(GetRegisteredIn()))
+        return static_cast<const SwCharFormat*>(GetRegisteredIn())->GetName();
 
     return OUString();
 }
 
-void    SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
+void    SwNumFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
     const sal_Int16* pOrient)
 {
     if(pOrient)
@@ -327,30 +327,30 @@ void    SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* p
     SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
 }
 
-void    SwNumFmt::SetVertOrient(sal_Int16 eSet)
+void    SwNumFormat::SetVertOrient(sal_Int16 eSet)
 {
     SvxNumberFormat::SetVertOrient(eSet);
 }
 
-sal_Int16   SwNumFmt::GetVertOrient() const
+sal_Int16   SwNumFormat::GetVertOrient() const
 {
     return SvxNumberFormat::GetVertOrient();
 }
 
-void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
+void SwNumFormat::UpdateNumNodes( SwDoc* pDoc )
 {
     bool bDocIsModified = pDoc->getIDocumentState().IsModified();
     bool bFnd = false;
-    for( SwNumRuleTbl::size_type n = pDoc->GetNumRuleTbl().size(); !bFnd && n; )
+    for( SwNumRuleTable::size_type n = pDoc->GetNumRuleTable().size(); !bFnd && n; )
     {
-        const SwNumRule* pRule = pDoc->GetNumRuleTbl()[ --n ];
+        const SwNumRule* pRule = pDoc->GetNumRuleTable()[ --n ];
         for( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
-            if( pRule->GetNumFmt( i ) == this )
+            if( pRule->GetNumFormat( i ) == this )
             {
-                SwNumRule::tTxtNodeList aTxtNodeList;
-                pRule->GetTxtNodeList( aTxtNodeList );
-                for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-                      aIter != aTxtNodeList.end(); ++aIter )
+                SwNumRule::tTextNodeList aTextNodeList;
+                pRule->GetTextNodeList( aTextNodeList );
+                for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+                      aIter != aTextNodeList.end(); ++aIter )
                 {
                     lcl_SetRuleChgd( *(*aIter), i );
                 }
@@ -363,7 +363,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
         pDoc->getIDocumentState().ResetModified();
 }
 
-const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
+const SwFormatVertOrient*      SwNumFormat::GetGraphicOrientation() const
 {
     sal_Int16  eOrient = SvxNumberFormat::GetVertOrient();
     if(text::VertOrientation::NONE == eOrient)
@@ -379,12 +379,12 @@ SwNumRule::SwNumRule( const OUString& rNm,
                       const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
                       SwNumRuleType eType,
                       bool bAutoFlg )
-  : maTxtNodeList(),
+  : maTextNodeList(),
     maParagraphStyleList(),
     mpNumRuleMap(0),
     msName( rNm ),
     meRuleType( eType ),
-    mnPoolFmtId( USHRT_MAX ),
+    mnPoolFormatId( USHRT_MAX ),
     mnPoolHelpId( USHRT_MAX ),
     mnPoolHlpFileId( UCHAR_MAX ),
     mbAutoRuleFlag( bAutoFlg ),
@@ -398,21 +398,21 @@ SwNumRule::SwNumRule( const OUString& rNm,
 {
     if( !mnRefCount++ )          // for the first time, initialize
     {
-        SwNumFmt* pFmt;
+        SwNumFormat* pFormat;
         sal_uInt8 n;
 
         // numbering:
         // position-and-space mode LABEL_WIDTH_AND_POSITION:
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetIncludeUpperLevels( 1 );
-            pFmt->SetStart( 1 );
-            pFmt->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
-            pFmt->SetFirstLineOffset( lNumFirstLineOffset );
-            pFmt->SetSuffix( "." );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maBaseFmts[ NUM_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetIncludeUpperLevels( 1 );
+            pFormat->SetStart( 1 );
+            pFormat->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
+            pFormat->SetFirstLineOffset( lNumFirstLineOffset );
+            pFormat->SetSuffix( "." );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maBaseFormats[ NUM_RULE ][ n ] = pFormat;
         }
         // position-and-space mode LABEL_ALIGNMENT
         // first line indent of general numbering in inch: -0,25 inch
@@ -425,30 +425,30 @@ SwNumRule::SwNumRule( const OUString& rNm,
             1440*7/4,   1440*2,     1440*9/4,   1440*5/2,   1440*11/4 };
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetIncludeUpperLevels( 1 );
-            pFmt->SetStart( 1 );
-            pFmt->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
-            pFmt->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-            pFmt->SetListtabPos( cIndentAt[ n ] );
-            pFmt->SetFirstLineIndent( cFirstLineIndent );
-            pFmt->SetIndentAt( cIndentAt[ n ] );
-            pFmt->SetSuffix( "." );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maLabelAlignmentBaseFmts[ NUM_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetIncludeUpperLevels( 1 );
+            pFormat->SetStart( 1 );
+            pFormat->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
+            pFormat->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+            pFormat->SetListtabPos( cIndentAt[ n ] );
+            pFormat->SetFirstLineIndent( cFirstLineIndent );
+            pFormat->SetIndentAt( cIndentAt[ n ] );
+            pFormat->SetSuffix( "." );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maLabelAlignmentBaseFormats[ NUM_RULE ][ n ] = pFormat;
         }
 
         // outline:
         // position-and-space mode LABEL_WIDTH_AND_POSITION:
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
-            pFmt->SetIncludeUpperLevels( MAXLEVEL );
-            pFmt->SetStart( 1 );
-            pFmt->SetCharTextDistance( lOutlineMinTextDistance );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetNumberingType(SVX_NUM_NUMBER_NONE);
+            pFormat->SetIncludeUpperLevels( MAXLEVEL );
+            pFormat->SetStart( 1 );
+            pFormat->SetCharTextDistance( lOutlineMinTextDistance );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maBaseFormats[ OUTLINE_RULE ][ n ] = pFormat;
         }
         // position-and-space mode LABEL_ALIGNMENT:
         // indent values of default outline numbering in inch:
@@ -459,30 +459,30 @@ SwNumRule::SwNumRule( const OUString& rNm,
             1440*4/5,   1440*9/10,  1440,       1440*11/10, 1440*6/5 };
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
-            pFmt->SetIncludeUpperLevels( MAXLEVEL );
-            pFmt->SetStart( 1 );
-            pFmt->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
-            pFmt->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-            pFmt->SetListtabPos( cOutlineIndentAt[ n ] );
-            pFmt->SetFirstLineIndent( -cOutlineIndentAt[ n ] );
-            pFmt->SetIndentAt( cOutlineIndentAt[ n ] );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maLabelAlignmentBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetNumberingType(SVX_NUM_NUMBER_NONE);
+            pFormat->SetIncludeUpperLevels( MAXLEVEL );
+            pFormat->SetStart( 1 );
+            pFormat->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
+            pFormat->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+            pFormat->SetListtabPos( cOutlineIndentAt[ n ] );
+            pFormat->SetFirstLineIndent( -cOutlineIndentAt[ n ] );
+            pFormat->SetIndentAt( cOutlineIndentAt[ n ] );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maLabelAlignmentBaseFormats[ OUTLINE_RULE ][ n ] = pFormat;
         }
     }
-    memset( maFmts, 0, sizeof( maFmts ));
+    memset( maFormats, 0, sizeof( maFormats ));
     OSL_ENSURE( !msName.isEmpty(), "NumRule without a name!" );
 }
 
 SwNumRule::SwNumRule( const SwNumRule& rNumRule )
-    : maTxtNodeList(),
+    : maTextNodeList(),
       maParagraphStyleList(),
       mpNumRuleMap(0),
       msName( rNumRule.msName ),
       meRuleType( rNumRule.meRuleType ),
-      mnPoolFmtId( rNumRule.GetPoolFmtId() ),
+      mnPoolFormatId( rNumRule.GetPoolFormatId() ),
       mnPoolHelpId( rNumRule.GetPoolHelpId() ),
       mnPoolHlpFileId( rNumRule.GetPoolHlpFileId() ),
       mbAutoRuleFlag( rNumRule.mbAutoRuleFlag ),
@@ -495,16 +495,16 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       msDefaultListId( rNumRule.msDefaultListId )
 {
     ++mnRefCount;
-    memset( maFmts, 0, sizeof( maFmts ));
+    memset( maFormats, 0, sizeof( maFormats ));
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-        if( rNumRule.maFmts[ n ] )
-            Set( n, *rNumRule.maFmts[ n ] );
+        if( rNumRule.maFormats[ n ] )
+            Set( n, *rNumRule.maFormats[ n ] );
 }
 
 SwNumRule::~SwNumRule()
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-        delete maFmts[ n ];
+        delete maFormats[ n ];
 
     if (mpNumRuleMap)
     {
@@ -514,40 +514,40 @@ SwNumRule::~SwNumRule()
     if( !--mnRefCount )          // the last one closes the door (?)
     {
             // Numbering:
-            SwNumFmt** ppFmts = &SwNumRule::maBaseFmts[0][0];
+            SwNumFormat** ppFormats = &SwNumRule::maBaseFormats[0][0];
             int n;
 
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
 
             // Outline:
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
-
-            ppFmts = &SwNumRule::maLabelAlignmentBaseFmts[0][0];
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
+
+            ppFormats = &SwNumRule::maLabelAlignmentBaseFormats[0][0];
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
     }
 
-    maTxtNodeList.clear();
+    maTextNodeList.clear();
     maParagraphStyleList.clear();
 }
 
-void SwNumRule::CheckCharFmts( SwDoc* pDoc )
+void SwNumRule::CheckCharFormats( SwDoc* pDoc )
 {
     for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
     {
-        SwCharFmt* pFmt;
-        if( maFmts[ n ] && 0 != ( pFmt = maFmts[ n ]->GetCharFmt() ) &&
-            pFmt->GetDoc() != pDoc )
+        SwCharFormat* pFormat;
+        if( maFormats[ n ] && 0 != ( pFormat = maFormats[ n ]->GetCharFormat() ) &&
+            pFormat->GetDoc() != pDoc )
         {
             // copy
-            SwNumFmt* pNew = new SwNumFmt( *maFmts[ n ] );
-            pNew->SetCharFmt( pDoc->CopyCharFmt( *pFmt ) );
-            delete maFmts[ n ];
-            maFmts[ n ] = pNew;
+            SwNumFormat* pNew = new SwNumFormat( *maFormats[ n ] );
+            pNew->SetCharFormat( pDoc->CopyCharFormat( *pFormat ) );
+            delete maFormats[ n ];
+            maFormats[ n ] = pNew;
         }
     }
 }
@@ -557,7 +557,7 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
     if( this != &rNumRule )
     {
         for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-            Set( n, rNumRule.maFmts[ n ] );
+            Set( n, rNumRule.maFormats[ n ] );
 
         meRuleType = rNumRule.meRuleType;
         msName = rNumRule.msName;
@@ -566,7 +566,7 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
         mbContinusNum = rNumRule.mbContinusNum;
         mbAbsSpaces = rNumRule.mbAbsSpaces;
         mbHidden = rNumRule.mbHidden;
-        mnPoolFmtId = rNumRule.GetPoolFmtId();
+        mnPoolFormatId = rNumRule.GetPoolFormatId();
         mnPoolHelpId = rNumRule.GetPoolHelpId();
         mnPoolHlpFileId = rNumRule.GetPoolHlpFileId();
     }
@@ -580,7 +580,7 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const
                 mbAutoRuleFlag == rRule.mbAutoRuleFlag &&
                 mbContinusNum == rRule.mbContinusNum &&
                 mbAbsSpaces == rRule.mbAbsSpaces &&
-                mnPoolFmtId == rRule.GetPoolFmtId() &&
+                mnPoolFormatId == rRule.GetPoolFormatId() &&
                 mnPoolHelpId == rRule.GetPoolHelpId() &&
                 mnPoolHlpFileId == rRule.GetPoolHlpFileId();
     if( bRet )
@@ -595,38 +595,38 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const
     return bRet;
 }
 
-void SwNumRule::Set( sal_uInt16 i, const SwNumFmt& rNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFormat& rNumFormat )
 {
     OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i < MAXLEVEL )
     {
-        if( !maFmts[ i ] || !(rNumFmt == Get( i )) )
+        if( !maFormats[ i ] || !(rNumFormat == Get( i )) )
         {
-            delete maFmts[ i ];
-            maFmts[ i ] = new SwNumFmt( rNumFmt );
+            delete maFormats[ i ];
+            maFormats[ i ] = new SwNumFormat( rNumFormat );
             mbInvalidRuleFlag = true;
         }
     }
 }
 
-void SwNumRule::Set( sal_uInt16 i, const SwNumFmt* pNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFormat* pNumFormat )
 {
     OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i >= MAXLEVEL )
         return;
-    SwNumFmt* pOld = maFmts[ i ];
+    SwNumFormat* pOld = maFormats[ i ];
     if( !pOld )
     {
-        if( pNumFmt )
+        if( pNumFormat )
         {
-            maFmts[ i ] = new SwNumFmt( *pNumFmt );
+            maFormats[ i ] = new SwNumFormat( *pNumFormat );
             mbInvalidRuleFlag = true;
         }
     }
-    else if( !pNumFmt )
-        delete pOld, maFmts[ i ] = 0, mbInvalidRuleFlag = true;
-    else if( *pOld != *pNumFmt )
-        *pOld = *pNumFmt, mbInvalidRuleFlag = true;
+    else if( !pNumFormat )
+        delete pOld, maFormats[ i ] = 0, mbInvalidRuleFlag = true;
+    else if( *pOld != *pNumFormat )
+        *pOld = *pNumFormat, mbInvalidRuleFlag = true;
 }
 
 OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings,
@@ -659,17 +659,17 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
 
     if (nLevel < MAXLEVEL)
     {
-        const SwNumFmt& rMyNFmt = Get( static_cast<sal_uInt16>(nLevel) );
+        const SwNumFormat& rMyNFormat = Get( static_cast<sal_uInt16>(nLevel) );
 
         {
             sal_uInt8 i = static_cast<sal_uInt8>(nLevel);
 
             if( !IsContinusNum() &&
                 // - do not include upper levels, if level isn't numbered.
-                rMyNFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE &&
-                rMyNFmt.GetIncludeUpperLevels() )  // Just the own level?
+                rMyNFormat.GetNumberingType() != SVX_NUM_NUMBER_NONE &&
+                rMyNFormat.GetIncludeUpperLevels() )  // Just the own level?
             {
-                sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
+                sal_uInt8 n = rMyNFormat.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -681,8 +681,8 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
 
             for( ; i <= nLevel; ++i )
             {
-                const SwNumFmt& rNFmt = Get( i );
-                if( SVX_NUM_NUMBER_NONE == rNFmt.GetNumberingType() )
+                const SwNumFormat& rNFormat = Get( i );
+                if( SVX_NUM_NUMBER_NONE == rNFormat.GetNumberingType() )
                 {
                     // Should 1.1.1 --> 2. NoNum --> 1..1 or 1.1 ??
                     //                 if( i != rNum.nMyLevel )
@@ -695,7 +695,7 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
                     if( bOnlyArabic )
                         aStr += OUString::number( rNumVector[ i ] );
                     else
-                        aStr += rNFmt.GetNumStr( rNumVector[ i ] );
+                        aStr += rNFormat.GetNumStr( rNumVector[ i ] );
                 }
                 else
                     aStr += "0";        // all 0 level are a 0
@@ -706,11 +706,11 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
             // The type doesn't have any number, so don't append
             // the post-/prefix string
             if( bInclStrings && !bOnlyArabic &&
-                SVX_NUM_CHAR_SPECIAL != rMyNFmt.GetNumberingType() &&
-                SVX_NUM_BITMAP != rMyNFmt.GetNumberingType() )
+                SVX_NUM_CHAR_SPECIAL != rMyNFormat.GetNumberingType() &&
+                SVX_NUM_BITMAP != rMyNFormat.GetNumberingType() )
             {
-                const OUString sPrefix = rMyNFmt.GetPrefix();
-                const OUString sSuffix = rMyNFmt.GetSuffix();
+                const OUString sPrefix = rMyNFormat.GetPrefix();
+                const OUString sSuffix = rMyNFormat.GetSuffix();
 
                 aStr = sPrefix + aStr + sSuffix;
                 if ( pExtremities )
@@ -749,15 +749,15 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                SwNumFmt aFmt( Get( static_cast<sal_uInt16>(nListLevel) ) );
-                bMakeNumStringForPhantom = aFmt.IsEnumeration() &&
-                                           SVX_NUM_NUMBER_NONE != aFmt.GetNumberingType();
+                SwNumFormat aFormat( Get( static_cast<sal_uInt16>(nListLevel) ) );
+                bMakeNumStringForPhantom = aFormat.IsEnumeration() &&
+                                           SVX_NUM_NUMBER_NONE != aFormat.GetNumberingType();
 
             }
             if ( bMakeNumStringForPhantom ||
                  ( !pWorkingNodeNum->IsPhantom() &&
-                   pWorkingNodeNum->GetTxtNode() &&
-                   pWorkingNodeNum->GetTxtNode()->HasNumber() ) )
+                   pWorkingNodeNum->GetTextNode() &&
+                   pWorkingNodeNum->GetTextNode()->HasNumber() ) )
             {
                 Extremities aExtremities;
                 OUString aPrevStr = MakeNumString( pWorkingNodeNum->GetNumberVector(),
@@ -824,18 +824,18 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        Set( n, rNumRule.maFmts[ n ] );
-        if( maFmts[ n ] && maFmts[ n ]->GetCharFmt() &&
-            !pDoc->GetCharFmts()->Contains( maFmts[n]->GetCharFmt() ))
+        Set( n, rNumRule.maFormats[ n ] );
+        if( maFormats[ n ] && maFormats[ n ]->GetCharFormat() &&
+            !pDoc->GetCharFormats()->Contains( maFormats[n]->GetCharFormat() ))
             // If we copy across different Documents, then copy the
             // corresponding CharFormat into the new Document.
-            maFmts[n]->SetCharFmt( pDoc->CopyCharFmt( *maFmts[n]->
-                                        GetCharFmt() ) );
+            maFormats[n]->SetCharFormat( pDoc->CopyCharFormat( *maFormats[n]->
+                                        GetCharFormat() ) );
     }
     meRuleType = rNumRule.meRuleType;
     msName = rNumRule.msName;
     mbAutoRuleFlag = rNumRule.mbAutoRuleFlag;
-    mnPoolFmtId = rNumRule.GetPoolFmtId();
+    mnPoolFormatId = rNumRule.GetPoolFormatId();
     mnPoolHelpId = rNumRule.GetPoolHelpId();
     mnPoolHlpFileId = rNumRule.GetPoolHlpFileId();
     mbInvalidRuleFlag = true;
@@ -846,9 +846,9 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        const SvxNumberFormat* pSvxFmt = rNumRule.Get(n);
-        delete maFmts[n];
-        maFmts[n] = pSvxFmt ? new SwNumFmt(*pSvxFmt, pDoc) : 0;
+        const SvxNumberFormat* pSvxFormat = rNumRule.Get(n);
+        delete maFormats[n];
+        maFormats[n] = pSvxFormat ? new SwNumFormat(*pSvxFormat, pDoc) : 0;
     }
 
     mbInvalidRuleFlag = true;
@@ -863,10 +863,10 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
                      meRuleType == NUM_RULE ? SvxNumRuleType::NUMBERING : SvxNumRuleType::OUTLINE_NUMBERING );
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        SwNumFmt aNumFmt = Get(n);
-        if(aNumFmt.GetCharFmt())
-            aNumFmt.SetCharFmtName(aNumFmt.GetCharFmt()->GetName());
-        aRule.SetLevel(n, aNumFmt, maFmts[n] != 0);
+        SwNumFormat aNumFormat = Get(n);
+        if(aNumFormat.GetCharFormat())
+            aNumFormat.SetCharFormatName(aNumFormat.GetCharFormat()->GetName());
+        aRule.SetLevel(n, aNumFormat, maFormats[n] != 0);
     }
     return aRule;
 }
@@ -876,12 +876,12 @@ void SwNumRule::SetInvalidRule(bool bFlag)
     if (bFlag)
     {
         std::set< SwList* > aLists;
-        tTxtNodeList::iterator aIter;
-        for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
+        tTextNodeList::iterator aIter;
+        for ( aIter = maTextNodeList.begin(); aIter != maTextNodeList.end(); ++aIter )
         {
-            const SwTxtNode* pTxtNode = *aIter;
+            const SwTextNode* pTextNode = *aIter;
             // #i111681# - applying patch from cmc
-            SwList* pList = pTxtNode->GetDoc()->getIDocumentListsAccess().getListByName( pTxtNode->GetListId() );
+            SwList* pList = pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() );
             OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
             if ( pList )
             {
@@ -900,35 +900,35 @@ void SwNumRule::ChangeIndent( const short nDiff )
 {
     for ( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
     {
-        SwNumFmt aTmpNumFmt( Get(i) );
+        SwNumFormat aTmpNumFormat( Get(i) );
 
         const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
         if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
         {
             short nNewIndent = nDiff +
-                               aTmpNumFmt.GetAbsLSpace();
+                               aTmpNumFormat.GetAbsLSpace();
             if ( nNewIndent < 0 )
             {
                 nNewIndent = 0;
             }
-            aTmpNumFmt.SetAbsLSpace( nNewIndent );
+            aTmpNumFormat.SetAbsLSpace( nNewIndent );
         }
         else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             // adjust also the list tab position, if a list tab stop is applied
-            if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+            if ( aTmpNumFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
             {
-                const long nNewListTab = aTmpNumFmt.GetListtabPos() +  nDiff;
-                aTmpNumFmt.SetListtabPos( nNewListTab );
+                const long nNewListTab = aTmpNumFormat.GetListtabPos() +  nDiff;
+                aTmpNumFormat.SetListtabPos( nNewListTab );
             }
 
             const long nNewIndent = nDiff +
-                              aTmpNumFmt.GetIndentAt();
-            aTmpNumFmt.SetIndentAt( nNewIndent );
+                              aTmpNumFormat.GetIndentAt();
+            aTmpNumFormat.SetIndentAt( nNewIndent );
         }
 
-        Set( i, aTmpNumFmt );
+        Set( i, aTmpNumFormat );
     }
 
     SetInvalidRule( true );
@@ -938,25 +938,25 @@ void SwNumRule::ChangeIndent( const short nDiff )
 void SwNumRule::SetIndent( const short nNewIndent,
                            const sal_uInt16 nListLevel )
 {
-    SwNumFmt aTmpNumFmt( Get(nListLevel) );
+    SwNumFormat aTmpNumFormat( Get(nListLevel) );
 
     const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
     if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        aTmpNumFmt.SetAbsLSpace( nNewIndent );
+        aTmpNumFormat.SetAbsLSpace( nNewIndent );
     }
     else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         // adjust also the list tab position, if a list tab stop is applied
-        if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+        if ( aTmpNumFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
         {
-            const long nNewListTab = aTmpNumFmt.GetListtabPos() +
-                                     ( nNewIndent - aTmpNumFmt.GetIndentAt() );
-            aTmpNumFmt.SetListtabPos( nNewListTab );
+            const long nNewListTab = aTmpNumFormat.GetListtabPos() +
+                                     ( nNewIndent - aTmpNumFormat.GetIndentAt() );
+            aTmpNumFormat.SetListtabPos( nNewListTab );
         }
 
-        aTmpNumFmt.SetIndentAt( nNewIndent );
+        aTmpNumFormat.SetIndentAt( nNewIndent );
     }
 
     SetInvalidRule( true );
@@ -966,21 +966,21 @@ void SwNumRule::SetIndent( const short nNewIndent,
 /// indents accordingly
 void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent )
 {
-    SwNumFmt aTmpNumFmt( Get(0) );
+    SwNumFormat aTmpNumFormat( Get(0) );
 
     short nDiff( 0 );
     const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
     if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         nDiff = nNewIndent
-                - aTmpNumFmt.GetFirstLineOffset()
-                - aTmpNumFmt.GetAbsLSpace();
+                - aTmpNumFormat.GetFirstLineOffset()
+                - aTmpNumFormat.GetAbsLSpace();
     }
     else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         nDiff = static_cast<short>(nNewIndent
-                                   - aTmpNumFmt.GetIndentAt());
+                                   - aTmpNumFormat.GetIndentAt());
     }
     if ( nDiff != 0  )
     {
@@ -991,11 +991,11 @@ void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent
 void SwNumRule::Validate()
 {
     std::set< SwList* > aLists;
-    tTxtNodeList::iterator aIter;
-    for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
+    tTextNodeList::iterator aIter;
+    for ( aIter = maTextNodeList.begin(); aIter != maTextNodeList.end(); ++aIter )
     {
-        const SwTxtNode* pTxtNode = *aIter;
-        aLists.insert( pTxtNode->GetDoc()->getIDocumentListsAccess().getListByName( pTxtNode->GetListId() ) );
+        const SwTextNode* pTextNode = *aIter;
+        aLists.insert( pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() ) );
     }
     std::for_each( aLists.begin(), aLists.end(),
                    std::mem_fun( &SwList::ValidateListTree ) );
@@ -1013,21 +1013,21 @@ SwNumRule::tParagraphStyleList::size_type SwNumRule::GetParagraphStyleListSize()
     return maParagraphStyleList.size();
 }
 
-void SwNumRule::AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
+void SwNumRule::AddParagraphStyle( SwTextFormatColl& rTextFormatColl )
 {
     tParagraphStyleList::iterator aIter =
-        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTxtFmtColl );
+        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTextFormatColl );
 
     if ( aIter == maParagraphStyleList.end() )
     {
-        maParagraphStyleList.push_back( &rTxtFmtColl );
+        maParagraphStyleList.push_back( &rTextFormatColl );
     }
 }
 
-void SwNumRule::RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
+void SwNumRule::RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl )
 {
     tParagraphStyleList::iterator aIter =
-        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTxtFmtColl );
+        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTextFormatColl );
 
     if ( aIter != maParagraphStyleList.end() )
     {
@@ -1039,7 +1039,7 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRule"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("msName"), BAD_CAST(msName.toUtf8().getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mnPoolFmtId"), BAD_CAST(OString::number(mnPoolFmtId).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mnPoolFormatId"), BAD_CAST(OString::number(mnPoolFormatId).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mbAutoRuleFlag"), BAD_CAST(OString::boolean(mbAutoRuleFlag).getStr()));
     xmlTextWriterEndElement(pWriter);
 }
@@ -1438,9 +1438,9 @@ namespace numfunc
     }
 }
 
-void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwNumRuleTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRuleTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRuleTable"));
     for (SwNumRule* pNumRule : *this)
         pNumRule->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index bf9a98e38de0..f290b0590efd 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -118,14 +118,14 @@ bool SwDoc::IsUsed( const SwModify& rModify ) const
 {
     // Check if we have dependent ContentNodes in the Nodes array
     // (also indirect ones for derived Formats)
-    SwAutoFmtGetDocNode aGetHt( &GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &GetNodes() );
     return !rModify.GetInfo( aGetHt );
 }
 
 // See if the NumRule is used
 bool SwDoc::IsUsed( const SwNumRule& rRule )
 {
-    bool bUsed = rRule.GetTxtNodeListSize() > 0 ||
+    bool bUsed = rRule.GetTextNodeListSize() > 0 ||
                      rRule.GetParagraphStyleListSize() > 0;
 
     return bUsed;
@@ -280,16 +280,16 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
     return nRet;
 }
 
-void SwDoc::RemoveAllFmtLanguageDependencies()
+void SwDoc::RemoveAllFormatLanguageDependencies()
 {
     /* Restore the language independ pool defaults and styles. */
     GetAttrPool().ResetPoolDefaultItem( RES_PARATR_ADJUST );
 
-    SwTxtFmtColl * pTxtFmtColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+    SwTextFormatColl * pTextFormatColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD );
 
-    pTxtFmtColl->ResetFmtAttr( RES_PARATR_ADJUST );
+    pTextFormatColl->ResetFormatAttr( RES_PARATR_ADJUST );
     /* koreans do not like SvxScriptItem(TRUE) */
-    pTxtFmtColl->ResetFmtAttr( RES_PARATR_SCRIPTSPACE );
+    pTextFormatColl->ResetFormatAttr( RES_PARATR_SCRIPTSPACE );
 
     SvxFrameDirectionItem aFrameDir( FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
 
@@ -297,8 +297,8 @@ void SwDoc::RemoveAllFmtLanguageDependencies()
     for( size_t i=0; i<nCount; ++i )
     {
         SwPageDesc& rDesc = GetPageDesc( i );
-        rDesc.GetMaster().SetFmtAttr( aFrameDir );
-        rDesc.GetLeft().SetFmtAttr( aFrameDir );
+        rDesc.GetMaster().SetFormatAttr( aFrameDir );
+        rDesc.GetLeft().SetFormatAttr( aFrameDir );
     }
 
     //#i16874# AutoKerning as default for new documents
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 9a874c68062a..5960c35af5c0 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -72,8 +72,8 @@ bool SwServerObject::GetData( uno::Any & rData,
             break;
 
         case TABLE_SERVER:
-            pPam = new SwPaM( *CNTNT_TYPE.pTblNd,
-                            *CNTNT_TYPE.pTblNd->EndOfSectionNode() );
+            pPam = new SwPaM( *CNTNT_TYPE.pTableNd,
+                            *CNTNT_TYPE.pTableNd->EndOfSectionNode() );
             break;
 
         case SECTION_SERVER:
@@ -122,7 +122,7 @@ void SwServerObject::SendDataChanged( const SwPosition& rPos )
                 }
                 break;
 
-            case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+            case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
             case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
             case NONE_SERVER: break;
         }
@@ -159,7 +159,7 @@ void SwServerObject::SendDataChanged( const SwPaM& rRange )
             }
             break;
 
-        case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+        case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
         case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
         case NONE_SERVER: break;
         }
@@ -203,7 +203,7 @@ bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
         }
         break;
 
-    case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+    case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
     case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
 
     case SECTION_SERVER+1:
@@ -284,14 +284,14 @@ SwDataChanged::SwDataChanged( const SwPaM& rPam )
     : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() )
 {
     nNode = rPam.GetPoint()->nNode.GetIndex();
-    nCntnt = rPam.GetPoint()->nContent.GetIndex();
+    nContent = rPam.GetPoint()->nContent.GetIndex();
 }
 
 SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos )
     : pPam( 0 ), pPos( &rPos ), pDoc( pDc )
 {
     nNode = rPos.nNode.GetIndex();
-    nCntnt = rPos.nContent.GetIndex();
+    nContent = rPos.nContent.GetIndex();
 }
 
 SwDataChanged::~SwDataChanged()
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index a260ddfae52b..8cc23c510382 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -83,7 +83,7 @@ const sal_uInt16 AUTOFORMAT_ID          = AUTOFORMAT_ID_31005;
 const sal_uInt16 AUTOFORMAT_DATA_ID     = AUTOFORMAT_DATA_ID_31005;
 const sal_uInt16 AUTOFORMAT_FILE_VERSION= SOFFICE_FILEFORMAT_50;
 
-SwBoxAutoFmt* SwTableAutoFmt::pDfltBoxAutoFmt = 0;
+SwBoxAutoFormat* SwTableAutoFormat::pDfltBoxAutoFormat = 0;
 
 #define AUTOTABLE_FORMAT_NAME "autotbl.fmt"
 
@@ -185,7 +185,7 @@ public:
     sal_uInt16 nInt32Version;
     sal_uInt16 nRotateModeVersion;
 
-    sal_uInt16 nNumFmtVersion;
+    sal_uInt16 nNumFormatVersion;
 
     SwAfVersions();
     void Load( SvStream& rStream, sal_uInt16 nVer );
@@ -215,7 +215,7 @@ SwAfVersions::SwAfVersions() :
     nBoolVersion(0),
     nInt32Version(0),
     nRotateModeVersion(0),
-    nNumFmtVersion(0)
+    nNumFormatVersion(0)
 {
 }
 
@@ -253,10 +253,10 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer )
         rStream.ReadUInt16( nInt32Version );
         rStream.ReadUInt16( nRotateModeVersion );
     }
-    rStream.ReadUInt16( nNumFmtVersion );
+    rStream.ReadUInt16( nNumFormatVersion );
 }
 
-SwBoxAutoFmt::SwBoxAutoFmt()
+SwBoxAutoFormat::SwBoxAutoFormat()
     : aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ),
     aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
     aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
@@ -297,11 +297,11 @@ SwBoxAutoFmt::SwBoxAutoFmt()
 //    aBLTR( RES_... ),
     aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 )
 {
-    eSysLanguage = eNumFmtLanguage = ::GetAppLanguage();
+    eSysLanguage = eNumFormatLanguage = ::GetAppLanguage();
     aBox.SetDistance( 55 );
 }
 
-SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
+SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew )
     : aFont( rNew.aFont ),
     aHeight( rNew.aHeight ),
     aWeight( rNew.aWeight ),
@@ -334,17 +334,17 @@ SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
     aLinebreak( rNew.aLinebreak ),
     aRotateAngle( rNew.aRotateAngle ),
     aRotateMode( rNew.aRotateMode ),
-    sNumFmtString( rNew.sNumFmtString ),
+    sNumFormatString( rNew.sNumFormatString ),
     eSysLanguage( rNew.eSysLanguage ),
-    eNumFmtLanguage( rNew.eNumFmtLanguage )
+    eNumFormatLanguage( rNew.eNumFormatLanguage )
 {
 }
 
-SwBoxAutoFmt::~SwBoxAutoFmt()
+SwBoxAutoFormat::~SwBoxAutoFormat()
 {
 }
 
-SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
+SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew )
 {
     aFont = rNew.aFont;
     aHeight = rNew.aHeight;
@@ -380,9 +380,9 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
     aRotateAngle.SetValue( rNew.aRotateAngle.GetValue() );
     aRotateMode.SetValue( rNew.aRotateMode.GetValue() );
 
-    sNumFmtString = rNew.sNumFmtString;
+    sNumFormatString = rNew.sNumFormatString;
     eSysLanguage = rNew.eSysLanguage;
-    eNumFmtLanguage = rNew.eNumFmtLanguage;
+    eNumFormatLanguage = rNew.eNumFormatLanguage;
 
     return *this;
 }
@@ -392,7 +392,7 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
     aItem = *static_cast<aItemType*>(pNew); \
     delete pNew;
 
-bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
+bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
 {
     SfxPoolItem* pNew;
     SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0);
@@ -445,7 +445,7 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
     if (nVer >= AUTOFORMAT_DATA_ID_31005 && WriterSpecificBlockExists(rStream))
     {
         READ(m_aTextOrientation, SvxFrameDirectionItem, rVersions.m_nTextOrientationVersion);
-        READ(m_aVerticalAlignment, SwFmtVertOrient, rVersions.m_nVerticalAlignmentVersion);
+        READ(m_aVerticalAlignment, SwFormatVertOrient, rVersions.m_nVerticalAlignmentVersion);
     }
 
     READ( aHorJustify,  SvxHorJustifyItem , rVersions.nHorJustifyVersion)
@@ -468,15 +468,15 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
         delete pNew;
     }
 
-    if( 0 == rVersions.nNumFmtVersion )
+    if( 0 == rVersions.nNumFormatVersion )
     {
         sal_uInt16 eSys, eLge;
         // --- from 680/dr25 on: store strings as UTF-8
         rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
-        sNumFmtString = rStream.ReadUniOrByteString( eCharSet );
+        sNumFormatString = rStream.ReadUniOrByteString( eCharSet );
         rStream.ReadUInt16( eSys ).ReadUInt16( eLge );
         eSysLanguage = (LanguageType) eSys;
-        eNumFmtLanguage = (LanguageType) eLge;
+        eNumFormatLanguage = (LanguageType) eLge;
         if ( eSysLanguage == LANGUAGE_SYSTEM )      // from old versions (Calc)
             eSysLanguage = ::GetAppLanguage();
     }
@@ -487,7 +487,7 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
     return 0 == rStream.GetError();
 }
 
-bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 );
 
@@ -533,14 +533,14 @@ bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
     aRotateMode.Store( rStream, aRotateMode.GetVersion(fileVersion) );
 
     // --- from 680/dr25 on: store strings as UTF-8
-    write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString,
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFormatString,
         RTL_TEXTENCODING_UTF8);
-    rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFmtLanguage );
+    rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFormatLanguage );
 
     return 0 == rStream.GetError();
 }
 
-bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     rStream.WriteUInt16( aFont.GetVersion( fileVersion ) );
     rStream.WriteUInt16( aHeight.GetVersion( fileVersion ) );
@@ -579,7 +579,7 @@ bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) co
     return 0 == rStream.GetError();
 }
 
-SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
+SwTableAutoFormat::SwTableAutoFormat( const OUString& rName )
     : m_aName( rName )
     , nStrResId( USHRT_MAX )
     , m_aBreak( SVX_BREAK_NONE, RES_BREAK )
@@ -597,34 +597,34 @@ SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
     bInclValueFormat = true;
     bInclWidthHeight = true;
 
-    memset( aBoxAutoFmt, 0, sizeof( aBoxAutoFmt ) );
+    memset( aBoxAutoFormat, 0, sizeof( aBoxAutoFormat ) );
 }
 
-SwTableAutoFmt::SwTableAutoFmt( const SwTableAutoFmt& rNew )
+SwTableAutoFormat::SwTableAutoFormat( const SwTableAutoFormat& rNew )
     : m_aBreak( rNew.m_aBreak )
     , m_aKeepWithNextPara( false, RES_KEEP )
     , m_aShadow( RES_SHADOW )
 {
     for( sal_uInt8 n = 0; n < 16; ++n )
-        aBoxAutoFmt[ n ] = 0;
+        aBoxAutoFormat[ n ] = 0;
     *this = rNew;
 }
 
-SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
+SwTableAutoFormat& SwTableAutoFormat::operator=( const SwTableAutoFormat& rNew )
 {
     if (&rNew == this)
         return *this;
 
     for( sal_uInt8 n = 0; n < 16; ++n )
     {
-        if( aBoxAutoFmt[ n ] )
-            delete aBoxAutoFmt[ n ];
+        if( aBoxAutoFormat[ n ] )
+            delete aBoxAutoFormat[ n ];
 
-        SwBoxAutoFmt* pFmt = rNew.aBoxAutoFmt[ n ];
-        if( pFmt )      // if is set -> copy
-            aBoxAutoFmt[ n ] = new SwBoxAutoFmt( *pFmt );
+        SwBoxAutoFormat* pFormat = rNew.aBoxAutoFormat[ n ];
+        if( pFormat )      // if is set -> copy
+            aBoxAutoFormat[ n ] = new SwBoxAutoFormat( *pFormat );
         else            // else default
-            aBoxAutoFmt[ n ] = 0;
+            aBoxAutoFormat[ n ] = 0;
     }
 
     m_aName = rNew.m_aName;
@@ -648,99 +648,99 @@ SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
     return *this;
 }
 
-SwTableAutoFmt::~SwTableAutoFmt()
+SwTableAutoFormat::~SwTableAutoFormat()
 {
-    SwBoxAutoFmt** ppFmt = aBoxAutoFmt;
-    for( sal_uInt8 n = 0; n < 16; ++n, ++ppFmt )
-        if( *ppFmt )
-            delete *ppFmt;
+    SwBoxAutoFormat** ppFormat = aBoxAutoFormat;
+    for( sal_uInt8 n = 0; n < 16; ++n, ++ppFormat )
+        if( *ppFormat )
+            delete *ppFormat;
 }
 
-void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos )
+void SwTableAutoFormat::SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos )
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( pFmt )      // if is set -> copy
-        *aBoxAutoFmt[ nPos ] = rNew;
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( pFormat )      // if is set -> copy
+        *aBoxAutoFormat[ nPos ] = rNew;
     else            // else set anew
-        aBoxAutoFmt[ nPos ] = new SwBoxAutoFmt( rNew );
+        aBoxAutoFormat[ nPos ] = new SwBoxAutoFormat( rNew );
 }
 
-const SwBoxAutoFmt& SwTableAutoFmt::GetBoxFmt( sal_uInt8 nPos ) const
+const SwBoxAutoFormat& SwTableAutoFormat::GetBoxFormat( sal_uInt8 nPos ) const
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( pFmt )      // if is set -> copy
-        return *pFmt;
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( pFormat )      // if is set -> copy
+        return *pFormat;
     else            // else return the default
     {
         // If it doesn't exist yet:
-        if( !pDfltBoxAutoFmt )
-            pDfltBoxAutoFmt = new SwBoxAutoFmt;
-        return *pDfltBoxAutoFmt;
+        if( !pDfltBoxAutoFormat )
+            pDfltBoxAutoFormat = new SwBoxAutoFormat;
+        return *pDfltBoxAutoFormat;
     }
 }
 
-void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
+void SwTableAutoFormat::UpdateFromSet( sal_uInt8 nPos,
                                     const SfxItemSet& rSet,
                                     UpdateFlags eFlags,
-                                    SvNumberFormatter* pNFmtr)
+                                    SvNumberFormatter* pNFormatr)
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( !pFmt )     // if is set -> copy
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( !pFormat )     // if is set -> copy
     {
-        pFmt = new SwBoxAutoFmt;
-        aBoxAutoFmt[ nPos ] = pFmt;
+        pFormat = new SwBoxAutoFormat;
+        aBoxAutoFormat[ nPos ] = pFormat;
     }
 
     if( UPDATE_CHAR & eFlags )
     {
-        pFmt->SetFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_FONT )) );
-        pFmt->SetHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_FONTSIZE )) );
-        pFmt->SetWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_WEIGHT )) );
-        pFmt->SetPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_POSTURE )) );
-        pFmt->SetCJKFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CJK_FONT )) );
-        pFmt->SetCJKHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CJK_FONTSIZE )) );
-        pFmt->SetCJKWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CJK_WEIGHT )) );
-        pFmt->SetCJKPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CJK_POSTURE )) );
-        pFmt->SetCTLFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CTL_FONT )) );
-        pFmt->SetCTLHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CTL_FONTSIZE )) );
-        pFmt->SetCTLWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CTL_WEIGHT )) );
-        pFmt->SetCTLPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CTL_POSTURE )) );
-        pFmt->SetUnderline( static_cast<const SvxUnderlineItem&>(rSet.Get( RES_CHRATR_UNDERLINE )) );
-        pFmt->SetOverline( static_cast<const SvxOverlineItem&>(rSet.Get( RES_CHRATR_OVERLINE )) );
-        pFmt->SetCrossedOut( static_cast<const SvxCrossedOutItem&>(rSet.Get( RES_CHRATR_CROSSEDOUT )) );
-        pFmt->SetContour( static_cast<const SvxContourItem&>(rSet.Get( RES_CHRATR_CONTOUR )) );
-        pFmt->SetShadowed( static_cast<const SvxShadowedItem&>(rSet.Get( RES_CHRATR_SHADOWED )) );
-        pFmt->SetColor( static_cast<const SvxColorItem&>(rSet.Get( RES_CHRATR_COLOR )) );
-        pFmt->SetAdjust( static_cast<const SvxAdjustItem&>(rSet.Get( RES_PARATR_ADJUST )) );
+        pFormat->SetFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_FONT )) );
+        pFormat->SetHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_FONTSIZE )) );
+        pFormat->SetWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_WEIGHT )) );
+        pFormat->SetPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_POSTURE )) );
+        pFormat->SetCJKFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CJK_FONT )) );
+        pFormat->SetCJKHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CJK_FONTSIZE )) );
+        pFormat->SetCJKWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CJK_WEIGHT )) );
+        pFormat->SetCJKPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CJK_POSTURE )) );
+        pFormat->SetCTLFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CTL_FONT )) );
+        pFormat->SetCTLHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CTL_FONTSIZE )) );
+        pFormat->SetCTLWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CTL_WEIGHT )) );
+        pFormat->SetCTLPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CTL_POSTURE )) );
+        pFormat->SetUnderline( static_cast<const SvxUnderlineItem&>(rSet.Get( RES_CHRATR_UNDERLINE )) );
+        pFormat->SetOverline( static_cast<const SvxOverlineItem&>(rSet.Get( RES_CHRATR_OVERLINE )) );
+        pFormat->SetCrossedOut( static_cast<const SvxCrossedOutItem&>(rSet.Get( RES_CHRATR_CROSSEDOUT )) );
+        pFormat->SetContour( static_cast<const SvxContourItem&>(rSet.Get( RES_CHRATR_CONTOUR )) );
+        pFormat->SetShadowed( static_cast<const SvxShadowedItem&>(rSet.Get( RES_CHRATR_SHADOWED )) );
+        pFormat->SetColor( static_cast<const SvxColorItem&>(rSet.Get( RES_CHRATR_COLOR )) );
+        pFormat->SetAdjust( static_cast<const SvxAdjustItem&>(rSet.Get( RES_PARATR_ADJUST )) );
     }
     if( UPDATE_BOX & eFlags )
     {
-        pFmt->SetBox( static_cast<const SvxBoxItem&>(rSet.Get( RES_BOX )) );
+        pFormat->SetBox( static_cast<const SvxBoxItem&>(rSet.Get( RES_BOX )) );
 // FIXME - add attribute IDs for the diagonal line items
-//        pFmt->SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) );
-//        pFmt->SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) );
-        pFmt->SetBackground( static_cast<const SvxBrushItem&>(rSet.Get( RES_BACKGROUND )) );
-        pFmt->SetTextOrientation(static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)));
-        pFmt->SetVerticalAlignment(static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT)));
+//        pFormat->SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) );
+//        pFormat->SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) );
+        pFormat->SetBackground( static_cast<const SvxBrushItem&>(rSet.Get( RES_BACKGROUND )) );
+        pFormat->SetTextOrientation(static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)));
+        pFormat->SetVerticalAlignment(static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT)));
 
-        const SwTblBoxNumFormat* pNumFmtItem;
+        const SwTableBoxNumFormat* pNumFormatItem;
         const SvNumberformat* pNumFormat = 0;
         if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, true,
-            reinterpret_cast<const SfxPoolItem**>(&pNumFmtItem) ) && pNFmtr &&
-            0 != (pNumFormat = pNFmtr->GetEntry( pNumFmtItem->GetValue() )) )
-            pFmt->SetValueFormat( pNumFormat->GetFormatstring(),
+            reinterpret_cast<const SfxPoolItem**>(&pNumFormatItem) ) && pNFormatr &&
+            0 != (pNumFormat = pNFormatr->GetEntry( pNumFormatItem->GetValue() )) )
+            pFormat->SetValueFormat( pNumFormat->GetFormatstring(),
                                     pNumFormat->GetLanguage(),
                                     ::GetAppLanguage());
         else
         {
             // default
-            pFmt->SetValueFormat( OUString(), LANGUAGE_SYSTEM,
+            pFormat->SetValueFormat( OUString(), LANGUAGE_SYSTEM,
                                   ::GetAppLanguage() );
         }
     }
@@ -748,10 +748,10 @@ void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
     // we cannot handle the rest, that's specific to StarCalc
 }
 
-void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
-                                 UpdateFlags eFlags, SvNumberFormatter* pNFmtr) const
+void SwTableAutoFormat::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
+                                 UpdateFlags eFlags, SvNumberFormatter* pNFormatr) const
 {
-    const SwBoxAutoFmt& rChg = GetBoxFmt( nPos );
+    const SwBoxAutoFormat& rChg = GetBoxFormat( nPos );
 
     if( UPDATE_CHAR & eFlags )
     {
@@ -817,19 +817,19 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
         rSet.Put(rChg.GetTextOrientation());
         rSet.Put(rChg.GetVerticalAlignment());
 
-        if( IsValueFormat() && pNFmtr )
+        if( IsValueFormat() && pNFormatr )
         {
-            OUString sFmt;
+            OUString sFormat;
             LanguageType eLng, eSys;
-            rChg.GetValueFormat( sFmt, eLng, eSys );
-            if( !sFmt.isEmpty() )
+            rChg.GetValueFormat( sFormat, eLng, eSys );
+            if( !sFormat.isEmpty() )
             {
                 short nType;
                 bool bNew;
                 sal_Int32 nCheckPos;
-                sal_uInt32 nKey = pNFmtr->GetIndexPuttingAndConverting( sFmt, eLng,
+                sal_uInt32 nKey = pNFormatr->GetIndexPuttingAndConverting( sFormat, eLng,
                                                                         eSys, nType, bNew, nCheckPos);
-                rSet.Put( SwTblBoxNumFormat( nKey ));
+                rSet.Put( SwTableBoxNumFormat( nKey ));
             }
             else
                 rSet.ClearItem( RES_BOXATR_FORMAT );
@@ -839,9 +839,9 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
     // we cannot handle the rest, that's specific to StarCalc
 }
 
-void SwTableAutoFmt::RestoreTableProperties(SwTable &table) const
+void SwTableAutoFormat::RestoreTableProperties(SwTable &table) const
 {
-    SwTableFmt* pFormat = table.GetFrmFmt();
+    SwTableFormat* pFormat = table.GetFrameFormat();
     if (!pFormat)
         return;
 
@@ -853,22 +853,22 @@ void SwTableAutoFmt::RestoreTableProperties(SwTable &table) const
 
     rSet.Put(m_aBreak);
     rSet.Put(m_aPageDesc);
-    rSet.Put(SwFmtLayoutSplit(m_bLayoutSplit));
+    rSet.Put(SwFormatLayoutSplit(m_bLayoutSplit));
     rSet.Put(SfxBoolItem(RES_COLLAPSING_BORDERS, m_bCollapsingBorders));
     rSet.Put(m_aKeepWithNextPara);
     rSet.Put(m_aShadow);
 
-    pFormat->SetFmtAttr(rSet);
+    pFormat->SetFormatAttr(rSet);
 
     SwEditShell *pShell = pDoc->GetEditShell();
-    pDoc->SetRowSplit(*pShell->getShellCrsr(false), SwFmtRowSplit(m_bRowSplit));
+    pDoc->SetRowSplit(*pShell->getShellCrsr(false), SwFormatRowSplit(m_bRowSplit));
 
     table.SetRowsToRepeat(m_aRepeatHeading);
 }
 
-void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
+void SwTableAutoFormat::StoreTableProperties(const SwTable &table)
 {
-    SwTableFmt* pFormat = table.GetFrmFmt();
+    SwTableFormat* pFormat = table.GetFrameFormat();
     if (!pFormat)
         return;
 
@@ -877,7 +877,7 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
         return;
 
     SwEditShell *pShell = pDoc->GetEditShell();
-    SwFmtRowSplit *pRowSplit = 0;
+    SwFormatRowSplit *pRowSplit = 0;
     SwDoc::GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
     m_bRowSplit = pRowSplit && pRowSplit->GetValue();
     delete pRowSplit;
@@ -885,18 +885,18 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
 
     const SfxItemSet &rSet = pFormat->GetAttrSet();
 
-    m_aBreak = static_cast<const SvxFmtBreakItem&>(rSet.Get(RES_BREAK));
-    m_aPageDesc = static_cast<const SwFmtPageDesc&>(rSet.Get(RES_PAGEDESC));
-    const SwFmtLayoutSplit &layoutSplit = static_cast<const SwFmtLayoutSplit&>(rSet.Get(RES_LAYOUT_SPLIT));
+    m_aBreak = static_cast<const SvxFormatBreakItem&>(rSet.Get(RES_BREAK));
+    m_aPageDesc = static_cast<const SwFormatPageDesc&>(rSet.Get(RES_PAGEDESC));
+    const SwFormatLayoutSplit &layoutSplit = static_cast<const SwFormatLayoutSplit&>(rSet.Get(RES_LAYOUT_SPLIT));
     m_bLayoutSplit = layoutSplit.GetValue();
     m_bCollapsingBorders = static_cast<const SfxBoolItem&>(rSet.Get(RES_COLLAPSING_BORDERS)).GetValue();
 
-    m_aKeepWithNextPara = static_cast<const SvxFmtKeepItem&>(rSet.Get(RES_KEEP));
+    m_aKeepWithNextPara = static_cast<const SvxFormatKeepItem&>(rSet.Get(RES_KEEP));
     m_aRepeatHeading = table.GetRowsToRepeat();
     m_aShadow = static_cast<const SvxShadowItem&>(rSet.Get(RES_SHADOW));
 }
 
-bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
+bool SwTableAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions )
 {
     sal_uInt16  nVal = 0;
     rStream.ReadUInt16( nVal );
@@ -932,9 +932,9 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
         {
             SfxPoolItem* pNew = 0;
 
-            READ(m_aBreak, SvxFmtBreakItem, AUTOFORMAT_FILE_VERSION);
-            READ(m_aPageDesc, SwFmtPageDesc, AUTOFORMAT_FILE_VERSION);
-            READ(m_aKeepWithNextPara, SvxFmtKeepItem, AUTOFORMAT_FILE_VERSION);
+            READ(m_aBreak, SvxFormatBreakItem, AUTOFORMAT_FILE_VERSION);
+            READ(m_aPageDesc, SwFormatPageDesc, AUTOFORMAT_FILE_VERSION);
+            READ(m_aKeepWithNextPara, SvxFormatKeepItem, AUTOFORMAT_FILE_VERSION);
 
             rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( m_bCollapsingBorders );
 
@@ -945,13 +945,13 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
 
         for( sal_uInt8 i = 0; bRet && i < 16; ++i )
         {
-            SwBoxAutoFmt* pFmt = new SwBoxAutoFmt;
-            bRet = pFmt->Load( rStream, rVersions, nVal );
+            SwBoxAutoFormat* pFormat = new SwBoxAutoFormat;
+            bRet = pFormat->Load( rStream, rVersions, nVal );
             if( bRet )
-                aBoxAutoFmt[ i ] = pFmt;
+                aBoxAutoFormat[ i ] = pFormat;
             else
             {
-                delete pFmt;
+                delete pFormat;
                 break;
             }
         }
@@ -959,7 +959,7 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
     return bRet;
 }
 
-bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwTableAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     sal_uInt16 nVal = AUTOFORMAT_DATA_ID;
     rStream.WriteUInt16( nVal );
@@ -988,66 +988,66 @@ bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 
     for( int i = 0; bRet && i < 16; ++i )
     {
-        SwBoxAutoFmt* pFmt = aBoxAutoFmt[ i ];
-        if( !pFmt )     // if not set -> write default
+        SwBoxAutoFormat* pFormat = aBoxAutoFormat[ i ];
+        if( !pFormat )     // if not set -> write default
         {
             // If it doesn't exist yet:
-            if( !pDfltBoxAutoFmt )
-                pDfltBoxAutoFmt = new SwBoxAutoFmt;
-            pFmt = pDfltBoxAutoFmt;
+            if( !pDfltBoxAutoFormat )
+                pDfltBoxAutoFormat = new SwBoxAutoFormat;
+            pFormat = pDfltBoxAutoFormat;
         }
-        bRet = pFmt->Save( rStream, fileVersion );
+        bRet = pFormat->Save( rStream, fileVersion );
     }
     return bRet;
 }
 
-struct SwTableAutoFmtTbl::Impl
+struct SwTableAutoFormatTable::Impl
 {
-    boost::ptr_vector<SwTableAutoFmt> m_AutoFormats;
+    boost::ptr_vector<SwTableAutoFormat> m_AutoFormats;
 };
 
-size_t SwTableAutoFmtTbl::size() const
+size_t SwTableAutoFormatTable::size() const
 {
     return m_pImpl->m_AutoFormats.size();
 }
 
-SwTableAutoFmt const& SwTableAutoFmtTbl::operator[](size_t const i) const
+SwTableAutoFormat const& SwTableAutoFormatTable::operator[](size_t const i) const
 {
     return m_pImpl->m_AutoFormats[i];
 }
-SwTableAutoFmt      & SwTableAutoFmtTbl::operator[](size_t const i)
+SwTableAutoFormat      & SwTableAutoFormatTable::operator[](size_t const i)
 {
     return m_pImpl->m_AutoFormats[i];
 }
 
 void
-SwTableAutoFmtTbl::InsertAutoFmt(size_t const i, SwTableAutoFmt *const pFmt)
+SwTableAutoFormatTable::InsertAutoFormat(size_t const i, SwTableAutoFormat *const pFormat)
 {
-    m_pImpl->m_AutoFormats.insert(m_pImpl->m_AutoFormats.begin() + i, pFmt);
+    m_pImpl->m_AutoFormats.insert(m_pImpl->m_AutoFormats.begin() + i, pFormat);
 }
 
-void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
+void SwTableAutoFormatTable::EraseAutoFormat(size_t const i)
 {
     m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
 }
 
-SwTableAutoFmt* SwTableAutoFmtTbl::ReleaseAutoFmt(size_t const i)
+SwTableAutoFormat* SwTableAutoFormatTable::ReleaseAutoFormat(size_t const i)
 {
     return m_pImpl->m_AutoFormats.release(m_pImpl->m_AutoFormats.begin() + i).release();
 }
 
-SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
+SwTableAutoFormatTable::~SwTableAutoFormatTable()
 {
 }
 
-SwTableAutoFmtTbl::SwTableAutoFmtTbl()
+SwTableAutoFormatTable::SwTableAutoFormatTable()
     : m_pImpl(new Impl)
 {
     OUString sNm;
-    SwTableAutoFmt* pNew = new SwTableAutoFmt(
+    SwTableAutoFormat* pNew = new SwTableAutoFormat(
                             SwStyleNameMapper::GetUIName( RES_POOLCOLL_STANDARD, sNm ) );
 
-    SwBoxAutoFmt aNew;
+    SwBoxAutoFormat aNew;
 
     sal_uInt8 i;
 
@@ -1057,13 +1057,13 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     aNew.SetColor( SvxColorItem(Color( COL_WHITE ), RES_CHRATR_COLOR) );
 
     for( i = 0; i < 4; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     // 70% gray
     aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) );
     aNew.SetBackground( aBrushItem );
     for( i = 4; i <= 12; i += 4 )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     // 20% gray
     aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) );
@@ -1071,16 +1071,16 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     aColor.SetColor( COL_BLACK );
     aNew.SetColor( SvxColorItem( aColor, RES_CHRATR_COLOR) );
     for( i = 7; i <= 15; i += 4 )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
     for( i = 13; i <= 14; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     aBrushItem.SetColor( Color( COL_WHITE ) );
     aNew.SetBackground( aBrushItem );
     for( i = 5; i <= 6; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
     for( i = 9; i <= 10; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     SvxBoxItem aBox( RES_BOX );
     aBox.SetDistance( 55 );
@@ -1092,13 +1092,13 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     {
         aBox.SetLine( i <= 3 ? &aLn : 0, SvxBoxItemLine::TOP );
         aBox.SetLine( (3 == ( i & 3 )) ? &aLn : 0, SvxBoxItemLine::RIGHT );
-        const_cast<SwBoxAutoFmt&>(pNew->GetBoxFmt( i )).SetBox( aBox );
+        const_cast<SwBoxAutoFormat&>(pNew->GetBoxFormat( i )).SetBox( aBox );
     }
 
     m_pImpl->m_AutoFormats.push_back(pNew);
 }
 
-bool SwTableAutoFmtTbl::Load()
+bool SwTableAutoFormatTable::Load()
 {
     bool bRet = false;
     OUString sNm(AUTOTABLE_FORMAT_NAME);
@@ -1113,7 +1113,7 @@ bool SwTableAutoFmtTbl::Load()
     return bRet;
 }
 
-bool SwTableAutoFmtTbl::Save() const
+bool SwTableAutoFormatTable::Save() const
 {
     SvtPathOptions aPathOpt;
     const OUString sNm( aPathOpt.GetUserConfigPath() + "/" AUTOTABLE_FORMAT_NAME );
@@ -1121,7 +1121,7 @@ bool SwTableAutoFmtTbl::Save() const
     return Save( *aStream.GetOutStream() ) && aStream.Commit();
 }
 
-bool SwTableAutoFmtTbl::Load( SvStream& rStream )
+bool SwTableAutoFormatTable::Load( SvStream& rStream )
 {
     bool bRet = 0 == rStream.GetError();
     if (bRet)
@@ -1160,7 +1160,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
             {
                 aVersions.Load( rStream, nVal );        // Item versions
 
-                SwTableAutoFmt* pNew;
+                SwTableAutoFormat* pNew;
                 sal_uInt16 nCount = 0;
                 rStream.ReadUInt16( nCount );
 
@@ -1177,7 +1177,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
                     }
                     for (sal_uInt16 i = 0; i < nCount; ++i)
                     {
-                        pNew = new SwTableAutoFmt( OUString() );
+                        pNew = new SwTableAutoFormat( OUString() );
                         bRet = pNew->Load( rStream, aVersions );
                         if( bRet )
                         {
@@ -1200,7 +1200,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
     return bRet;
 }
 
-bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
+bool SwTableAutoFormatTable::Save( SvStream& rStream ) const
 {
     bool bRet = 0 == rStream.GetError();
     if (bRet)
@@ -1218,7 +1218,7 @@ bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
             return false;
 
         // Write this version number for all attributes
-        m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo(
+        m_pImpl->m_AutoFormats[0].GetBoxFormat(0).SaveVersionNo(
                 rStream, AUTOFORMAT_FILE_VERSION);
 
         rStream.WriteUInt16( m_pImpl->m_AutoFormats.size() - 1 );
@@ -1226,8 +1226,8 @@ bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
 
         for (sal_uInt16 i = 1; bRet && i < m_pImpl->m_AutoFormats.size(); ++i)
         {
-            SwTableAutoFmt const& rFmt = m_pImpl->m_AutoFormats[i];
-            bRet = rFmt.Save(rStream, AUTOFORMAT_FILE_VERSION);
+            SwTableAutoFormat const& rFormat = m_pImpl->m_AutoFormats[i];
+            bRet = rFormat.Save(rStream, AUTOFORMAT_FILE_VERSION);
         }
     }
     rStream.Flush();
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index f2adfb50213c..91f5f1633b75 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -47,9 +47,9 @@
 #include <list>
 #include <boost/scoped_ptr.hpp>
 
-static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
-                    SwTable& rDstTbl, SwTableBox* pDstBox,
-                    bool bDelCntnt, SwUndoTblCpyTbl* pUndo );
+static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
+                    SwTable& rDstTable, SwTableBox* pDstBox,
+                    bool bDelContent, SwUndoTableCpyTable* pUndo );
 
 // The following type will be used by table copy functions to describe
 // the structure of tables (or parts of tables).
@@ -99,8 +99,8 @@ namespace
             { return maLines.size(); }
         void moreLines( const SwTable& rTable );
         void assignBoxes( const TableStructure &rSource );
-        void copyBoxes( const SwTable& rSource, SwTable& rDstTbl,
-                        SwUndoTblCpyTbl* pUndo ) const;
+        void copyBoxes( const SwTable& rSource, SwTable& rDstTable,
+                        SwUndoTableCpyTable* pUndo ) const;
     };
 
     SubTable::iterator insertSubLine( SubTable& rSubTable, SwTableLine& rLine,
@@ -325,7 +325,7 @@ namespace
         }
         else
             aInfo.mbSelected = false;
-        rnBorder += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        rnBorder += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         const sal_uInt16 nLeftCol = rnCol;
         while( rpCol != maCols.end() && *rpCol < rnBorder )
         {
@@ -476,8 +476,8 @@ namespace
         }
     }
 
-    void TableStructure::copyBoxes( const SwTable& rSource, SwTable& rDstTbl,
-                                    SwUndoTblCpyTbl* pUndo ) const
+    void TableStructure::copyBoxes( const SwTable& rSource, SwTable& rDstTable,
+                                    SwUndoTableCpyTable* pUndo ) const
     {
         LineStructure::size_type nLineCount = maLines.size();
         for( LineStructure::size_type nLine = 0; nLine < nLineCount; ++nLine )
@@ -492,7 +492,7 @@ namespace
                 {
                     SwTableBox *pBox = rInfo.mpBox;
                     if( pBox && pBox->getRowSpan() > 0 )
-                        lcl_CpyBox( rSource, rInfo.mpCopy, rDstTbl, pBox,
+                        lcl_CpyBox( rSource, rInfo.mpCopy, rDstTable, pBox,
                                     true, pUndo );
                 }
             }
@@ -505,15 +505,15 @@ namespace
     is deleted by doing this.
     If no Box is left the remaining content goes to the Box of a "BaseLine".
     If there's no Line anymore, put it also into the last Box of a "BaseLine". */
-static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
-                    SwTable& rDstTbl, SwTableBox* pDstBox,
-                    bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
+static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
+                    SwTable& rDstTable, SwTableBox* pDstBox,
+                    bool bDelContent, SwUndoTableCpyTable* pUndo )
 {
     OSL_ENSURE( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
             "No content in this Box" );
 
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
-    SwDoc* pDoc = rDstTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
+    SwDoc* pDoc = rDstTable.GetFrameFormat()->GetDoc();
 
     // First copy the new content and then delete the old one.
     // Do not create empty Sections, otherwise they will be deleted!
@@ -521,12 +521,12 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         new SwNodeRange ( *pCpyBox->GetSttNd(), 1,
         *pCpyBox->GetSttNd()->EndOfSectionNode() ) : 0 );
 
-    SwNodeIndex aInsIdx( *pDstBox->GetSttNd(), bDelCntnt ? 1 :
+    SwNodeIndex aInsIdx( *pDstBox->GetSttNd(), bDelContent ? 1 :
                         pDstBox->GetSttNd()->EndOfSectionIndex() -
                         pDstBox->GetSttIdx() );
 
     if( pUndo )
-        pUndo->AddBoxBefore( *pDstBox, bDelCntnt );
+        pUndo->AddBoxBefore( *pDstBox, bDelContent );
 
     bool bUndoRedline = pUndo && pDoc->getIDocumentRedlineAccess().IsRedlineOn();
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
@@ -535,7 +535,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
     if( pRg.get() )
         pCpyDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( *pRg, 0, aInsIdx, NULL, false );
     else
-        pDoc->GetNodes().MakeTxtNode( aInsIdx, pDoc->GetDfltTxtFmtColl() );
+        pDoc->GetNodes().MakeTextNode( aInsIdx, pDoc->GetDfltTextFormatColl() );
     ++aSavePos;
 
     SwTableLine* pLine = pDstBox->GetUpper();
@@ -543,7 +543,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         pLine = pLine->GetUpper()->GetUpper();
 
     bool bReplaceColl = true;
-    if( bDelCntnt && !bUndoRedline )
+    if( bDelContent && !bUndoRedline )
     {
         // Delete the Fly first, then the corresponding Nodes
         SwNodeIndex aEndNdIdx( *aInsIdx.GetNode().EndOfSectionNode() );
@@ -551,31 +551,31 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         // Move Bookmarks
         {
             SwPosition aMvPos( aInsIdx );
-            SwCntntNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
+            SwContentNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
             SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
-        for( const auto pFly : *pDoc->GetSpzFrmFmts() )
+        for( const auto pFly : *pDoc->GetSpzFrameFormats() )
         {
-            SwFmtAnchor const*const pAnchor = &pFly->GetAnchor();
-            SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+            SwFormatAnchor const*const pAnchor = &pFly->GetAnchor();
+            SwPosition const*const pAPos = pAnchor->GetContentAnchor();
             if (pAPos &&
                 ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                  (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                 aInsIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
             {
-                pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
             }
         }
 
         // If DestBox is a Headline Box and has Table style set, then
         // DO NOT automatically set the TableHeadline style!
-        if( 1 < rDstTbl.GetTabLines().size() &&
-            pLine == rDstTbl.GetTabLines().front() )
+        if( 1 < rDstTable.GetTabLines().size() &&
+            pLine == rDstTable.GetTabLines().front() )
         {
-            SwCntntNode* pCNd = aInsIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aInsIdx.GetNode().GetContentNode();
             if( !pCNd )
             {
                 SwNodeIndex aTmp( aInsIdx );
@@ -584,7 +584,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
 
             if( pCNd &&
                 RES_POOLCOLL_TABLE_HDLN !=
-                    pCNd->GetFmtColl()->GetPoolFmtId() )
+                    pCNd->GetFormatColl()->GetPoolFormatId() )
                 bReplaceColl = false;
         }
 
@@ -593,21 +593,21 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
 
     //b6341295: Table copy redlining will be managed by AddBoxAfter()
     if( pUndo )
-        pUndo->AddBoxAfter( *pDstBox, aInsIdx, bDelCntnt );
+        pUndo->AddBoxAfter( *pDstBox, aInsIdx, bDelContent );
 
     // heading
-    SwTxtNode *const pTxtNd = aSavePos.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode *const pTextNd = aSavePos.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        const sal_uInt16 nPoolId = pTxtNd->GetTxtColl()->GetPoolFmtId();
+        const sal_uInt16 nPoolId = pTextNd->GetTextColl()->GetPoolFormatId();
         if( bReplaceColl &&
-            (( 1 < rDstTbl.GetTabLines().size() &&
-                pLine == rDstTbl.GetTabLines().front() )
+            (( 1 < rDstTable.GetTabLines().size() &&
+                pLine == rDstTable.GetTabLines().front() )
                 // Is the Table's content sill valid?
                 ? RES_POOLCOLL_TABLE == nPoolId
                 : RES_POOLCOLL_TABLE_HDLN == nPoolId ) )
         {
-            SwTxtFmtColl* pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(
+            SwTextFormatColl* pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
                 static_cast<sal_uInt16>(
                                     RES_POOLCOLL_TABLE == nPoolId
                                         ? RES_POOLCOLL_TABLE_HDLN
@@ -617,16 +617,16 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
                 SwPaM aPam( aSavePos );
                 aPam.SetMark();
                 aPam.Move( fnMoveForward, fnGoSection );
-                pDoc->SetTxtFmtColl( aPam, pColl );
+                pDoc->SetTextFormatColl( aPam, pColl );
             }
         }
 
         // Delete the current Formula/Format/Value values
-        if( SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT ) ||
-            SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA ) ||
-            SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE ) )
+        if( SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT ) ||
+            SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_FORMULA ) ||
+            SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_VALUE ) )
         {
-            pDstBox->ClaimFrmFmt()->ResetFmtAttr( RES_BOXATR_FORMAT,
+            pDstBox->ClaimFrameFormat()->ResetFormatAttr( RES_BOXATR_FORMAT,
                                                  RES_BOXATR_VALUE );
         }
 
@@ -635,35 +635,35 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         {
             SfxItemSet aBoxAttrSet( pCpyDoc->GetAttrPool(), RES_BOXATR_FORMAT,
                                                             RES_BOXATR_VALUE );
-            aBoxAttrSet.Put( pCpyBox->GetFrmFmt()->GetAttrSet() );
+            aBoxAttrSet.Put( pCpyBox->GetFrameFormat()->GetAttrSet() );
             if( aBoxAttrSet.Count() )
             {
                 const SfxPoolItem* pItem;
                 SvNumberFormatter* pN = pDoc->GetNumberFormatter( false );
-                if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == aBoxAttrSet.
+                if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == aBoxAttrSet.
                     GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                 {
-                    sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                    sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                    sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                    sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                     if( nNewIdx != nOldIdx )
-                        aBoxAttrSet.Put( SwTblBoxNumFormat( nNewIdx ));
+                        aBoxAttrSet.Put( SwTableBoxNumFormat( nNewIdx ));
                 }
-                pDstBox->ClaimFrmFmt()->SetFmtAttr( aBoxAttrSet );
+                pDstBox->ClaimFrameFormat()->SetFormatAttr( aBoxAttrSet );
             }
         }
     }
 }
 
-bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
+                        SwUndoTableCpyTable* pUndo )
 {
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
     // Analyze source structure
-    TableStructure aCopyStruct( rCpyTbl );
+    TableStructure aCopyStruct( rCpyTable );
 
     // Analyze target structure (from start box) and selected substructure
     _FndBox aFndBox( 0, 0 );
@@ -692,9 +692,9 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     {
         // Change table formulas into relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // delete frames
@@ -704,7 +704,7 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     aFndBox.DelFrms( *this );
 
     // copy boxes
-    aTarget.copyBoxes( rCpyTbl, *this, pUndo );
+    aTarget.copyBoxes( rCpyTable, *this, pUndo );
 
     // adjust row span attributes accordingly
 
@@ -719,40 +719,40 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     deleted by doing this.
     If no Box is left the remaining content goes to the Box of a "BaseLine".
     If there's no Line anymore, put it also into the last Box of a "BaseLine". */
-bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsTable( const SwTable& rCpyTable, const SwNodeIndex& rSttBox,
+                        SwUndoTableCpyTable* pUndo )
 {
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
-    SwTableNode* pTblNd = pDoc->IsIdxInTbl( rSttBox );
+    SwTableNode* pTableNd = pDoc->IsIdxInTable( rSttBox );
 
     // Find the Box, to which should be copied:
-    SwTableBox* pMyBox = GetTblBox(
+    SwTableBox* pMyBox = GetTableBox(
             rSttBox.GetNode().FindTableBoxStartNode()->GetIndex() );
 
     OSL_ENSURE( pMyBox, "Index is not in a Box in this Table" );
 
     // First delete the Table's Frames
     _FndBox aFndBox( 0, 0 );
-    aFndBox.DelFrms( pTblNd->GetTable() );
+    aFndBox.DelFrms( pTableNd->GetTable() );
 
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
-    bool bDelCntnt = true;
+    bool bDelContent = true;
     const SwTableBox* pTmp;
 
-    for( auto pLine : rCpyTbl.GetTabLines() )
+    for( auto pLine : rCpyTable.GetTabLines() )
     {
         // Get the first from the CopyLine
         const SwTableBox* pCpyBox = pLine->GetTabBoxes().front();
@@ -762,14 +762,14 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
         do {
             // First copy the new content and then delete the old one.
             // Do not create empty Sections, otherwise they will be deleted!
-            lcl_CpyBox( rCpyTbl, pCpyBox, *this, pMyBox, bDelCntnt, pUndo );
+            lcl_CpyBox( rCpyTable, pCpyBox, *this, pMyBox, bDelContent, pUndo );
 
-            if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTbl, pCpyBox, false )))
+            if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTable, pCpyBox, false )))
                 break;      // no more Boxes
             pCpyBox = pTmp;
 
             if( 0 == ( pTmp = pMyBox->FindNextBox( *this, pMyBox, false )))
-                bDelCntnt = false;  // No space left?
+                bDelContent = false;  // No space left?
             else
                 pMyBox = const_cast<SwTableBox*>(pTmp);
 
@@ -782,7 +782,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
         const SwTableLines::size_type nPos = GetTabLines().GetPos( pNxtLine ) + 1;
         // Is there a next?
         if( nPos >= GetTabLines().size() )
-            bDelCntnt = false;      // there is none, all goes into the last Box
+            bDelContent = false;      // there is none, all goes into the last Box
         else
         {
             // Find the next Box with content
@@ -790,30 +790,30 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
             pMyBox = pNxtLine->GetTabBoxes().front();
             while( !pMyBox->GetTabLines().empty() )
                 pMyBox = pMyBox->GetTabLines().front()->GetTabBoxes().front();
-            bDelCntnt = true;
+            bDelContent = true;
         }
     }
 
-    aFndBox.MakeFrms( pTblNd->GetTable() );     // Create the Frames anew
+    aFndBox.MakeFrms( pTableNd->GetTable() );     // Create the Frames anew
     return true;
 }
 
-bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
+                        SwUndoTableCpyTable* pUndo )
 {
     OSL_ENSURE( !rSelBoxes.empty(), "Missing selection" );
 
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    if( IsNewModel() || rCpyTbl.IsNewModel() )
-        return InsNewTable( rCpyTbl, rSelBoxes, pUndo );
+    if( IsNewModel() || rCpyTable.IsNewModel() )
+        return InsNewTable( rCpyTable, rSelBoxes, pUndo );
 
-    OSL_ENSURE( !rCpyTbl.IsTblComplex(), "Table too complex" );
+    OSL_ENSURE( !rCpyTable.IsTableComplex(), "Table too complex" );
 
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
     SwTableBox *pSttBox = (SwTableBox*)rSelBoxes[0];
 
@@ -827,7 +827,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     // Special case: If a Box is located in a Table, copy it to all selected
     // Boxes!
-    if( 1 != rCpyTbl.GetTabSortBoxes().size() )
+    if( 1 != rCpyTable.GetTabSortBoxes().size() )
     {
         _FndBox* pFndBox;
 
@@ -844,7 +844,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         {
             // Is there still enough space in the Table?
             if( (GetTabLines().size() - nSttLine ) <
-                rCpyTbl.GetTabLines().size() )
+                rCpyTable.GetTabLines().size() )
             {
                 // If we don't have enough Lines, then see if we can insert
                 // new ones to reach our goal. But only if the SSelection
@@ -852,7 +852,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 if( 1 < rSelBoxes.size() )
                     return false;
 
-                const sal_uInt16 nNewLns = rCpyTbl.GetTabLines().size() -
+                const sal_uInt16 nNewLns = rCpyTable.GetTabLines().size() -
                                 (GetTabLines().size() - nSttLine );
 
                 // See if the Box count is high enough for the Lines
@@ -860,10 +860,10 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
                 pSttBox = pFLine->GetBoxes()[0].GetBox();
                 const SwTableBoxes::size_type nSttBox = pFLine->GetLine()->GetTabBoxes().GetPos( pSttBox );
-                for( SwTableLines::size_type n = rCpyTbl.GetTabLines().size() - nNewLns;
-                        n < rCpyTbl.GetTabLines().size(); ++n )
+                for( SwTableLines::size_type n = rCpyTable.GetTabLines().size() - nNewLns;
+                        n < rCpyTable.GetTabLines().size(); ++n )
                 {
-                    SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ n ];
+                    SwTableLine* pCpyLn = rCpyTable.GetTabLines()[ n ];
 
                     if( pLastLn->GetTabBoxes().size() < nSttBox ||
                         ( pLastLn->GetTabBoxes().size() - nSttBox ) <
@@ -879,7 +879,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 // rows accordingly.
                 SwTableBox* pInsBox = pLastLn->GetTabBoxes()[ nSttBox ];
                 OSL_ENSURE( pInsBox && pInsBox->GetSttNd(),
-                    "no CntntBox or it's not in this Table" );
+                    "no ContentBox or it's not in this Table" );
                 SwSelBoxes aBoxes;
 
                 if( pUndo
@@ -890,9 +890,9 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                     return false;
             }
 
-            nTstLns = rCpyTbl.GetTabLines().size();        // copy this many
+            nTstLns = rCpyTable.GetTabLines().size();        // copy this many
         }
-        else if( 0 == (nFndCnt % rCpyTbl.GetTabLines().size()) )
+        else if( 0 == (nFndCnt % rCpyTable.GetTabLines().size()) )
             nTstLns = nFndCnt;
         else
             return false;       // not enough space for the rows
@@ -911,8 +911,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                                         &aFndBox );
                 pLine = pInsFLine->GetLine();
             }
-            SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ nLn %
-                                        rCpyTbl.GetTabLines().size() ];
+            SwTableLine* pCpyLn = rCpyTable.GetTabLines()[ nLn %
+                                        rCpyTable.GetTabLines().size() ];
 
             // Selected too few rows?
             if( pInsFLine )
@@ -982,9 +982,9 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // Delete the Frames
@@ -992,12 +992,12 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     //Not dispose accessible table
     aFndBox.DelFrms( *this,false );
 
-    if( 1 == rCpyTbl.GetTabSortBoxes().size() )
+    if( 1 == rCpyTable.GetTabSortBoxes().size() )
     {
-        SwTableBox *pTmpBx = rCpyTbl.GetTabSortBoxes()[0];
+        SwTableBox *pTmpBx = rCpyTable.GetTabSortBoxes()[0];
         for (size_t n = 0; n < rSelBoxes.size(); ++n)
         {
-            lcl_CpyBox( rCpyTbl, pTmpBx, *this,
+            lcl_CpyBox( rCpyTable, pTmpBx, *this,
                         (SwTableBox*)rSelBoxes[n], true, pUndo );
         }
     }
@@ -1005,12 +1005,12 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         for( _FndLines::size_type nLn = 0; nLn < aFndBox.GetLines().size(); ++nLn )
         {
             pFLine = &aFndBox.GetLines()[ nLn ];
-            SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[
-                                nLn % rCpyTbl.GetTabLines().size() ];
+            SwTableLine* pCpyLn = rCpyTable.GetTabLines()[
+                                nLn % rCpyTable.GetTabLines().size() ];
             for( _FndBoxes::size_type nBx = 0; nBx < pFLine->GetBoxes().size(); ++nBx )
             {
                 // Copy the pCpyBox into pMyBox
-                lcl_CpyBox( rCpyTbl, pCpyLn->GetTabBoxes()[
+                lcl_CpyBox( rCpyTable, pCpyLn->GetTabBoxes()[
                             nBx % pCpyLn->GetTabBoxes().size() ],
                     *this, pFLine->GetBoxes()[nBx].GetBox(), true, pUndo );
             }
@@ -1020,23 +1020,23 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     return true;
 }
 
-static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara );
+static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara );
 
-static void _FndCntntBox( const SwTableBox* pBox, SwSelBoxes* pPara )
+static void _FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara )
 {
     if( !pBox->GetTabLines().empty() )
     {
         for( const SwTableLine* pLine : pBox->GetTabLines() )
-            _FndCntntLine( pLine, pPara );
+            _FndContentLine( pLine, pPara );
     }
     else
         pPara->insert( const_cast<SwTableBox*>(pBox) );
 }
 
-static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara )
+static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara )
 {
     for( const SwTableBox* pBox : pLine->GetTabBoxes() )
-        _FndCntntBox(pBox, pPara );
+        _FndContentBox(pBox, pPara );
 }
 
 // Find all Boxes with content in this Box
@@ -1052,7 +1052,7 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
     rBoxes.clear();
     for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin();
              it != pLine->GetTabBoxes().end(); ++it)
-        _FndCntntBox(*it, &rBoxes );
+        _FndContentBox(*it, &rBoxes );
     return rBoxes;
 }
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index eee05b9d04a9..08db77b6c113 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -82,13 +82,13 @@ typedef std::map<SwTableLine*, sal_uInt16> SwTableLineWidthMap_t;
 struct _CpyTabFrm
 {
     union {
-        SwTableBoxFmt *pFrmFmt;     // for CopyCol
+        SwTableBoxFormat *pFrameFormat;     // for CopyCol
         SwTwips nSize;              // for DelCol
     } Value;
-    SwTableBoxFmt *pNewFrmFmt;
+    SwTableBoxFormat *pNewFrameFormat;
 
-    _CpyTabFrm( SwTableBoxFmt* pAktFrmFmt ) : pNewFrmFmt( 0 )
-    {   Value.pFrmFmt = pAktFrmFmt; }
+    _CpyTabFrm( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( 0 )
+    {   Value.pFrameFormat = pAktFrameFormat; }
 
     _CpyTabFrm& operator=( const _CpyTabFrm& );
 
@@ -102,43 +102,43 @@ struct CR_SetBoxWidth
 {
     SwSelBoxes m_Boxes;
     SwTableLineWidthMap_t m_LineWidthMap;
-    SwShareBoxFmts aShareFmts;
-    SwTableNode* pTblNd;
-    SwUndoTblNdsChg* pUndo;
+    SwShareBoxFormats aShareFormats;
+    SwTableNode* pTableNd;
+    SwUndoTableNdsChg* pUndo;
     SwTwips nDiff, nSide, nMaxSize, nLowerDiff;
-    TblChgMode nMode;
-    sal_uInt16 nTblWidth, nRemainWidth, nBoxWidth;
+    TableChgMode nMode;
+    sal_uInt16 nTableWidth, nRemainWidth, nBoxWidth;
     bool bBigger, bLeft, bSplittBox, bAnyBoxFnd;
 
-    CR_SetBoxWidth( sal_uInt16 eType, SwTwips nDif, SwTwips nSid, SwTwips nTblW,
+    CR_SetBoxWidth( sal_uInt16 eType, SwTwips nDif, SwTwips nSid, SwTwips nTableW,
                     SwTwips nMax, SwTableNode* pTNd )
-        : pTblNd( pTNd ), pUndo( 0 ),
+        : pTableNd( pTNd ), pUndo( 0 ),
         nDiff( nDif ), nSide( nSid ), nMaxSize( nMax ), nLowerDiff( 0 ),
-        nTblWidth( (sal_uInt16)nTblW ), nRemainWidth( 0 ), nBoxWidth( 0 ),
+        nTableWidth( (sal_uInt16)nTableW ), nRemainWidth( 0 ), nBoxWidth( 0 ),
         bSplittBox( false ), bAnyBoxFnd( false )
     {
-        bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff );
-        bBigger = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_BIGGER );
-        nMode = pTblNd->GetTable().GetTblChgMode();
+        bLeft = nsTableChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff );
+        bBigger = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_BIGGER );
+        nMode = pTableNd->GetTable().GetTableChgMode();
     }
     CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
         : m_LineWidthMap(rCpy.m_LineWidthMap)
         ,
-        pTblNd( rCpy.pTblNd ),
+        pTableNd( rCpy.pTableNd ),
         pUndo( rCpy.pUndo ),
         nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
         nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
-        nMode( rCpy.nMode ), nTblWidth( rCpy.nTblWidth ),
+        nMode( rCpy.nMode ), nTableWidth( rCpy.nTableWidth ),
         nRemainWidth( rCpy.nRemainWidth ), nBoxWidth( rCpy.nBoxWidth ),
         bBigger( rCpy.bBigger ), bLeft( rCpy.bLeft ),
         bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
     {
     }
 
-    SwUndoTblNdsChg* CreateUndo( SwUndoId eUndoType )
+    SwUndoTableNdsChg* CreateUndo( SwUndoId eUndoType )
     {
-        return pUndo = new SwUndoTblNdsChg( eUndoType, m_Boxes, *pTblNd );
+        return pUndo = new SwUndoTableNdsChg( eUndoType, m_Boxes, *pTableNd );
     }
 
     void LoopClear()
@@ -166,7 +166,7 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
 
 #define CHECKBOXWIDTH                                           \
     {                                                           \
-        SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth();   \
+        SwTwips nSize = GetFrameFormat()->GetFrmSize().GetWidth();   \
         for (size_t nTmp = 0; nTmp < aLines.size(); ++nTmp)   \
             ::_CheckBoxWidth( *aLines[ nTmp ], nSize );         \
     }
@@ -175,8 +175,8 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
     {                                                               \
         for ( sal_uInt16 i = 0; i < GetTabLines().size(); ++i )        \
         {                                                           \
-            SwFrmFmt* pFmt = GetTabLines()[i]->GetFrmFmt();  \
-            SwIterator<SwRowFrm,SwFmt> aIter( *pFmt );              \
+            SwFrameFormat* pFormat = GetTabLines()[i]->GetFrameFormat();  \
+            SwIterator<SwRowFrm,SwFormat> aIter( *pFormat );              \
             for (SwRowFrm* pFrm=aIter.First(); pFrm; pFrm=aIter.Next())\
             {                                                       \
                 if ( pFrm->GetTabLine() == GetTabLines()[i] )       \
@@ -198,36 +198,36 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
 struct CR_SetLineHeight
 {
     SwSelBoxes m_Boxes;
-    SwShareBoxFmts aShareFmts;
-    SwTableNode* pTblNd;
-    SwUndoTblNdsChg* pUndo;
+    SwShareBoxFormats aShareFormats;
+    SwTableNode* pTableNd;
+    SwUndoTableNdsChg* pUndo;
     SwTwips nMaxSpace, nMaxHeight;
-    TblChgMode nMode;
+    TableChgMode nMode;
     sal_uInt16 nLines;
     bool bBigger, bTop, bSplittBox, bAnyBoxFnd;
 
     CR_SetLineHeight( sal_uInt16 eType, SwTableNode* pTNd )
-        : pTblNd( pTNd ), pUndo( 0 ),
+        : pTableNd( pTNd ), pUndo( 0 ),
         nMaxSpace( 0 ), nMaxHeight( 0 ), nLines( 0 ),
         bSplittBox( false ), bAnyBoxFnd( false )
     {
-        bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || nsTblChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff );
-        bBigger = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_BIGGER );
-        if( eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL )
+        bTop = nsTableChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || nsTableChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff );
+        bBigger = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_BIGGER );
+        if( eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL )
             bBigger = !bBigger;
-        nMode = pTblNd->GetTable().GetTblChgMode();
+        nMode = pTableNd->GetTable().GetTableChgMode();
     }
     CR_SetLineHeight( const CR_SetLineHeight& rCpy )
-        : pTblNd( rCpy.pTblNd ), pUndo( rCpy.pUndo ),
+        : pTableNd( rCpy.pTableNd ), pUndo( rCpy.pUndo ),
         nMaxSpace( rCpy.nMaxSpace ), nMaxHeight( rCpy.nMaxHeight ),
         nMode( rCpy.nMode ), nLines( rCpy.nLines ),
         bBigger( rCpy.bBigger ), bTop( rCpy.bTop ),
         bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
     {}
 
-    SwUndoTblNdsChg* CreateUndo( SwUndoId nUndoType )
+    SwUndoTableNdsChg* CreateUndo( SwUndoId nUndoType )
     {
-        return pUndo = new SwUndoTblNdsChg( nUndoType, m_Boxes, *pTblNd );
+        return pUndo = new SwUndoTableNdsChg( nUndoType, m_Boxes, *pTableNd );
     }
 };
 
@@ -242,7 +242,7 @@ typedef bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, b
 
 _CpyTabFrm& _CpyTabFrm::operator=( const _CpyTabFrm& rCpyTabFrm )
 {
-    pNewFrmFmt = rCpyTabFrm.pNewFrmFmt;
+    pNewFrameFormat = rCpyTabFrm.pNewFrameFormat;
     Value = rCpyTabFrm.Value;
     return *this;
 }
@@ -253,7 +253,7 @@ struct _CpyPara
 {
     boost::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths;
     SwDoc* pDoc;
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     _CpyTabFrms& rTabFrmArr;
     SwTableLine* pInsLine;
     SwTableBox* pInsBox;
@@ -262,32 +262,32 @@ struct _CpyPara
     sal_uInt16 nCpyCnt, nInsPos;
     sal_uInt16 nLnIdx, nBoxIdx;
     sal_uInt8 nDelBorderFlag;
-    bool bCpyCntnt;
+    bool bCpyContent;
 
     _CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, _CpyTabFrms& rFrmArr,
               bool bCopyContent = true )
-        : pDoc( pNd->GetDoc() ), pTblNd( pNd ), rTabFrmArr(rFrmArr),
+        : pDoc( pNd->GetDoc() ), pTableNd( pNd ), rTabFrmArr(rFrmArr),
         pInsLine(0), pInsBox(0), nOldSize(0), nNewSize(0),
         nMinLeft(ULONG_MAX), nMaxRight(0),
         nCpyCnt(nCopies), nInsPos(0),
         nLnIdx(0), nBoxIdx(0),
-        nDelBorderFlag(0), bCpyCntnt( bCopyContent )
+        nDelBorderFlag(0), bCpyContent( bCopyContent )
         {}
     _CpyPara( const _CpyPara& rPara, SwTableLine* pLine )
-        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTblNd(rPara.pTblNd),
+        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrmArr(rPara.rTabFrmArr), pInsLine(pLine), pInsBox(rPara.pInsBox),
         nOldSize(0), nNewSize(rPara.nNewSize), nMinLeft( rPara.nMinLeft ),
         nMaxRight( rPara.nMaxRight ), nCpyCnt(rPara.nCpyCnt), nInsPos(0),
         nLnIdx( rPara.nLnIdx), nBoxIdx( rPara.nBoxIdx ),
-        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyCntnt( rPara.bCpyCntnt )
+        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent )
         {}
     _CpyPara( const _CpyPara& rPara, SwTableBox* pBox )
-        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTblNd(rPara.pTblNd),
+        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrmArr(rPara.rTabFrmArr), pInsLine(rPara.pInsLine), pInsBox(pBox),
         nOldSize(rPara.nOldSize), nNewSize(rPara.nNewSize),
         nMinLeft( rPara.nMinLeft ), nMaxRight( rPara.nMaxRight ),
         nCpyCnt(rPara.nCpyCnt), nInsPos(0), nLnIdx(rPara.nLnIdx), nBoxIdx(rPara.nBoxIdx),
-        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyCntnt( rPara.bCpyCntnt )
+        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent )
         {}
 };
 
@@ -297,7 +297,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
 {
     // Look up the Frame Format in the Frame Format Array
     SwTableBox* pBox = rFndBox.GetBox();
-    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt()) );
+    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) );
 
     sal_uInt16 nFndPos;
     if( pCpyPara->nCpyCnt )
@@ -307,11 +307,11 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
         if( itFind == pCpyPara->rTabFrmArr.end() || !(*itFind == aFindFrm) )
         {
             // For nested copying, also save the new Format as an old one.
-            SwTableBoxFmt* pNewFmt = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt());
+            SwTableBoxFormat* pNewFormat = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat());
 
             // Find the selected Boxes in the Line:
             _FndLine const* pCmpLine = NULL;
-            SwFmtFrmSize aFrmSz( pNewFmt->GetFrmSize() );
+            SwFormatFrmSize aFrmSz( pNewFormat->GetFrmSize() );
 
             bool bDiffCount = false;
             if( pBox->GetTabLines().size() )
@@ -329,34 +329,34 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
                 for( auto n = rFndBoxes.size(); n; )
                 {
                     nSz += rFndBoxes[--n].GetBox()->
-                            GetFrmFmt()->GetFrmSize().GetWidth();
+                            GetFrameFormat()->GetFrmSize().GetWidth();
                 }
                 aFrmSz.SetWidth( aFrmSz.GetWidth() -
                                             nSz / ( pCpyPara->nCpyCnt + 1 ) );
-                pNewFmt->SetFmtAttr( aFrmSz );
+                pNewFormat->SetFormatAttr( aFrmSz );
                 aFrmSz.SetWidth( nSz / ( pCpyPara->nCpyCnt + 1 ) );
 
                 // Create a new Format for the new Box, specifying its size.
-                aFindFrm.pNewFrmFmt = reinterpret_cast<SwTableBoxFmt*>(pNewFmt->GetDoc()->
-                                            MakeTableLineFmt());
-                *aFindFrm.pNewFrmFmt = *pNewFmt;
-                aFindFrm.pNewFrmFmt->SetFmtAttr( aFrmSz );
+                aFindFrm.pNewFrameFormat = reinterpret_cast<SwTableBoxFormat*>(pNewFormat->GetDoc()->
+                                            MakeTableLineFormat());
+                *aFindFrm.pNewFrameFormat = *pNewFormat;
+                aFindFrm.pNewFrameFormat->SetFormatAttr( aFrmSz );
             }
             else
             {
                 aFrmSz.SetWidth( aFrmSz.GetWidth() / ( pCpyPara->nCpyCnt + 1 ) );
-                pNewFmt->SetFmtAttr( aFrmSz );
+                pNewFormat->SetFormatAttr( aFrmSz );
 
-                aFindFrm.pNewFrmFmt = pNewFmt;
+                aFindFrm.pNewFrameFormat = pNewFormat;
                 pCpyPara->rTabFrmArr.insert( aFindFrm );
-                aFindFrm.Value.pFrmFmt = pNewFmt;
+                aFindFrm.Value.pFrameFormat = pNewFormat;
                 pCpyPara->rTabFrmArr.insert( aFindFrm );
             }
         }
         else
         {
             aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ];
-            pBox->ChgFrmFmt( aFindFrm.pNewFrmFmt );
+            pBox->ChgFrameFormat( aFindFrm.pNewFrameFormat );
         }
     }
     else
@@ -366,12 +366,12 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
             itFind != pCpyPara->rTabFrmArr.end() )
             aFindFrm = *itFind;
         else
-            aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+            aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
     }
 
     if (!rFndBox.GetLines().empty())
     {
-        pBox = new SwTableBox( aFindFrm.pNewFrmFmt,
+        pBox = new SwTableBox( aFindFrm.pNewFrameFormat,
                     rFndBox.GetLines().size(), pCpyPara->pInsLine );
         pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
         _CpyPara aPara( *pCpyPara, pBox );
@@ -382,20 +382,20 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
     }
     else
     {
-        ::_InsTblBox( pCpyPara->pDoc, pCpyPara->pTblNd, pCpyPara->pInsLine,
-                    aFindFrm.pNewFrmFmt, pBox, pCpyPara->nInsPos++ );
+        ::_InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine,
+                    aFindFrm.pNewFrameFormat, pBox, pCpyPara->nInsPos++ );
 
         const _FndBoxes& rFndBxs = rFndBox.GetUpper()->GetBoxes();
         if( 8 > pCpyPara->nDelBorderFlag
                 ? pCpyPara->nDelBorderFlag != 0
                 : &rFndBox == &rFndBxs[rFndBxs.size() - 1] )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
             if( 8 > pCpyPara->nDelBorderFlag
                     ? rBoxItem.GetTop()
                     : rBoxItem.GetRight() )
             {
-                aFindFrm.Value.pFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+                aFindFrm.Value.pFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
 
                 SvxBoxItem aNew( rBoxItem );
                 if( 8 > pCpyPara->nDelBorderFlag )
@@ -411,11 +411,11 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
                                             pCpyPara->nInsPos - 1 ];
                 }
 
-                aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+                aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
 
                 // Else we copy before that and the first Line keeps the TopLine
                 // and we remove it at the original
-                pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
 
                 if( !pCpyPara->nCpyCnt )
                     pCpyPara->rTabFrmArr.insert( aFindFrm );
@@ -427,7 +427,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
 static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
 {
     SwTableLine* pNewLine = new SwTableLine(
-                            static_cast<SwTableLineFmt*>(rFndLine.GetLine()->GetFrmFmt()),
+                            static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()),
                         rFndLine.GetBoxes().size(), pCpyPara->pInsBox );
     if( pCpyPara->pInsBox )
     {
@@ -436,7 +436,7 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
     }
     else
     {
-        SwTableLines& rLines = pCpyPara->pTblNd->GetTable().GetTabLines();
+        SwTableLines& rLines = pCpyPara->pTableNd->GetTable().GetTabLines();
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine );
     }
 
@@ -488,7 +488,7 @@ static void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt
 
 SwRowFrm* GetRowFrm( SwTableLine& rLine )
 {
-    SwIterator<SwRowFrm,SwFmt> aIter( *rLine.GetFrmFmt() );
+    SwIterator<SwRowFrm,SwFormat> aIter( *rLine.GetFrameFormat() );
     for( SwRowFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         if( pFrm->GetTabLine() == &rLine )
             return pFrm;
@@ -498,8 +498,8 @@ SwRowFrm* GetRowFrm( SwTableLine& rLine )
 bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty() && nCnt, "No valid Box List" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     bool bRes = true;
@@ -526,7 +526,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
         // get notified about new rows/cols.
 
         _CpyTabFrms aTabFrmArr;
-        _CpyPara aCpyPara( pTblNd, nCnt, aTabFrmArr );
+        _CpyPara aCpyPara( pTableNd, nCnt, aTabFrmArr );
 
         for( auto &rLine : aFndBox.GetLines() )
             lcl_InsCol( &rLine, aCpyPara, nCnt, bBehind );
@@ -545,7 +545,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     if (pPCD && nCnt)
         pPCD->AddRowCols( *this, rBoxes, nCnt, bBehind );
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     return bRes;
 }
@@ -554,8 +554,8 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                         sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid Box List" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
      // Find all Boxes/Lines
@@ -586,7 +586,7 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     // Find Lines for the layout update
     const bool bLayout = !IsNewModel() &&
-        nullptr != SwIterator<SwTabFrm,SwFmt>( *GetFrmFmt() ).First();
+        nullptr != SwIterator<SwTabFrm,SwFormat>( *GetFrameFormat() ).First();
 
     if ( bLayout )
     {
@@ -598,7 +598,7 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     _CpyTabFrms aTabFrmArr;
-    _CpyPara aCpyPara( pTblNd, 0, aTabFrmArr );
+    _CpyPara aCpyPara( pTableNd, 0, aTabFrmArr );
 
     SwTableLine* pLine = pFndBox->GetLines()[ bBehind ?
                     pFndBox->GetLines().size()-1 : 0 ].GetLine();
@@ -645,64 +645,64 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     if (pPCD && nCnt)
         pPCD->AddRowCols( *this, rBoxes, nCnt, bBehind );
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     return true;
 }
 
 static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
-                            bool bFirst, SwShareBoxFmts& rShareFmts );
+                            bool bFirst, SwShareBoxFormats& rShareFormats );
 
 static void lcl_LastBoxSetWidthLine( SwTableLines &rLines, const long nOffset,
-                                bool bFirst, SwShareBoxFmts& rShareFmts )
+                                bool bFirst, SwShareBoxFormats& rShareFormats )
 {
     for ( auto pLine : rLines )
-        ::lcl_LastBoxSetWidth( pLine->GetTabBoxes(), nOffset, bFirst, rShareFmts );
+        ::lcl_LastBoxSetWidth( pLine->GetTabBoxes(), nOffset, bFirst, rShareFormats );
 }
 
 static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
-                            bool bFirst, SwShareBoxFmts& rShareFmts )
+                            bool bFirst, SwShareBoxFormats& rShareFormats )
 {
     SwTableBox& rBox = *(bFirst ? rBoxes.front() : rBoxes.back());
     if( !rBox.GetSttNd() )
         ::lcl_LastBoxSetWidthLine( rBox.GetTabLines(), nOffset,
-                                    bFirst, rShareFmts );
+                                    bFirst, rShareFormats );
 
     // Adapt the Box
-    const SwFrmFmt *pBoxFmt = rBox.GetFrmFmt();
-    SwFmtFrmSize aNew( pBoxFmt->GetFrmSize() );
+    const SwFrameFormat *pBoxFormat = rBox.GetFrameFormat();
+    SwFormatFrmSize aNew( pBoxFormat->GetFrmSize() );
     aNew.SetWidth( aNew.GetWidth() + nOffset );
-    SwFrmFmt *pFmt = rShareFmts.GetFormat( *pBoxFmt, aNew );
-    if( pFmt )
-        rBox.ChgFrmFmt( static_cast<SwTableBoxFmt*>(pFmt) );
+    SwFrameFormat *pFormat = rShareFormats.GetFormat( *pBoxFormat, aNew );
+    if( pFormat )
+        rBox.ChgFrameFormat( static_cast<SwTableBoxFormat*>(pFormat) );
     else
     {
-        pFmt = rBox.ClaimFrmFmt();
+        pFormat = rBox.ClaimFrameFormat();
 
-        pFmt->LockModify();
-        pFmt->SetFmtAttr( aNew );
-        pFmt->UnlockModify();
+        pFormat->LockModify();
+        pFormat->SetFormatAttr( aNew );
+        pFormat->UnlockModify();
 
-        rShareFmts.AddFormat( *pBoxFmt, *pFmt );
+        rShareFormats.AddFormat( *pBoxFormat, *pFormat );
     }
 }
 
-void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
+void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo,
                 bool bCalcNewSize, const bool bCorrBorder,
-                SwShareBoxFmts* pShareFmts )
+                SwShareBoxFormats* pShareFormats )
 {
     do {
         SwTwips nBoxSz = bCalcNewSize ?
-                pBox->GetFrmFmt()->GetFrmSize().GetWidth() : 0;
+                pBox->GetFrameFormat()->GetFrmSize().GetWidth() : 0;
         SwTableLine* pLine = pBox->GetUpper();
-        SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
-        sal_uInt16 nDelPos = rTblBoxes.GetPos( pBox );
+        SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
+        sal_uInt16 nDelPos = rTableBoxes.GetPos( pBox );
         SwTableBox* pUpperBox = pBox->GetUpper()->GetUpper();
 
         // Special treatment for the border:
-        if( bCorrBorder && 1 < rTblBoxes.size() )
+        if( bCorrBorder && 1 < rTableBoxes.size() )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
 
             if( rBoxItem.GetLeft() || rBoxItem.GetRight() )
             {
@@ -710,46 +710,46 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
 
                 // JP 02.04.97: 1st part for Bug 36271
                 // First the left/right edges
-                if( nDelPos + 1 < (sal_uInt16)rTblBoxes.size() )
+                if( nDelPos + 1 < (sal_uInt16)rTableBoxes.size() )
                 {
-                    SwTableBox* pNxtBox = rTblBoxes[ nDelPos + 1 ];
-                    const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrmFmt()->GetBox();
+                    SwTableBox* pNxtBox = rTableBoxes[ nDelPos + 1 ];
+                    const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrameFormat()->GetBox();
 
-                    SwTableBox* pPrvBox = nDelPos ? rTblBoxes[ nDelPos - 1 ] : 0;
+                    SwTableBox* pPrvBox = nDelPos ? rTableBoxes[ nDelPos - 1 ] : 0;
 
                     if( pNxtBox->GetSttNd() && !rNxtBoxItem.GetLeft() &&
-                        ( !pPrvBox || !pPrvBox->GetFrmFmt()->GetBox().GetRight()) )
+                        ( !pPrvBox || !pPrvBox->GetFrameFormat()->GetBox().GetRight()) )
                     {
                         SvxBoxItem aTmp( rNxtBoxItem );
                         aTmp.SetLine( rBoxItem.GetLeft() ? rBoxItem.GetLeft()
                                                          : rBoxItem.GetRight(),
                                                             SvxBoxItemLine::LEFT );
-                        if( pShareFmts )
-                            pShareFmts->SetAttr( *pNxtBox, aTmp );
+                        if( pShareFormats )
+                            pShareFormats->SetAttr( *pNxtBox, aTmp );
                         else
-                            pNxtBox->ClaimFrmFmt()->SetFmtAttr( aTmp );
+                            pNxtBox->ClaimFrameFormat()->SetFormatAttr( aTmp );
                         bChgd = true;
                     }
                 }
                 if( !bChgd && nDelPos )
                 {
-                    SwTableBox* pPrvBox = rTblBoxes[ nDelPos - 1 ];
-                    const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrmFmt()->GetBox();
+                    SwTableBox* pPrvBox = rTableBoxes[ nDelPos - 1 ];
+                    const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrameFormat()->GetBox();
 
-                    SwTableBox* pNxtBox = nDelPos + 1 < (sal_uInt16)rTblBoxes.size()
-                                            ? rTblBoxes[ nDelPos + 1 ] : 0;
+                    SwTableBox* pNxtBox = nDelPos + 1 < (sal_uInt16)rTableBoxes.size()
+                                            ? rTableBoxes[ nDelPos + 1 ] : 0;
 
                     if( pPrvBox->GetSttNd() && !rPrvBoxItem.GetRight() &&
-                        ( !pNxtBox || !pNxtBox->GetFrmFmt()->GetBox().GetLeft()) )
+                        ( !pNxtBox || !pNxtBox->GetFrameFormat()->GetBox().GetLeft()) )
                     {
                         SvxBoxItem aTmp( rPrvBoxItem );
                         aTmp.SetLine( rBoxItem.GetLeft() ? rBoxItem.GetLeft()
                                                          : rBoxItem.GetRight(),
                                                             SvxBoxItemLine::RIGHT );
-                        if( pShareFmts )
-                            pShareFmts->SetAttr( *pPrvBox, aTmp );
+                        if( pShareFormats )
+                            pShareFormats->SetAttr( *pPrvBox, aTmp );
                         else
-                            pPrvBox->ClaimFrmFmt()->SetFmtAttr( aTmp );
+                            pPrvBox->ClaimFrameFormat()->SetFormatAttr( aTmp );
                     }
                 }
             }
@@ -757,49 +757,49 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
 
         // Delete the Box first, then the Nodes!
         SwStartNode* pSttNd = const_cast<SwStartNode*>(pBox->GetSttNd());
-        if( pShareFmts )
-            pShareFmts->RemoveFormat( *rTblBoxes[ nDelPos ]->GetFrmFmt() );
+        if( pShareFormats )
+            pShareFormats->RemoveFormat( *rTableBoxes[ nDelPos ]->GetFrameFormat() );
 
         // Before deleting the 'Table Box' from memory - delete any redlines attached to it
-        if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableCellRedline( rTbl.GetFrmFmt()->GetDoc(), *(rTblBoxes[nDelPos]), true, USHRT_MAX );
-        delete rTblBoxes[nDelPos];
-        rTblBoxes.erase( rTblBoxes.begin() + nDelPos );
+        if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableCellRedline( rTable.GetFrameFormat()->GetDoc(), *(rTableBoxes[nDelPos]), true, USHRT_MAX );
+        delete rTableBoxes[nDelPos];
+        rTableBoxes.erase( rTableBoxes.begin() + nDelPos );
 
         if( pSttNd )
         {
             // Has the UndoObject been prepared to save the Section?
             if( pUndo && pUndo->IsDelBox() )
-                static_cast<SwUndoTblNdsChg*>(pUndo)->SaveSection( pSttNd );
+                static_cast<SwUndoTableNdsChg*>(pUndo)->SaveSection( pSttNd );
             else
                 pSttNd->GetDoc()->getIDocumentContentOperations().DeleteSection( pSttNd );
         }
 
         // Also delete the Line?
-        if( !rTblBoxes.empty() )
+        if( !rTableBoxes.empty() )
         {
             // Then adapt the Frame-SSize
-            bool bLastBox = nDelPos == rTblBoxes.size();
+            bool bLastBox = nDelPos == rTableBoxes.size();
             if( bLastBox )
                 --nDelPos;
-            pBox = rTblBoxes[nDelPos];
+            pBox = rTableBoxes[nDelPos];
             if( bCalcNewSize )
             {
-                SwFmtFrmSize aNew( pBox->GetFrmFmt()->GetFrmSize() );
+                SwFormatFrmSize aNew( pBox->GetFrameFormat()->GetFrmSize() );
                 aNew.SetWidth( aNew.GetWidth() + nBoxSz );
-                if( pShareFmts )
-                    pShareFmts->SetSize( *pBox, aNew );
+                if( pShareFormats )
+                    pShareFormats->SetSize( *pBox, aNew );
                 else
-                    pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                    pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
 
                 if( !pBox->GetSttNd() )
                 {
                     // We need to this recursively in all Lines in all Cells!
-                    SwShareBoxFmts aShareFmts;
+                    SwShareBoxFormats aShareFormats;
                     ::lcl_LastBoxSetWidthLine( pBox->GetTabLines(), nBoxSz,
                                                 !bLastBox,
-                                                pShareFmts ? *pShareFmts
-                                                           : aShareFmts );
+                                                pShareFormats ? *pShareFormats
+                                                           : aShareFormats );
                 }
             }
             break;      // Stop deleting
@@ -808,36 +808,36 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
         if( !pUpperBox )
         {
             // Also delete the Line from the Table
-            nDelPos = rTbl.GetTabLines().GetPos( pLine );
-            if( pShareFmts )
-                pShareFmts->RemoveFormat( *rTbl.GetTabLines()[ nDelPos ]->GetFrmFmt() );
+            nDelPos = rTable.GetTabLines().GetPos( pLine );
+            if( pShareFormats )
+                pShareFormats->RemoveFormat( *rTable.GetTabLines()[ nDelPos ]->GetFrameFormat() );
 
-            SwTableLine* pTabLineToDelete = rTbl.GetTabLines()[ nDelPos ];
+            SwTableLine* pTabLineToDelete = rTable.GetTabLines()[ nDelPos ];
             // Before deleting the 'Table Line' from memory - delete any redlines attached to it
-            if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-                rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableRowRedline( rTbl.GetFrmFmt()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
+            if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+                rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableRowRedline( rTable.GetFrameFormat()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
             delete pTabLineToDelete;
-            rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + nDelPos );
+            rTable.GetTabLines().erase( rTable.GetTabLines().begin() + nDelPos );
             break;      // we cannot delete more
         }
 
         // finally also delete the Line
         pBox = pUpperBox;
         nDelPos = pBox->GetTabLines().GetPos( pLine );
-        if( pShareFmts )
-            pShareFmts->RemoveFormat( *pBox->GetTabLines()[ nDelPos ]->GetFrmFmt() );
+        if( pShareFormats )
+            pShareFormats->RemoveFormat( *pBox->GetTabLines()[ nDelPos ]->GetFrameFormat() );
 
         SwTableLine* pTabLineToDelete = pBox->GetTabLines()[ nDelPos ];
         // Before deleting the 'Table Line' from memory - delete any redlines attached to it
-        if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableRowRedline( rTbl.GetFrmFmt()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
+        if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableRowRedline( rTable.GetFrameFormat()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
         delete pTabLineToDelete;
         pBox->GetTabLines().erase( pBox->GetTabLines().begin() + nDelPos );
     } while( pBox->GetTabLines().empty() );
 }
 
 static SwTableBox*
-lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
+lcl_FndNxtPrvDelBox( const SwTableLines& rTableLns,
                                 SwTwips nBoxStt, SwTwips nBoxWidth,
                                 sal_uInt16 nLinePos, bool bNxt,
                                 SwSelBoxes* pAllDelBoxes, size_t *const pCurPos)
@@ -848,7 +848,7 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
             ++nLinePos;
         else
             --nLinePos;
-        SwTableLine* pLine = rTblLns[ nLinePos ];
+        SwTableLine* pLine = rTableLns[ nLinePos ];
         SwTwips nFndBoxWidth = 0;
         SwTwips nFndWidth = nBoxStt + nBoxWidth;
 
@@ -860,7 +860,7 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
                 break;
             }
             pFndBox = pBox;
-            nFndBoxWidth = pFndBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nFndBoxWidth = pFndBox->GetFrameFormat()->GetFrmSize().GetWidth();
             nFndWidth -= nFndBoxWidth;
         }
 
@@ -892,77 +892,77 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
                 --*pCurPos;
             pAllDelBoxes->erase( pAllDelBoxes->begin() + nFndPos );
         }
-    } while( bNxt ? ( nLinePos + 1 < (sal_uInt16)rTblLns.size() ) : nLinePos != 0 );
+    } while( bNxt ? ( nLinePos + 1 < (sal_uInt16)rTableLns.size() ) : nLinePos != 0 );
     return pFndBox;
 }
 
 static void
-lcl_SaveUpperLowerBorder( SwTable& rTbl, const SwTableBox& rBox,
-                                SwShareBoxFmts& rShareFmts,
+lcl_SaveUpperLowerBorder( SwTable& rTable, const SwTableBox& rBox,
+                                SwShareBoxFormats& rShareFormats,
                                 SwSelBoxes* pAllDelBoxes = 0,
                                 size_t *const pCurPos = 0 )
 {
 //JP 16.04.97:  2. part for Bug 36271
     const SwTableLine* pLine = rBox.GetUpper();
-    const SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
+    const SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
     const SwTableBox* pUpperBox = &rBox;
-    sal_uInt16 nDelPos = rTblBoxes.GetPos( pUpperBox );
+    sal_uInt16 nDelPos = rTableBoxes.GetPos( pUpperBox );
     pUpperBox = rBox.GetUpper()->GetUpper();
-    const SvxBoxItem& rBoxItem = rBox.GetFrmFmt()->GetBox();
+    const SvxBoxItem& rBoxItem = rBox.GetFrameFormat()->GetBox();
 
     // then the top/bottom edges
     if( rBoxItem.GetTop() || rBoxItem.GetBottom() )
     {
         bool bChgd = false;
-        const SwTableLines* pTblLns;
+        const SwTableLines* pTableLns;
         if( pUpperBox )
-            pTblLns = &pUpperBox->GetTabLines();
+            pTableLns = &pUpperBox->GetTabLines();
         else
-            pTblLns = &rTbl.GetTabLines();
+            pTableLns = &rTable.GetTabLines();
 
-        sal_uInt16 nLnPos = pTblLns->GetPos( pLine );
+        sal_uInt16 nLnPos = pTableLns->GetPos( pLine );
 
         // Calculate the attribute position of the top-be-deleted Box and then
         // search in the top/bottom Line of the respective counterparts.
         SwTwips nBoxStt = 0;
         for( sal_uInt16 n = 0; n < nDelPos; ++n )
-            nBoxStt += rTblBoxes[ n ]->GetFrmFmt()->GetFrmSize().GetWidth();
-        SwTwips nBoxWidth = rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+            nBoxStt += rTableBoxes[ n ]->GetFrameFormat()->GetFrmSize().GetWidth();
+        SwTwips nBoxWidth = rBox.GetFrameFormat()->GetFrmSize().GetWidth();
 
         SwTableBox *pPrvBox = 0, *pNxtBox = 0;
         if( nLnPos )        // Predecessor?
-            pPrvBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
+            pPrvBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth,
                                 nLnPos, false, pAllDelBoxes, pCurPos );
 
-        if( nLnPos + 1 < (sal_uInt16)pTblLns->size() )     // Successor?
-            pNxtBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
+        if( nLnPos + 1 < (sal_uInt16)pTableLns->size() )     // Successor?
+            pNxtBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth,
                                 nLnPos, true, pAllDelBoxes, pCurPos );
 
         if( pNxtBox && pNxtBox->GetSttNd() )
         {
-            const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrameFormat()->GetBox();
             if( !rNxtBoxItem.GetTop() && ( !pPrvBox ||
-                !pPrvBox->GetFrmFmt()->GetBox().GetBottom()) )
+                !pPrvBox->GetFrameFormat()->GetBox().GetBottom()) )
             {
                 SvxBoxItem aTmp( rNxtBoxItem );
                 aTmp.SetLine( rBoxItem.GetTop() ? rBoxItem.GetTop()
                                                 : rBoxItem.GetBottom(),
                                                 SvxBoxItemLine::TOP );
-                rShareFmts.SetAttr( *pNxtBox, aTmp );
+                rShareFormats.SetAttr( *pNxtBox, aTmp );
                 bChgd = true;
             }
         }
         if( !bChgd && pPrvBox && pPrvBox->GetSttNd() )
         {
-            const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrameFormat()->GetBox();
             if( !rPrvBoxItem.GetTop() && ( !pNxtBox ||
-                !pNxtBox->GetFrmFmt()->GetBox().GetTop()) )
+                !pNxtBox->GetFrameFormat()->GetBox().GetTop()) )
             {
                 SvxBoxItem aTmp( rPrvBoxItem );
                 aTmp.SetLine( rBoxItem.GetTop() ? rBoxItem.GetTop()
                                                 : rBoxItem.GetBottom(),
                                                 SvxBoxItemLine::BOTTOM );
-                rShareFmts.SetAttr( *pPrvBox, aTmp );
+                rShareFormats.SetAttr( *pPrvBox, aTmp );
             }
         }
     }
@@ -976,11 +976,11 @@ bool SwTable::DeleteSel(
     const bool bDelMakeFrms, const bool bCorrBorder )
 {
     OSL_ENSURE( pDoc, "No doc?" );
-    SwTableNode* pTblNd = 0;
+    SwTableNode* pTableNd = 0;
     if( !rBoxes.empty() )
     {
-        pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-        if( !pTblNd )
+        pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+        if( !pTableNd )
             return false;
     }
 
@@ -997,7 +997,7 @@ bool SwTable::DeleteSel(
         aFndBox.DelFrms( *this );
     }
 
-    SwShareBoxFmts aShareFmts;
+    SwShareBoxFormats aShareFormats;
 
     // First switch the Border, then delete
     if( bCorrBorder )
@@ -1005,7 +1005,7 @@ bool SwTable::DeleteSel(
         SwSelBoxes aBoxes( rBoxes );
         for (size_t n = 0; n < aBoxes.size(); ++n)
         {
-            ::lcl_SaveUpperLowerBorder( *this, *rBoxes[ n ], aShareFmts,
+            ::lcl_SaveUpperLowerBorder( *this, *rBoxes[ n ], aShareFormats,
                                         &aBoxes, &n );
         }
     }
@@ -1021,11 +1021,11 @@ bool SwTable::DeleteSel(
         // First adapt the data-sequence for chart if necessary
         // (needed to move the implementation cursor properly to it's new
         // position which can't be done properly if the cell is already gone)
-        if (pPCD && pTblNd)
-            pPCD->DeleteBox( &pTblNd->GetTable(), *rBoxes[nIdx] );
+        if (pPCD && pTableNd)
+            pPCD->DeleteBox( &pTableNd->GetTable(), *rBoxes[nIdx] );
 
         // ... then delete the boxes
-        _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFmts );
+        _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats );
     }
 
     // then clean up the structure of all Lines
@@ -1035,7 +1035,7 @@ bool SwTable::DeleteSel(
         aFndBox.MakeFrms( *this );
 
     // TL_CHART2: now inform chart that sth has changed
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     CHECKTABLELAYOUT;
     CHECK_TABLE( *this );
@@ -1047,8 +1047,8 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
                         bool bSameHeight )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // TL_CHART2: splitting/merging of a number of cells or rows will usually make
@@ -1086,10 +1086,10 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
 
         // Insert nCnt new Lines into the Box
         SwTableLine* pInsLine = pSelBox->GetUpper();
-        SwTableBoxFmt* pFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
+        SwTableBoxFormat* pFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
 
         // Respect the Line's height, reset if needed
-        SwFmtFrmSize aFSz( pInsLine->GetFrmFmt()->GetFrmSize() );
+        SwFormatFrmSize aFSz( pInsLine->GetFrameFormat()->GetFrmSize() );
         if ( bSameHeight && ATT_VAR_SIZE == aFSz.GetHeightSizeType() )
             aFSz.SetHeightSizeType( ATT_MIN_SIZE );
 
@@ -1098,7 +1098,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             aFSz.SetHeight( ( bSameHeight ? pRowHeights[ n ] : aFSz.GetHeight() ) /
                              (nCnt + 1) );
 
-        SwTableBox* pNewBox = new SwTableBox( pFrmFmt, nCnt, pInsLine );
+        SwTableBox* pNewBox = new SwTableBox( pFrameFormat, nCnt, pInsLine );
         sal_uInt16 nBoxPos = pInsLine->GetTabBoxes().GetPos( pSelBox );
         pInsLine->GetTabBoxes()[nBoxPos] = pNewBox; // overwrite old one
 
@@ -1111,26 +1111,26 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             sal_uLong nSttNd = pLastBox->GetSttIdx() + 1,
                     nEndNd = pLastBox->GetSttNd()->EndOfSectionIndex();
             while( nSttNd < nEndNd )
-                if( !pDoc->GetNodes()[ nSttNd++ ]->IsTxtNode() )
+                if( !pDoc->GetNodes()[ nSttNd++ ]->IsTextNode() )
                 {
                     bMoveNodes = false;
                     break;
                 }
         }
 
-        SwTableBoxFmt* pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
-        bool bChkBorder = 0 != pCpyBoxFrmFmt->GetBox().GetTop();
+        SwTableBoxFormat* pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
+        bool bChkBorder = 0 != pCpyBoxFrameFormat->GetBox().GetTop();
         if( bChkBorder )
-            pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->ClaimFrmFmt());
+            pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->ClaimFrameFormat());
 
         for( sal_uInt16 i = 0; i <= nCnt; ++i )
         {
             // Create a new Line in the new Box
             SwTableLine* pNewLine = new SwTableLine(
-                    static_cast<SwTableLineFmt*>(pInsLine->GetFrmFmt()), 1, pNewBox );
+                    static_cast<SwTableLineFormat*>(pInsLine->GetFrameFormat()), 1, pNewBox );
             if( bChgLineSz )
             {
-                pNewLine->ClaimFrmFmt()->SetFmtAttr( aFSz );
+                pNewLine->ClaimFrameFormat()->SetFormatAttr( aFSz );
             }
 
             pNewBox->GetTabLines().insert( pNewBox->GetTabLines().begin() + i, pNewLine );
@@ -1142,15 +1142,15 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             }
             else
             {
-                ::_InsTblBox( pDoc, pTblNd, pNewLine, pCpyBoxFrmFmt,
+                ::_InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat,
                                 pLastBox, 0 );
 
                 if( bChkBorder )
                 {
-                    pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pNewLine->GetTabBoxes()[ 0 ]->ClaimFrmFmt());
-                    SvxBoxItem aTmp( pCpyBoxFrmFmt->GetBox() );
+                    pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pNewLine->GetTabBoxes()[ 0 ]->ClaimFrameFormat());
+                    SvxBoxItem aTmp( pCpyBoxFrameFormat->GetBox() );
                     aTmp.SetLine( 0, SvxBoxItemLine::TOP );
-                    pCpyBoxFrmFmt->SetFmtAttr( aTmp );
+                    pCpyBoxFrameFormat->SetFormatAttr( aTmp );
                     bChkBorder = false;
                 }
 
@@ -1170,9 +1170,9 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             }
         }
         // In Boxes with Lines, we can only have Size/Fillorder
-        pFrmFmt = static_cast<SwTableBoxFmt*>(pNewBox->ClaimFrmFmt());
-        pFrmFmt->ResetFmtAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
-        pFrmFmt->ResetFmtAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
+        pFrameFormat = static_cast<SwTableBoxFormat*>(pNewBox->ClaimFrameFormat());
+        pFrameFormat->ResetFormatAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
+        pFrameFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
     }
 
     delete[] pRowHeights;
@@ -1189,8 +1189,8 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
 bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // TL_CHART2: splitting/merging of a number of cells or rows will usually make
@@ -1208,14 +1208,14 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
     aFndBox.DelFrms( *this );
 
     _CpyTabFrms aFrmArr;
-    std::vector<SwTableBoxFmt*> aLastBoxArr;
+    std::vector<SwTableBoxFormat*> aLastBoxArr;
     for (size_t n = 0; n < aSelBoxes.size(); ++n)
     {
         SwTableBox* pSelBox = aSelBoxes[n];
         OSL_ENSURE( pSelBox, "Box is not in the table" );
 
         // We don't want to split small table cells into very very small cells
-        if( pSelBox->GetFrmFmt()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
+        if( pSelBox->GetFrameFormat()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
             continue;
 
         // Then split the nCnt Box up into nCnt Boxes
@@ -1223,62 +1223,62 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
         sal_uInt16 nBoxPos = pInsLine->GetTabBoxes().GetPos( pSelBox );
 
         // Find the Frame Format in the Frame Format Array
-        SwTableBoxFmt* pLastBoxFmt;
-        _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt()) );
+        SwTableBoxFormat* pLastBoxFormat;
+        _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) );
         _CpyTabFrms::const_iterator itFind = aFrmArr.lower_bound( aFindFrm );
         const size_t nFndPos = itFind - aFrmArr.begin();
         if( itFind == aFrmArr.end() || !(*itFind == aFindFrm) )
         {
-            // Change the FrmFmt
-            aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->ClaimFrmFmt());
-            SwTwips nBoxSz = aFindFrm.pNewFrmFmt->GetFrmSize().GetWidth();
+            // Change the FrameFormat
+            aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->ClaimFrameFormat());
+            SwTwips nBoxSz = aFindFrm.pNewFrameFormat->GetFrmSize().GetWidth();
             SwTwips nNewBoxSz = nBoxSz / ( nCnt + 1 );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            aFindFrm.pNewFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                                         nNewBoxSz, 0 ) );
             aFrmArr.insert( aFindFrm );
 
-            pLastBoxFmt = aFindFrm.pNewFrmFmt;
+            pLastBoxFormat = aFindFrm.pNewFrameFormat;
             if( nBoxSz != ( nNewBoxSz * (nCnt + 1)))
             {
                 // We have a remainder, so we need to define an own Format
                 // for the last Box.
-                pLastBoxFmt = new SwTableBoxFmt( *aFindFrm.pNewFrmFmt );
-                pLastBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+                pLastBoxFormat = new SwTableBoxFormat( *aFindFrm.pNewFrameFormat );
+                pLastBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                 nBoxSz - ( nNewBoxSz * nCnt ), 0 ) );
             }
-            aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFmt );
+            aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFormat );
         }
         else
         {
             aFindFrm = aFrmArr[ nFndPos ];
-            pSelBox->ChgFrmFmt( aFindFrm.pNewFrmFmt );
-            pLastBoxFmt = aLastBoxArr[ nFndPos ];
+            pSelBox->ChgFrameFormat( aFindFrm.pNewFrameFormat );
+            pLastBoxFormat = aLastBoxArr[ nFndPos ];
         }
 
         // Insert the Boxes at the Position
         for( sal_uInt16 i = 1; i < nCnt; ++i )
-            ::_InsTblBox( pDoc, pTblNd, pInsLine, aFindFrm.pNewFrmFmt,
+            ::_InsTableBox( pDoc, pTableNd, pInsLine, aFindFrm.pNewFrameFormat,
                         pSelBox, nBoxPos + i ); // insert after
 
-        ::_InsTblBox( pDoc, pTblNd, pInsLine, pLastBoxFmt,
+        ::_InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat,
                     pSelBox, nBoxPos + nCnt );  // insert after
 
         // Special treatment for the Border:
-        const SvxBoxItem& aSelBoxItem = aFindFrm.pNewFrmFmt->GetBox();
+        const SvxBoxItem& aSelBoxItem = aFindFrm.pNewFrameFormat->GetBox();
         if( aSelBoxItem.GetRight() )
         {
-            pInsLine->GetTabBoxes()[ nBoxPos + nCnt ]->ClaimFrmFmt();
+            pInsLine->GetTabBoxes()[ nBoxPos + nCnt ]->ClaimFrameFormat();
 
             SvxBoxItem aTmp( aSelBoxItem );
             aTmp.SetLine( 0, SvxBoxItemLine::RIGHT );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( aTmp );
+            aFindFrm.pNewFrameFormat->SetFormatAttr( aTmp );
 
             // Remove the Format from the "cache"
             for( auto i = aFrmArr.size(); i; )
             {
                 const _CpyTabFrm& rCTF = aFrmArr[ --i ];
-                if( rCTF.pNewFrmFmt == aFindFrm.pNewFrmFmt ||
-                    rCTF.Value.pFrmFmt == aFindFrm.pNewFrmFmt )
+                if( rCTF.pNewFrameFormat == aFindFrm.pNewFrameFormat ||
+                    rCTF.Value.pFrameFormat == aFindFrm.pNewFrameFormat )
                 {
                     aFrmArr.erase( aFrmArr.begin() + i );
                     aLastBoxArr.erase( aLastBoxArr.begin() + i );
@@ -1340,7 +1340,7 @@ static void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
 static void lcl_CalcWidth( SwTableBox* pBox )
 {
     // Assertion: Every Line in the Box is as large
-    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
     OSL_ENSURE( pBox->GetTabLines().size(), "Box does not have any Lines" );
 
     SwTableLine* pLine = pBox->GetTabLines()[0];
@@ -1348,18 +1348,18 @@ static void lcl_CalcWidth( SwTableBox* pBox )
 
     long nWidth = 0;
     for( auto pTabBox : pLine->GetTabBoxes() )
-        nWidth += pTabBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth += pTabBox->GetFrameFormat()->GetFrmSize().GetWidth();
 
-    pFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
+    pFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
 
     // Boxes with Lines can only have Size/Fillorder
-    pFmt->ResetFmtAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
-    pFmt->ResetFmtAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
+    pFormat->ResetFormatAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
+    pFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
 }
 
 struct _InsULPara
 {
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     SwTableLine* pInsLine;
     SwTableBox* pInsBox;
     bool bUL_LR : 1;        // Upper-Lower(true) or Left-Right(false) ?
@@ -1372,7 +1372,7 @@ struct _InsULPara
     _InsULPara( SwTableNode* pTNd, bool bUpperLower, bool bUpper,
                 SwTableBox* pLeft, SwTableBox* pMerge, SwTableBox* pRight,
                 SwTableLine* pLine=0, SwTableBox* pBox=0 )
-        : pTblNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
+        : pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
         pLeftBox( pLeft ), pRightBox( pRight ), pMergeBox( pMerge )
         {   bUL_LR = bUpperLower; bUL = bUpper; }
 
@@ -1426,7 +1426,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara)
     if (rFndBox.GetBox()->GetTabLines().size())
     {
         SwTableBox* pBox = new SwTableBox(
-                static_cast<SwTableBoxFmt*>(rFndBox.GetBox()->GetFrmFmt()),
+                static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()),
                 0, pULPara->pInsLine );
         _InsULPara aPara( *pULPara );
         aPara.pInsBox = pBox;
@@ -1459,7 +1459,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
         SwTableLine* pFndLn = rFndLine.GetLine();
         pLines = pFndLn->GetUpper() ?
                         &pFndLn->GetUpper()->GetTabLines() :
-                        &pULPara->pTblNd->GetTable().GetTabLines();
+                        &pULPara->pTableNd->GetTable().GetTabLines();
 
         SwTableBox* pLBx = rFndLine.GetBoxes().front().GetBox();
         SwTableBox* pRBx = rFndLine.GetBoxes().back().GetBox();
@@ -1491,10 +1491,10 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
             // inserted
             SwTableLine* pInsLine = pULPara->pLeftBox->GetUpper();
             SwTableBox* pLMBox = new SwTableBox(
-                static_cast<SwTableBoxFmt*>(pULPara->pLeftBox->GetFrmFmt()), 0, pInsLine );
+                static_cast<SwTableBoxFormat*>(pULPara->pLeftBox->GetFrameFormat()), 0, pInsLine );
             SwTableLine* pLMLn = new SwTableLine(
-                        static_cast<SwTableLineFmt*>(pInsLine->GetFrmFmt()), 2, pLMBox );
-            pLMLn->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
+                        static_cast<SwTableLineFormat*>(pInsLine->GetFrameFormat()), 2, pLMBox );
+            pLMLn->ClaimFrameFormat()->ResetFormatAttr( RES_FRM_SIZE );
 
             pLMBox->GetTabLines().insert( pLMBox->GetTabLines().begin(), pLMLn );
 
@@ -1526,7 +1526,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
     pLines = &pULPara->pInsBox->GetTabLines();
 
     SwTableLine* pNewLine = new SwTableLine(
-        static_cast<SwTableLineFmt*>(rFndLine.GetLine()->GetFrmFmt()), 0, pULPara->pInsBox );
+        static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()), 0, pULPara->pInsBox );
     _InsULPara aPara( *pULPara );       // copying
     aPara.pInsLine = pNewLine;
     _FndBoxes & rLineBoxes = rFndLine.GetBoxes();
@@ -1549,11 +1549,11 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
 static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox );
 
 bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
-                        SwTableBox* pMergeBox, SwUndoTblMerge* pUndo )
+                        SwTableBox* pMergeBox, SwUndoTableMerge* pUndo )
 {
     OSL_ENSURE( !rBoxes.empty() && pMergeBox, "no valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
@@ -1587,9 +1587,9 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     SwTableLine* pInsLine = new SwTableLine(
-                static_cast<SwTableLineFmt*>(pFndBox->GetLines().front().GetLine()->GetFrmFmt()), 0,
+                static_cast<SwTableLineFormat*>(pFndBox->GetLines().front().GetLine()->GetFrameFormat()), 0,
                 !pFndBox->GetUpper() ? 0 : pFndBox->GetBox() );
-    pInsLine->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
+    pInsLine->ClaimFrameFormat()->ResetFormatAttr( RES_FRM_SIZE );
 
     // Add the new Line
     SwTableLines* pLines =  pFndBox->GetUpper() ?
@@ -1599,18 +1599,18 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     sal_uInt16 nInsPos = pLines->GetPos( pNewLine );
     pLines->insert( pLines->begin() + nInsPos, pInsLine );
 
-    SwTableBox* pLeftBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pMergeBox->GetFrmFmt()), 0, pInsLine );
-    SwTableBox* pRightBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pMergeBox->GetFrmFmt()), 0, pInsLine );
+    SwTableBox* pLeftBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pMergeBox->GetFrameFormat()), 0, pInsLine );
+    SwTableBox* pRightBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pMergeBox->GetFrameFormat()), 0, pInsLine );
     pMergeBox->SetUpper( pInsLine );
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin(), pLeftBox );
-    pLeftBox->ClaimFrmFmt();
+    pLeftBox->ClaimFrameFormat();
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin() + 1, pMergeBox);
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin() + 2, pRightBox );
-    pRightBox->ClaimFrmFmt();
+    pRightBox->ClaimFrameFormat();
 
     // This contains all Lines that are above the selected Area,
     // thus they form a Upper/Lower Line
-    _InsULPara aPara( pTblNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine );
+    _InsULPara aPara( pTableNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine );
 
     // Move the overlapping upper/lower Lines of the selected Area
     _FndBoxes& rLineBoxes = pFndBox->GetLines().front().GetBoxes();
@@ -1669,14 +1669,14 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     return true;
 }
 
-static void lcl_CheckRowSpan( SwTable &rTbl )
+static void lcl_CheckRowSpan( SwTable &rTable )
 {
-    const long nLineCount = static_cast<long>(rTbl.GetTabLines().size());
+    const long nLineCount = static_cast<long>(rTable.GetTabLines().size());
     long nMaxSpan = nLineCount;
     long nMinSpan = 1;
     while( nMaxSpan )
     {
-        SwTableLine* pLine = rTbl.GetTabLines()[ nLineCount - nMaxSpan ];
+        SwTableLine* pLine = rTable.GetTabLines()[ nLineCount - nMaxSpan ];
         for( auto pBox : pLine->GetTabBoxes() )
         {
             long nRowSpan = pBox->getRowSpan();
@@ -1706,7 +1706,7 @@ static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
         {
             if (pBox==pCmp)
                 break;
-            nRet = nRet + (sal_uInt16) pCmp->GetFrmFmt()->GetFrmSize().GetWidth();
+            nRet = nRet + (sal_uInt16) pCmp->GetFrameFormat()->GetFrmSize().GetWidth();
         }
         pBox = pBox->GetUpper()->GetUpper();
     } while( pBox );
@@ -1719,7 +1719,7 @@ static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
     for( auto n = rLine.GetBoxes().size(); n; )
     {
         nRet = nRet + static_cast<sal_uInt16>(rLine.GetBoxes()[--n].GetBox()
-                            ->GetFrmFmt()->GetFrmSize().GetWidth());
+                            ->GetFrameFormat()->GetFrmSize().GetWidth());
     }
     return nRet;
 }
@@ -1754,7 +1754,7 @@ static void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
                     {
                         SwTableBox* pBox = pLine->GetTabBoxes()[nBox++];
                         if( pBox != pSel )
-                            nPos += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                            nPos += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
                         else
                             break;
                     }
@@ -1769,7 +1769,7 @@ static void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
                     for( nBox = 0; nBox < nBoxCount; )
                     {
                         nPos += pFndLine->GetBoxes()[nBox]
-                            .GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+                            .GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
                         rWidth[ ++nBox ] = nPos;
                     }
                     // nPos: The right border of the last selected box
@@ -1816,7 +1816,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     sal_uLong nRealSize;
     sal_uLong nDummy1 = 0;
     sal_uLong nDummy2 = 0;
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
     {
         if( pCpyPara->nBoxIdx == 1 )
             nDummy1 = (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx][0];
@@ -1827,7 +1827,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     else
     {
         nRealSize = pCpyPara->nNewSize;
-        nRealSize *= rFndBox.GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+        nRealSize *= rFndBox.GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
         if (pCpyPara->nOldSize == 0)
             throw o3tl::divide_by_zero();
         nRealSize /= pCpyPara->nOldSize;
@@ -1845,29 +1845,29 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     do
     {
         // Find the Frame Format in the list of all Frame Formats
-        _CpyTabFrm aFindFrm(static_cast<SwTableBoxFmt*>(rFndBox.GetBox()->GetFrmFmt()));
+        _CpyTabFrm aFindFrm(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()));
 
-        SwFmtFrmSize aFrmSz;
+        SwFormatFrmSize aFrmSz;
         _CpyTabFrms::const_iterator itFind = pCpyPara->rTabFrmArr.lower_bound( aFindFrm );
         const _CpyTabFrms::size_type nFndPos = itFind - pCpyPara->rTabFrmArr.begin();
         if( itFind == pCpyPara->rTabFrmArr.end() || !(*itFind == aFindFrm) ||
-            ( aFrmSz = ( aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ]).pNewFrmFmt->
+            ( aFrmSz = ( aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ]).pNewFrameFormat->
                 GetFrmSize()).GetWidth() != (SwTwips)nSize )
         {
             // It doesn't exist yet, so copy it
-            aFindFrm.pNewFrmFmt = pCpyPara->pDoc->MakeTableBoxFmt();
-            aFindFrm.pNewFrmFmt->CopyAttrs( *rFndBox.GetBox()->GetFrmFmt() );
-            if( !pCpyPara->bCpyCntnt )
-                aFindFrm.pNewFrmFmt->ResetFmtAttr(  RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
+            aFindFrm.pNewFrameFormat = pCpyPara->pDoc->MakeTableBoxFormat();
+            aFindFrm.pNewFrameFormat->CopyAttrs( *rFndBox.GetBox()->GetFrameFormat() );
+            if( !pCpyPara->bCpyContent )
+                aFindFrm.pNewFrameFormat->ResetFormatAttr(  RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
             aFrmSz.SetWidth( nSize );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( aFrmSz );
+            aFindFrm.pNewFrameFormat->SetFormatAttr( aFrmSz );
             pCpyPara->rTabFrmArr.insert( aFindFrm );
         }
 
         SwTableBox* pBox;
         if (!rFndBox.GetLines().empty())
         {
-            pBox = new SwTableBox( aFindFrm.pNewFrmFmt,
+            pBox = new SwTableBox( aFindFrm.pNewFrameFormat,
                         rFndBox.GetLines().size(), pCpyPara->pInsLine );
             pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
             _CpyPara aPara( *pCpyPara, pBox );
@@ -1878,14 +1878,14 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
         else
         {
             // Create an empty Box
-            pCpyPara->pDoc->GetNodes().InsBoxen( pCpyPara->pTblNd, pCpyPara->pInsLine,
-                            aFindFrm.pNewFrmFmt,
-                            pCpyPara->pDoc->GetDfltTxtFmtColl(),
+            pCpyPara->pDoc->GetNodes().InsBoxen( pCpyPara->pTableNd, pCpyPara->pInsLine,
+                            aFindFrm.pNewFrameFormat,
+                            pCpyPara->pDoc->GetDfltTextFormatColl(),
                             0, pCpyPara->nInsPos );
             pBox = pCpyPara->pInsLine->GetTabBoxes()[ pCpyPara->nInsPos ];
             if( bDummy )
                 pBox->setDummyFlag( true );
-            else if( pCpyPara->bCpyCntnt )
+            else if( pCpyPara->bCpyContent )
             {
                 // Copy the content into this empty Box
                 pBox->setRowSpan(rFndBox.GetBox()->getRowSpan());
@@ -1894,23 +1894,23 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
                 {
                     SfxItemSet aBoxAttrSet( pCpyPara->pDoc->GetAttrPool(),
                                             RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-                    aBoxAttrSet.Put(rFndBox.GetBox()->GetFrmFmt()->GetAttrSet());
+                    aBoxAttrSet.Put(rFndBox.GetBox()->GetFrameFormat()->GetAttrSet());
                     if( aBoxAttrSet.Count() )
                     {
                         const SfxPoolItem* pItem;
                         SvNumberFormatter* pN = pCpyPara->pDoc->GetNumberFormatter( false );
-                        if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == aBoxAttrSet.
+                        if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == aBoxAttrSet.
                             GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                         {
-                            sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                            sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                            sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                            sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                             if( nNewIdx != nOldIdx )
-                                aBoxAttrSet.Put( SwTblBoxNumFormat( nNewIdx ));
+                                aBoxAttrSet.Put( SwTableBoxNumFormat( nNewIdx ));
                         }
-                        pBox->ClaimFrmFmt()->SetFmtAttr( aBoxAttrSet );
+                        pBox->ClaimFrameFormat()->SetFormatAttr( aBoxAttrSet );
                     }
                 }
-                SwDoc* pFromDoc = rFndBox.GetBox()->GetFrmFmt()->GetDoc();
+                SwDoc* pFromDoc = rFndBox.GetBox()->GetFrameFormat()->GetDoc();
                 SwNodeRange aCpyRg( *rFndBox.GetBox()->GetSttNd(), 1,
                         *rFndBox.GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -1941,19 +1941,19 @@ static void
 lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
 {
     // Find the Frame Format in the list of all Frame Formats
-    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(rFndLine.GetLine()->GetFrmFmt()) );
+    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) );
     _CpyTabFrms::const_iterator itFind = pCpyPara->rTabFrmArr.find( aFindFrm );
     if( itFind == pCpyPara->rTabFrmArr.end() )
     {
         // It doesn't exist yet, so copy it
-        aFindFrm.pNewFrmFmt = reinterpret_cast<SwTableBoxFmt*>(pCpyPara->pDoc->MakeTableLineFmt());
-        aFindFrm.pNewFrmFmt->CopyAttrs( *rFndLine.GetLine()->GetFrmFmt() );
+        aFindFrm.pNewFrameFormat = reinterpret_cast<SwTableBoxFormat*>(pCpyPara->pDoc->MakeTableLineFormat());
+        aFindFrm.pNewFrameFormat->CopyAttrs( *rFndLine.GetLine()->GetFrameFormat() );
         pCpyPara->rTabFrmArr.insert( aFindFrm );
     }
     else
         aFindFrm = *itFind;
 
-    SwTableLine* pNewLine = new SwTableLine( reinterpret_cast<SwTableLineFmt*>(aFindFrm.pNewFrmFmt),
+    SwTableLine* pNewLine = new SwTableLine( reinterpret_cast<SwTableLineFormat*>(aFindFrm.pNewFrameFormat),
                         rFndLine.GetBoxes().size(), pCpyPara->pInsBox );
     if( pCpyPara->pInsBox )
     {
@@ -1962,13 +1962,13 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
     }
     else
     {
-        SwTableLines& rLines = pCpyPara->pTblNd->GetTable().GetTabLines();
+        SwTableLines& rLines = pCpyPara->pTableNd->GetTable().GetTabLines();
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine);
     }
 
     _CpyPara aPara( *pCpyPara, pNewLine );
 
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
     {
         aPara.nOldSize = 0; // will not be used
         aPara.nBoxIdx = 1;
@@ -1977,34 +1977,34 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
                     rFndLine.GetLine()->GetTabBoxes().size() )
     {
         // Get the Parent's size
-        const SwFrmFmt* pFmt;
+        const SwFrameFormat* pFormat;
 
         if( rFndLine.GetLine()->GetUpper() )
-            pFmt = rFndLine.GetLine()->GetUpper()->GetFrmFmt();
+            pFormat = rFndLine.GetLine()->GetUpper()->GetFrameFormat();
         else
-            pFmt = pCpyPara->pTblNd->GetTable().GetFrmFmt();
-        aPara.nOldSize = pFmt->GetFrmSize().GetWidth();
+            pFormat = pCpyPara->pTableNd->GetTable().GetFrameFormat();
+        aPara.nOldSize = pFormat->GetFrmSize().GetWidth();
     }
     else
         // Calculate it
         for( auto &rBox : rFndLine.GetBoxes() )
         {
-            aPara.nOldSize += rBox.GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+            aPara.nOldSize += rBox.GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
         }
 
     const _FndBoxes& rBoxes = rFndLine.GetBoxes();
     for (_FndBoxes::const_iterator it = rBoxes.begin(); it != rBoxes.end(); ++it)
         lcl_CopyBoxToDoc(*it, &aPara);
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
         ++pCpyPara->nLnIdx;
 }
 
-bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
+bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd )
 {
     // Find all Boxes/Lines
     SwSelBoxes aSelBoxes;
     SwTableBox* pBox = GetTabSortBoxes()[ 0 ];
-    pBox = GetTblBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
+    pBox = GetTableBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
     SelLineFromBox( pBox, aSelBoxes, true );
 
     _FndBox aFndBox( 0, 0 );
@@ -2017,22 +2017,22 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( this );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        GetFrmFmt()->GetDoc()->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( this );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        GetFrameFormat()->GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    _CpyTabFrms aCpyFmt;
-    _CpyPara aPara( &rTblNd, 1, aCpyFmt, true );
-    aPara.nNewSize = aPara.nOldSize = rTblNd.GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
+    _CpyTabFrms aCpyFormat;
+    _CpyPara aPara( &rTableNd, 1, aCpyFormat, true );
+    aPara.nNewSize = aPara.nOldSize = rTableNd.GetTable().GetFrameFormat()->GetFrmSize().GetWidth();
     // Copy
     if( IsNewModel() )
         lcl_CalcNewWidths( aFndBox.GetLines(), aPara );
     for( _FndLine& rFndLine : aFndBox.GetLines() )
          lcl_CopyLineToDoc( rFndLine, &aPara );
-    if( rTblNd.GetTable().IsNewModel() )
+    if( rTableNd.GetTable().IsNewModel() )
     {   // The copied line must not contain any row span attributes > 1
-        SwTableLine* pLine = rTblNd.GetTable().GetTabLines()[0];
+        SwTableLine* pLine = rTableNd.GetTable().GetTabLines()[0];
         OSL_ENSURE( !pLine->GetTabBoxes().empty(), "Empty Table Line" );
         for( auto pTableBox : pLine->GetTabBoxes() )
         {
@@ -2059,63 +2059,63 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
 
     // First copy the PoolTemplates for the Table, so that the Tables are
     // actually copied and have valid values.
-    SwDoc* pSrcDoc = GetFrmFmt()->GetDoc();
+    SwDoc* pSrcDoc = GetFrameFormat()->GetDoc();
     if( pSrcDoc != pInsDoc )
     {
-        pInsDoc->CopyTxtColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE ) );
-        pInsDoc->CopyTxtColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN ) );
+        pInsDoc->CopyTextColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE ) );
+        pInsDoc->CopyTextColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE_HDLN ) );
     }
 
-    SwTable* pNewTbl = const_cast<SwTable*>(pInsDoc->InsertTable(
+    SwTable* pNewTable = const_cast<SwTable*>(pInsDoc->InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
-            rPos, 1, 1, GetFrmFmt()->GetHoriOrient().GetHoriOrient(),
+            rPos, 1, 1, GetFrameFormat()->GetHoriOrient().GetHoriOrient(),
             0, 0, false, IsNewModel() ));
-    if( !pNewTbl )
+    if( !pNewTable )
         return false;
 
     SwNodeIndex aIdx( rPos.nNode, -1 );
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
     ++aIdx;
-    OSL_ENSURE( pTblNd, "Where is the TableNode now?" );
+    OSL_ENSURE( pTableNd, "Where is the TableNode now?" );
 
-    pTblNd->GetTable().SetRowsToRepeat( GetRowsToRepeat() );
+    pTableNd->GetTable().SetRowsToRepeat( GetRowsToRepeat() );
 
     if( IS_TYPE( SwDDETable, this ))
     {
         // A DDE-Table is being copied
         // Does the new Document actually have it's FieldType?
-        SwFieldType* pFldType = pInsDoc->getIDocumentFieldsAccess().InsertFldType(
-                                    *static_cast<const SwDDETable*>(this)->GetDDEFldType() );
-        OSL_ENSURE( pFldType, "unknown FieldType" );
+        SwFieldType* pFieldType = pInsDoc->getIDocumentFieldsAccess().InsertFieldType(
+                                    *static_cast<const SwDDETable*>(this)->GetDDEFieldType() );
+        OSL_ENSURE( pFieldType, "unknown FieldType" );
 
         // Change the Table Pointer at the Node
-        pNewTbl = new SwDDETable( *pNewTbl,
-                                 static_cast<SwDDEFieldType*>(pFldType) );
-        pTblNd->SetNewTable( pNewTbl, false );
+        pNewTable = new SwDDETable( *pNewTable,
+                                 static_cast<SwDDEFieldType*>(pFieldType) );
+        pTableNd->SetNewTable( pNewTable, false );
     }
 
-    pNewTbl->GetFrmFmt()->CopyAttrs( *GetFrmFmt() );
-    pNewTbl->SetTblChgMode( GetTblChgMode() );
+    pNewTable->GetFrameFormat()->CopyAttrs( *GetFrameFormat() );
+    pNewTable->SetTableChgMode( GetTableChgMode() );
 
     // Destroy the already created Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
     {
         // Conver the Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( this );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pSrcDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( this );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pSrcDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    SwTblNumFmtMerge aTNFM( *pSrcDoc, *pInsDoc );
+    SwTableNumFormatMerge aTNFM( *pSrcDoc, *pInsDoc );
 
     // Also copy Names or enforce a new unique one
     if( bCpyName )
-        pNewTbl->GetFrmFmt()->SetName( GetFrmFmt()->GetName() );
+        pNewTable->GetFrameFormat()->SetName( GetFrameFormat()->GetName() );
 
-    _CpyTabFrms aCpyFmt;
-    _CpyPara aPara( pTblNd, 1, aCpyFmt, bCpyNds );
-    aPara.nNewSize = aPara.nOldSize = GetFrmFmt()->GetFrmSize().GetWidth();
+    _CpyTabFrms aCpyFormat;
+    _CpyPara aPara( pTableNd, 1, aCpyFormat, bCpyNds );
+    aPara.nNewSize = aPara.nOldSize = GetFrameFormat()->GetFrmSize().GetWidth();
 
     if( IsNewModel() )
         lcl_CalcNewWidths( aFndBox.GetLines(), aPara );
@@ -2132,7 +2132,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         if( USHRT_MAX != nLnPos && nLnPos )
         {
             // There is a Line before it
-            SwCollectTblLineBoxes aLnPara( false, HEADLINE_BORDERCOPY );
+            SwCollectTableLineBoxes aLnPara( false, HEADLINE_BORDERCOPY );
 
             pLn = GetTabLines()[ nLnPos - 1 ];
             for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
@@ -2143,10 +2143,10 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
                                 lcl_GetLineWidth( *pFndLn )) )
             {
                 aLnPara.SetValues( true );
-                pLn = pNewTbl->GetTabLines()[ 0 ];
+                pLn = pNewTable->GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aLnPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aLnPara );
             }
         }
 
@@ -2157,7 +2157,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         if( nLnPos < GetTabLines().size() - 1 )
         {
             // There is a Line following it
-            SwCollectTblLineBoxes aLnPara( true, HEADLINE_BORDERCOPY );
+            SwCollectTableLineBoxes aLnPara( true, HEADLINE_BORDERCOPY );
 
             pLn = GetTabLines()[ nLnPos + 1 ];
             for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
@@ -2168,24 +2168,24 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
                                 lcl_GetLineWidth( *pFndLn )) )
             {
                 aLnPara.SetValues( false );
-                pLn = pNewTbl->GetTabLines().back();
+                pLn = pNewTable->GetTabLines().back();
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aLnPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aLnPara );
             }
         }
     }
 
     // We need to delete the initial Box
-    _DeleteBox( *pNewTbl, pNewTbl->GetTabLines().back()->GetTabBoxes()[0],
+    _DeleteBox( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0],
                 0, false, false );
 
-    if( pNewTbl->IsNewModel() )
-        lcl_CheckRowSpan( *pNewTbl );
+    if( pNewTable->IsNewModel() )
+        lcl_CheckRowSpan( *pNewTable );
     // Clean up
-    pNewTbl->GCLines();
+    pNewTable->GCLines();
 
-    pTblNd->MakeFrms( &aIdx );  // re-generate the Frames
+    pTableNd->MakeFrms( &aIdx );  // re-generate the Frames
 
     CHECKTABLELAYOUT
 
@@ -2193,8 +2193,8 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
-                     const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableLine::FindNextBox( const SwTable& rTable,
+                     const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     const SwTableLine* pLine = this;            // for M800
     SwTableBox* pBox;
@@ -2215,17 +2215,17 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
         OSL_ENSURE( USHRT_MAX != nFndPos, "Line is not in the Table" );
         // Is there another Line?
         if( nFndPos+1 >= (sal_uInt16)GetUpper()->GetTabLines().size() )
-            return GetUpper()->GetUpper()->FindNextBox( rTbl, GetUpper(), bOvrTblLns );
+            return GetUpper()->GetUpper()->FindNextBox( rTable, GetUpper(), bOvrTableLns );
         pLine = GetUpper()->GetTabLines()[nFndPos+1];
     }
-    else if( bOvrTblLns )       // Over a Table's the "BaseLines"??
+    else if( bOvrTableLns )       // Over a Table's the "BaseLines"??
     {
         // Search for the next Line in the Table
-        nFndPos = rTbl.GetTabLines().GetPos( pLine );
-        if( nFndPos + 1 >= (sal_uInt16)rTbl.GetTabLines().size() )
+        nFndPos = rTable.GetTabLines().GetPos( pLine );
+        if( nFndPos + 1 >= (sal_uInt16)rTable.GetTabLines().size() )
             return 0;           // there are no more Boxes
 
-        pLine = rTbl.GetTabLines()[ nFndPos+1 ];
+        pLine = rTable.GetTabLines()[ nFndPos+1 ];
     }
     else
         return 0;
@@ -2237,12 +2237,12 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
             pBox = pBox->GetTabLines().front()->GetTabBoxes().front();
         return pBox;
     }
-    return pLine->FindNextBox( rTbl, 0, bOvrTblLns );
+    return pLine->FindNextBox( rTable, 0, bOvrTableLns );
 }
 
 // Find the previous Box from this Line
-SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     const SwTableLine* pLine = this;            // for M800
     SwTableBox* pBox;
@@ -2266,17 +2266,17 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
         OSL_ENSURE( USHRT_MAX != nFndPos, "Line is not in the Table" );
         // Is there another Line?
         if( !nFndPos )
-            return GetUpper()->GetUpper()->FindPreviousBox( rTbl, GetUpper(), bOvrTblLns );
+            return GetUpper()->GetUpper()->FindPreviousBox( rTable, GetUpper(), bOvrTableLns );
         pLine = GetUpper()->GetTabLines()[nFndPos-1];
     }
-    else if( bOvrTblLns )       // Over a Table's the "BaseLines"??
+    else if( bOvrTableLns )       // Over a Table's the "BaseLines"??
     {
         // Search for the next Line in the Table
-        nFndPos = rTbl.GetTabLines().GetPos( pLine );
+        nFndPos = rTable.GetTabLines().GetPos( pLine );
         if( !nFndPos )
             return 0;           // there are no more Boxes
 
-        pLine = rTbl.GetTabLines()[ nFndPos-1 ];
+        pLine = rTable.GetTabLines()[ nFndPos-1 ];
     }
     else
         return 0;
@@ -2291,28 +2291,28 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
         }
         return pBox;
     }
-    return pLine->FindPreviousBox( rTbl, 0, bOvrTblLns );
+    return pLine->FindPreviousBox( rTable, 0, bOvrTableLns );
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableBox::FindNextBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableBox::FindNextBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     if( !pSrchBox  && GetTabLines().empty() )
         return const_cast<SwTableBox*>(this);
-    return GetUpper()->FindNextBox( rTbl, pSrchBox ? pSrchBox : this,
-                                        bOvrTblLns );
+    return GetUpper()->FindNextBox( rTable, pSrchBox ? pSrchBox : this,
+                                        bOvrTableLns );
 
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     if( !pSrchBox && GetTabLines().empty() )
         return const_cast<SwTableBox*>(this);
-    return GetUpper()->FindPreviousBox( rTbl, pSrchBox ? pSrchBox : this,
-                                        bOvrTblLns );
+    return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this,
+                                        bOvrTableLns );
 }
 
 static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox )
@@ -2346,7 +2346,7 @@ static SwTwips lcl_GetDistance( SwTableBox* pBox, bool bLeft )
         bFirst = false;
 
         while( nStt < nPos )
-            nRet += pLine->GetTabBoxes()[ nStt++ ]->GetFrmFmt()
+            nRet += pLine->GetTabBoxes()[ nStt++ ]->GetFrameFormat()
                             ->GetFrmSize().GetWidth();
         pBox = pLine->GetUpper();
     }
@@ -2359,8 +2359,8 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
         bool bGreaterBox = false;
 
@@ -2411,7 +2411,7 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                             - rParam.nSide ) < COLFUZZY ))
             {
                 // This column contains the Cursor - so decrease/increase
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
 
                 if( !nLowerDiff )
                 {
@@ -2433,7 +2433,7 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     aNew.SetWidth( nWidth + nLowerDiff );
                 else
                     aNew.SetWidth( nWidth - nLowerDiff );
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
                 break;
             }
         }
@@ -2457,8 +2457,8 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         if( bCheck )
@@ -2508,7 +2508,7 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                          : nDist >= rParam.nSide - COLFUZZY)
                  ) )
             {
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
 
                 if( !nLowerDiff )
                 {
@@ -2530,7 +2530,7 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                 else
                     aNew.SetWidth( nWidth + nLowerDiff );
 
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
             }
         }
 
@@ -2549,8 +2549,8 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     for( sal_uInt16 n = 0; n < rBoxes.size(); ++n )
     {
         SwTableBox* pBox = rBoxes[ n ];
-        SwTableBoxFmt* pFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwTableBoxFormat* pFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         int nCmp {0};
@@ -2572,7 +2572,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
             if( nCmp )
             {
                 rParam.bAnyBoxFnd = true;
-                if( pFmt->GetProtect().IsCntntProtected() )
+                if( pFormat->GetProtect().IsContentProtected() )
                     return false;
 
                 if( rParam.bSplittBox &&
@@ -2617,9 +2617,9 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     if( !rParam.bSplittBox )
                     {
                         // the current Box on
-                        SwFmtFrmSize aNew( rSz );
+                        SwFormatFrmSize aNew( rSz );
                         aNew.SetWidth( nWidth + rParam.nDiff );
-                        rParam.aShareFmts.SetSize( *pBox, aNew );
+                        rParam.aShareFormats.SetSize( *pBox, aNew );
                     }
                 }
                 else
@@ -2629,32 +2629,32 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     if( !rParam.bLeft && 3 != nCmp )
                         ++n;
 
-                    ::_InsTblBox( pFmt->GetDoc(), rParam.pTblNd,
-                                        pLine, pFmt, pBox, n );
+                    ::_InsTableBox( pFormat->GetDoc(), rParam.pTableNd,
+                                        pLine, pFormat, pBox, n );
 
                     SwTableBox* pNewBox = rBoxes[ n ];
-                    SwFmtFrmSize aNew( rSz );
+                    SwFormatFrmSize aNew( rSz );
                     aNew.SetWidth( rParam.nDiff );
-                    rParam.aShareFmts.SetSize( *pNewBox, aNew );
+                    rParam.aShareFormats.SetSize( *pNewBox, aNew );
 
                     // Special case: There is no space in the other Boxes, but in the Cell
                     if( rParam.bSplittBox )
                     {
                         // the current Box on
-                        SwFmtFrmSize aNewSize( rSz );
+                        SwFormatFrmSize aNewSize( rSz );
                         aNewSize.SetWidth( nWidth - rParam.nDiff );
-                        rParam.aShareFmts.SetSize( *pBox, aNewSize );
+                        rParam.aShareFormats.SetSize( *pBox, aNewSize );
                     }
 
                     // Special treatment for the Border
                     // The right one needs to be removed
                     {
-                        const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+                        const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
                         if( rBoxItem.GetRight() )
                         {
                             SvxBoxItem aTmp( rBoxItem );
                             aTmp.SetLine( 0, SvxBoxItemLine::RIGHT );
-                            rParam.aShareFmts.SetAttr( rParam.bLeft
+                            rParam.aShareFormats.SetAttr( rParam.bLeft
                                                             ? *pNewBox
                                                             : *pBox, aTmp );
                         }
@@ -2691,12 +2691,12 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
         SwTwips nTmpDist = nDist;
         for( auto pBox : rBoxes )
         {
-            SwTwips nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            SwTwips nWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
             if( (nTmpDist + nWidth / 2 ) > rParam.nSide )
             {
                 rParam.nRemainWidth = rParam.bLeft
                                         ? sal_uInt16(nTmpDist)
-                                        : sal_uInt16(rParam.nTblWidth - nTmpDist);
+                                        : sal_uInt16(rParam.nTableWidth - nTmpDist);
                 break;
             }
             nTmpDist += nWidth;
@@ -2706,8 +2706,8 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     for( SwTableBoxes::size_type n = 0; n < rBoxes.size(); ++n )
     {
         SwTableBox* pBox = rBoxes[ n ];
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         if( bCheck )
@@ -2721,7 +2721,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                 (TBLFIX_CHGABS != rParam.nMode ||
                                 (n < rBoxes.size() &&
                                   (nDist + nWidth + rBoxes[ n+1 ]->
-                                   GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+                                   GetFrameFormat()->GetFrmSize().GetWidth() / 2)
                                   > rParam.nSide) ))
                              : (nDist + nWidth / 2 ) > rParam.nSide
                 )
@@ -2754,7 +2754,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                             pTmpBox = pTmpBox->GetUpper()->GetUpper();
                             nBoxPos = pTmpBox->GetUpper()->GetTabBoxes().GetPos( pTmpBox );
                         }
-                        nTmpWidth = pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                        nTmpWidth = pTmpBox->GetFrameFormat()->GetFrmSize().GetWidth();
                     }
 
                     if( nTmpWidth < nDiff || nTmpWidth - nDiff < MINLAY )
@@ -2781,7 +2781,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                 (TBLFIX_CHGABS != rParam.nMode ||
                                 (n < rBoxes.size() &&
                                   (nDist + nWidth + rBoxes[ n+1 ]->
-                                   GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+                                   GetFrameFormat()->GetFrmSize().GetWidth() / 2)
                                   > rParam.nSide) ))
                               : (nDist + nWidth / 2 ) > rParam.nSide ))
             {
@@ -2798,14 +2798,14 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                         nLowerDiff = rParam.nDiff;
                 }
 
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
                 rParam.nLowerDiff += nLowerDiff;
 
                 if( rParam.bBigger )
                     aNew.SetWidth( nWidth - nLowerDiff );
                 else
                     aNew.SetWidth( nWidth + nLowerDiff );
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
 
                 if( TBLFIX_CHGABS == rParam.nMode )
                     break;
@@ -2869,7 +2869,7 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
     SwTwips nBoxWidth = 0;
 
     for( auto n = rBoxes.size(); n; )
-        nBoxWidth += rBoxes[ --n ]->GetFrmFmt()->GetFrmSize().GetWidth();
+        nBoxWidth += rBoxes[ --n ]->GetFrameFormat()->GetFrmSize().GetWidth();
 
     if( COLFUZZY < std::abs( nWidth - nBoxWidth ))
     {
@@ -2877,13 +2877,13 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
         for( auto n = rBoxes.size(); n; )
         {
             SwTableBox* pBox = rBoxes[ --n ];
-            SwFmtFrmSize aNew( pBox->GetFrmFmt()->GetFrmSize() );
+            SwFormatFrmSize aNew( pBox->GetFrameFormat()->GetFrmSize() );
             long nDiff = aNew.GetWidth();
             nDiff *= nWidth;
             nDiff /= nBoxWidth;
             aNew.SetWidth( nDiff );
 
-            rParam.aShareFmts.SetSize( *pBox, aNew );
+            rParam.aShareFormats.SetSize( *pBox, aNew );
 
             if( !pBox->GetSttNd() )
             {
@@ -2897,7 +2897,7 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
 }
 
 static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
-                    const SwFmtFrmSize& rOldSz,
+                    const SwFormatFrmSize& rOldSz,
                     sal_uInt16& rDelWidth, SwTwips nDist )
 {
     long nDiff = 0;
@@ -2917,7 +2917,7 @@ static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
             if( rParam.bLeft )
                 rParam.nRemainWidth = sal_uInt16(nDist);
             else
-                rParam.nRemainWidth = sal_uInt16(rParam.nTblWidth - nDist);
+                rParam.nRemainWidth = sal_uInt16(rParam.nTableWidth - nDist);
         }
 
         // Calculate relatively
@@ -2944,9 +2944,9 @@ static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
 
     if( bSetSize )
     {
-        SwFmtFrmSize aNew( rOldSz );
+        SwFormatFrmSize aNew( rOldSz );
         aNew.SetWidth( aNew.GetWidth() + nDiff );
-        rParam.aShareFmts.SetSize( rBox, aNew );
+        rParam.aShareFormats.SetSize( rBox, aNew );
 
         // Change the Lower once again
         for( auto i = rBox.GetTabLines().size(); i; )
@@ -2964,7 +2964,7 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox,
         if( bCheck )
         {
             rParam.bAnyBoxFnd = true;
-            if( rBox.GetFrmFmt()->GetProtect().IsCntntProtected() )
+            if( rBox.GetFrameFormat()->GetProtect().IsContentProtected() )
                 bRet = false;
             else
             {
@@ -2973,8 +2973,8 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox,
             }
         }
         else
-            ::_DeleteBox( rParam.pTblNd->GetTable(), &rBox,
-                            rParam.pUndo, false, true, &rParam.aShareFmts );
+            ::_DeleteBox( rParam.pTableNd->GetTable(), &rBox,
+                            rParam.pUndo, false, true, &rParam.aShareFormats );
     }
     else
     {
@@ -3026,8 +3026,8 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
         else
             pBox = rBoxes[ n++ ];
 
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         long nWidth = rSz.GetWidth();
         bool bDelBox = false, bChgLowers = false;
 
@@ -3117,13 +3117,13 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                         nDelWidth != rParam.nBoxWidth ) &&
                      COLFUZZY > std::abs( rParam.bLeft
                                     ? nWidth - nDist
-                                    : (nDist + nWidth - rParam.nTblWidth )))
+                                    : (nDist + nWidth - rParam.nTableWidth )))
                     || !::lcl_DeleteBox_Recursive(rParam, *pBox, bCheck))
                 {
                     return false;
                 }
 
-                if( pFmt->GetProtect().IsCntntProtected() )
+                if( pFormat->GetProtect().IsContentProtected() )
                     return false;
             }
             else
@@ -3190,7 +3190,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                 else
                 {
                     // Or else we need to adapt the Box's size
-                    SwFmtFrmSize aNew( rSz );
+                    SwFormatFrmSize aNew( rSz );
                     bool bCorrRel = false;
 
                     if( TBLVAR_CHGABS != rParam.nMode )
@@ -3233,7 +3233,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                             if( rParam.bLeft )
                                 rParam.nRemainWidth = sal_uInt16(nDist - nLowerDiff);
                             else
-                                rParam.nRemainWidth = sal_uInt16(rParam.nTblWidth - nDist
+                                rParam.nRemainWidth = sal_uInt16(rParam.nTableWidth - nDist
                                                                 - nLowerDiff );
                         }
 
@@ -3245,7 +3245,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                     }
                     else
                         aNew.SetWidth( aNew.GetWidth() - nLowerDiff );
-                    rParam.aShareFmts.SetSize( *pBox, aNew );
+                    rParam.aShareFormats.SetSize( *pBox, aNew );
 
                     if( bCorrLowers )
                     {
@@ -3278,12 +3278,12 @@ static void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFmtFrmSize aSz( pBox->GetFrmFmt()->GetFrmSize() );
+        SwFormatFrmSize aSz( pBox->GetFrameFormat()->GetFrmSize() );
         SwTwips nWidth = aSz.GetWidth();
         nWidth *= rParam.nDiff;
         nWidth /= rParam.nMaxSize;
         aSz.SetWidth( nWidth );
-        rParam.aShareFmts.SetSize( *pBox, aSz );
+        rParam.aShareFormats.SetSize( *pBox, aSz );
 
         for( auto pLn : pBox->GetTabLines() )
             ::lcl_AjustLines( pLn, rParam );
@@ -3300,7 +3300,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
     for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); ++i)
     {
         const SwTableBox* pBox = *i;
-        const SwTwips nBoxW = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        const SwTwips nBoxW = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         nAktSize += nBoxW;
 
         for( auto pLn : pBox->GetTabLines() )
@@ -3319,42 +3319,42 @@ static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst, SwTwips nDistStt )
 {
     // Find all Boxes/Lines
-    SwTable& rTbl = rParam.pTblNd->GetTable();
+    SwTable& rTable = rParam.pTableNd->GetTable();
 
     if (rParam.m_Boxes.empty())
     {
         // Get the Boxes
         if( rParam.bBigger )
-            for( auto pLn : rTbl.GetTabLines() )
+            for( auto pLn : rTable.GetTabLines() )
                 ::lcl_DelSelBox( pLn, rParam, nDistStt, true );
         else
-            for( auto pLn : rTbl.GetTabLines() )
+            for( auto pLn : rTable.GetTabLines() )
                 ::lcl_InsSelBox( pLn, rParam, nDistStt, true );
     }
 
     // Prevent deleting the whole Table
     if (rParam.bBigger
-        && rParam.m_Boxes.size() == rTbl.GetTabSortBoxes().size())
+        && rParam.m_Boxes.size() == rTable.GetTabSortBoxes().size())
     {
         return 0;
     }
 
     _FndBox* pFndBox = new _FndBox( 0, 0 );
     if( rParam.bBigger )
-        pFndBox->SetTableLines( rParam.m_Boxes, rTbl );
+        pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
         _FndPara aPara(rParam.m_Boxes, pFndBox);
-        ForEach_FndLineCopyCol( rTbl.GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes" );
-        pFndBox->SetTableLines( rTbl );
+        pFndBox->SetTableLines( rTable );
 
         if( ppUndo )
-            rTmpLst.insert( rTbl.GetTabSortBoxes() );
+            rTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     // Find Lines for the Layout update
-    pFndBox->DelFrms( rTbl );
+    pFndBox->DelFrms( rTable );
 
     // TL_CHART2: this function gest called from SetColWidth exclusively,
     // thus it is currently speculated that nothing needs to be done here.
@@ -3368,16 +3368,16 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 {
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    const SwFmtFrmSize& rSz = GetFrmFmt()->GetFrmSize();
-    const SvxLRSpaceItem& rLR = GetFrmFmt()->GetLRSpace();
+    const SwFormatFrmSize& rSz = GetFrameFormat()->GetFrmSize();
+    const SvxLRSpaceItem& rLR = GetFrameFormat()->GetLRSpace();
 
     boost::scoped_ptr<_FndBox> xFndBox;                // for insertion/deletion
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
-        bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff ),
-        bInsDel = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL );
+        bLeft = nsTableChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff ),
+        bInsDel = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL );
     sal_uInt16 n;
     sal_uLong nBoxIdx = rAktBox.GetSttIdx();
 
@@ -3397,7 +3397,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
         {
             fnSelBox = lcl_DelSelBox;
             fnOtherBox = lcl_DelOtherBox;
-            aParam.nBoxWidth = (sal_uInt16)rAktBox.GetFrmFmt()->GetFrmSize().GetWidth();
+            aParam.nBoxWidth = (sal_uInt16)rAktBox.GetFrameFormat()->GetFrmSize().GetWidth();
             if( bLeft )
                 nDistStt = rSz.GetWidth();
         }
@@ -3415,9 +3415,9 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_COL_RIGHT:
-    case nsTblChgWidthHeightType::WH_COL_LEFT:
-        if( TBLVAR_CHGABS == eTblChgMode )
+    case nsTableChgWidthHeightType::WH_COL_RIGHT:
+    case nsTableChgWidthHeightType::WH_COL_LEFT:
+        if( TBLVAR_CHGABS == eTableChgMode )
         {
             if( bInsDel )
                 bBigger = !bBigger;
@@ -3426,7 +3426,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
             bool bChgLRSpace = true;
             if( bBigger )
             {
-                if( GetFrmFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
+                if( GetFrameFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
                     !rSz.GetWidthPercent() )
                 {
                     bRet = rSz.GetWidth() < USHRT_MAX - nRelDiff;
@@ -3448,12 +3448,12 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( !bRet )
                 {
                     // Then call itself recursively; only with another mode (proportional)
-                    TblChgMode eOld = eTblChgMode;
-                    eTblChgMode = TBLFIX_CHGPROP;
+                    TableChgMode eOld = eTableChgMode;
+                    eTableChgMode = TBLFIX_CHGPROP;
 
                     bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff,
                                         ppUndo );
-                    eTblChgMode = eOld;
+                    eTableChgMode = eOld;
                     return bRet;
                 }
             }
@@ -3481,7 +3481,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         aParam.m_Boxes.size() == m_TabSortContentBoxes.size())
                     {
                         // This whole Table is to be deleted!
-                        GetFrmFmt()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
+                        GetFrameFormat()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
                         return false;
                     }
 
@@ -3491,11 +3491,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 long nFrmWidth = LONG_MAX;
                 LockModify();
-                SwFmtFrmSize aSz( rSz );
+                SwFormatFrmSize aSz( rSz );
                 SvxLRSpaceItem aLR( rLR );
                 if( bBigger )
                 {
@@ -3504,7 +3504,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     {
                         // Break down to USHRT_MAX / 2
                         CR_SetBoxWidth aTmpPara( 0, aSz.GetWidth() / 2,
-                                        0, aSz.GetWidth(), aSz.GetWidth(), aParam.pTblNd );
+                                        0, aSz.GetWidth(), aSz.GetWidth(), aParam.pTableNd );
                         for( sal_uInt16 nLn = 0; nLn < aLines.size(); ++nLn )
                             ::lcl_AjustLines( aLines[ nLn ], aTmpPara );
                         aSz.SetWidth( aSz.GetWidth() / 2 );
@@ -3524,23 +3524,23 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     aLR.SetRight( sal_uInt16( aLR.GetRight() + nAbsDiff ) );
 
                 if( bChgLRSpace )
-                    GetFrmFmt()->SetFmtAttr( aLR );
-                const SwFmtHoriOrient& rHOri = GetFrmFmt()->GetHoriOrient();
+                    GetFrameFormat()->SetFormatAttr( aLR );
+                const SwFormatHoriOrient& rHOri = GetFrameFormat()->GetHoriOrient();
                 if( text::HoriOrientation::FULL == rHOri.GetHoriOrient() ||
                     (text::HoriOrientation::LEFT == rHOri.GetHoriOrient() && aLR.GetLeft()) ||
                     (text::HoriOrientation::RIGHT == rHOri.GetHoriOrient() && aLR.GetRight()))
                 {
-                    SwFmtHoriOrient aHOri( rHOri );
+                    SwFormatHoriOrient aHOri( rHOri );
                     aHOri.SetHoriOrient( text::HoriOrientation::NONE );
-                    GetFrmFmt()->SetFmtAttr( aHOri );
+                    GetFrameFormat()->SetFormatAttr( aHOri );
 
                     // If the Table happens to contain relative values (USHORT_MAX),
                     // we need to convert them to absolute ones now.
                     // Bug 61494
-                    if( GetFrmFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
+                    if( GetFrameFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
                         !rSz.GetWidthPercent() )
                     {
-                        SwTabFrm* pTabFrm = SwIterator<SwTabFrm,SwFmt>( *GetFrmFmt() ).First();
+                        SwTabFrm* pTabFrm = SwIterator<SwTabFrm,SwFormat>( *GetFrameFormat() ).First();
                         if( pTabFrm &&
                             pTabFrm->Prt().Width() != rSz.GetWidth() )
                         {
@@ -3562,8 +3562,8 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     aSz.SetWidthPercent( static_cast<sal_uInt8>(( aSz.GetWidth() * 100 ) /
                         ( aSz.GetWidth() + aLR.GetRight() + aLR.GetLeft())));
 
-                GetFrmFmt()->SetFmtAttr( aSz );
-                aParam.nTblWidth = sal_uInt16( aSz.GetWidth() );
+                GetFrameFormat()->SetFormatAttr( aSz );
+                aParam.nTableWidth = sal_uInt16( aSz.GetWidth() );
 
                 UnlockModify();
 
@@ -3579,9 +3579,9 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 // Bug 61494
                 if( LONG_MAX != nFrmWidth )
                 {
-                    SwFmtFrmSize aAbsSz( aSz );
+                    SwFormatFrmSize aAbsSz( aSz );
                     aAbsSz.SetWidth( nFrmWidth );
-                    GetFrmFmt()->SetFmtAttr( aAbsSz );
+                    GetFrameFormat()->SetFormatAttr( aAbsSz );
                 }
             }
         }
@@ -3589,7 +3589,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 ( bLeft ? nDist != 0 : std::abs( rSz.GetWidth() - nDist ) > COLFUZZY ) )
         {
             bRet = true;
-            if( bLeft && TBLFIX_CHGABS == eTblChgMode && !bInsDel )
+            if( bLeft && TBLFIX_CHGABS == eTableChgMode && !bInsDel )
                 aParam.bBigger = !bBigger;
 
             // First test if we have room at all
@@ -3625,7 +3625,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                             bRet = false;
                     }
 
-                    if( !bRet && rAktBox.GetFrmFmt()->GetFrmSize().GetWidth()
+                    if( !bRet && rAktBox.GetFrameFormat()->GetFrmSize().GetWidth()
                         - nRelDiff > COLFUZZY +
                             ( 567 / 2 /*leave room for at least 0.5 cm*/) )
                     {
@@ -3685,11 +3685,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 if( bInsDel
-                    ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
-                    : ( TBLFIX_CHGABS != eTblChgMode && bLeft ) )
+                    ? ( TBLFIX_CHGABS == eTableChgMode ? (bBigger && bLeft) : bLeft )
+                    : ( TBLFIX_CHGABS != eTableChgMode && bLeft ) )
                 {
                     for( n = aLines.size(); n; )
                     {
@@ -3715,23 +3715,23 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
         }
         break;
 
-    case nsTblChgWidthHeightType::WH_CELL_RIGHT:
-    case nsTblChgWidthHeightType::WH_CELL_LEFT:
-        if( TBLVAR_CHGABS == eTblChgMode )
+    case nsTableChgWidthHeightType::WH_CELL_RIGHT:
+    case nsTableChgWidthHeightType::WH_CELL_LEFT:
+        if( TBLVAR_CHGABS == eTableChgMode )
         {
             // Then call itself recursively; only with another mode (proportional)
-            TblChgMode eOld = eTblChgMode;
-            eTblChgMode = TBLFIX_CHGABS;
+            TableChgMode eOld = eTableChgMode;
+            eTableChgMode = TBLFIX_CHGABS;
 
             bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff,
                                 ppUndo );
-            eTblChgMode = eOld;
+            eTableChgMode = eOld;
             return bRet;
         }
         else if( bInsDel || ( bLeft ? nDist != 0
                                     : (rSz.GetWidth() - nDist) > COLFUZZY ))
         {
-            if( bLeft && TBLFIX_CHGABS == eTblChgMode && !bInsDel )
+            if( bLeft && TBLFIX_CHGABS == eTableChgMode && !bInsDel )
                 aParam.bBigger = !bBigger;
 
             // First, see if there is enough room at all
@@ -3755,7 +3755,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( bLeft )
                     aParam.nMaxSize = aParam.nSide;
                 else
-                    aParam.nMaxSize = pLine->GetUpper()->GetFrmFmt()->
+                    aParam.nMaxSize = pLine->GetUpper()->GetFrameFormat()->
                                     GetFrmSize().GetWidth() - aParam.nSide;
             }
 
@@ -3771,7 +3771,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         bRet = false;
                 }
 
-                if( !bRet && !aParam.bBigger && rAktBox.GetFrmFmt()->
+                if( !bRet && !aParam.bBigger && rAktBox.GetFrameFormat()->
                     GetFrmSize().GetWidth() - nRelDiff > COLFUZZY +
                         ( 567 / 2 /*leave room for at least 0.5 cm*/) )
                 {
@@ -3800,11 +3800,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 if( bInsDel
-                    ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
-                    : ( TBLFIX_CHGABS != eTblChgMode && bLeft ) )
+                    ? ( TBLFIX_CHGABS == eTableChgMode ? (bBigger && bLeft) : bLeft )
+                    : ( TBLFIX_CHGABS != eTableChgMode && bLeft ) )
                 {
                     (*fnSelBox)( pLine, aParam, nDistStt, false );
                     (*fnOtherBox)( pLine, aParam1, nDistStt, false );
@@ -3837,10 +3837,10 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 
         if( ppUndo && *ppUndo )
         {
-            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTblChgMode), eType,
+            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTableChgMode), eType,
                                             nAbsDiff, nRelDiff );
             if( !aParam.bBigger )
-                aParam.pUndo->SaveNewBoxes( *aParam.pTblNd, aTmpLst );
+                aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
         }
     }
 
@@ -3857,33 +3857,33 @@ static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst )
 {
     // Find all Boxes/Lines
-    SwTable& rTbl = rParam.pTblNd->GetTable();
+    SwTable& rTable = rParam.pTableNd->GetTable();
 
     OSL_ENSURE( !rParam.m_Boxes.empty(), "We can't go on without Boxes!" );
 
     // Prevent deleting the whole Table
     if (!rParam.bBigger
-        && rParam.m_Boxes.size() == rTbl.GetTabSortBoxes().size())
+        && rParam.m_Boxes.size() == rTable.GetTabSortBoxes().size())
     {
         return 0;
     }
 
     _FndBox* pFndBox = new _FndBox( 0, 0 );
     if( !rParam.bBigger )
-        pFndBox->SetTableLines( rParam.m_Boxes, rTbl );
+        pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
         _FndPara aPara(rParam.m_Boxes, pFndBox);
-        ForEach_FndLineCopyCol( rTbl.GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes?" );
-        pFndBox->SetTableLines( rTbl );
+        pFndBox->SetTableLines( rTable );
 
         if( ppUndo )
-            rTmpLst.insert( rTbl.GetTabSortBoxes() );
+            rTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     // Find Lines for the Layout update
-    pFndBox->DelFrms( rTbl );
+    pFndBox->DelFrms( rTable );
 
     // TL_CHART2: it is currently unclear if sth has to be done here.
 
@@ -3896,7 +3896,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
     SwLayoutFrm* pLineFrm = GetRowFrm( rLine );
     OSL_ENSURE( pLineFrm, "Where is the Frame from the SwTableLine?" );
 
-    SwFrmFmt* pFmt = rLine.ClaimFrmFmt();
+    SwFrameFormat* pFormat = rLine.ClaimFrameFormat();
 
     SwTwips nMyNewH, nMyOldH = pLineFrm->Frm().Height();
     if( !nOldHeight )                       // the BaseLine and absolute
@@ -3915,7 +3915,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
         ( nMyOldH - nMyNewH ) > ( CalcRowRstHeight( pLineFrm ) + ROWFUZZY ))
         eSize = ATT_FIX_SIZE;
 
-    pFmt->SetFmtAttr( SwFmtFrmSize( eSize, 0, nMyNewH ) );
+    pFormat->SetFormatAttr( SwFormatFrmSize( eSize, 0, nMyNewH ) );
 
     // First adapt all internal ones
     for( auto pBox : rLine.GetTabBoxes() )
@@ -4004,39 +4004,39 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
     if( !bCheck )
     {
         SwTableBoxes& rBoxes = pLine->GetTabBoxes();
-        SwDoc* pDoc = pLine->GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = pLine->GetFrameFormat()->GetDoc();
         if( !rParam.bBigger )
         {
             for (size_t n = rBoxes.size(); n; )
             {
-                ::lcl_SaveUpperLowerBorder( rParam.pTblNd->GetTable(),
+                ::lcl_SaveUpperLowerBorder( rParam.pTableNd->GetTable(),
                                                     *rBoxes[ --n ],
-                                                    rParam.aShareFmts );
+                                                    rParam.aShareFormats );
             }
             for (size_t n = rBoxes.size(); n; )
             {
-                ::_DeleteBox( rParam.pTblNd->GetTable(),
+                ::_DeleteBox( rParam.pTableNd->GetTable(),
                                     rBoxes[ --n ], rParam.pUndo, false,
-                                    false, &rParam.aShareFmts );
+                                    false, &rParam.aShareFormats );
             }
         }
         else
         {
             // Insert Line
-            SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFmt*>(pLine->GetFrmFmt()),
+            SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFormat*>(pLine->GetFrameFormat()),
                                         rBoxes.size(), pLine->GetUpper() );
             SwTableLines* pLines;
             if( pLine->GetUpper() )
                 pLines = &pLine->GetUpper()->GetTabLines();
             else
-                pLines = &rParam.pTblNd->GetTable().GetTabLines();
+                pLines = &rParam.pTableNd->GetTable().GetTabLines();
             sal_uInt16 nPos = pLines->GetPos( pLine );
             if( !rParam.bTop )
                 ++nPos;
             pLines->insert( pLines->begin() + nPos, pNewLine );
 
-            SwFrmFmt* pNewFmt = pNewLine->ClaimFrmFmt();
-            pNewFmt->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nDist ) );
+            SwFrameFormat* pNewFormat = pNewLine->ClaimFrameFormat();
+            pNewFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nDist ) );
 
             // And once again calculate the Box count
             SwTableBoxes& rNewBoxes = pNewLine->GetTabBoxes();
@@ -4047,28 +4047,28 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
                 if( !pOld->GetSttNd() )
                 {
                     // Not a normal content Box, so fall back to the 1st next Box
-                    nWidth = pOld->GetFrmFmt()->GetFrmSize().GetWidth();
+                    nWidth = pOld->GetFrameFormat()->GetFrmSize().GetWidth();
                     while( !pOld->GetSttNd() )
                         pOld = pOld->GetTabLines()[ 0 ]->GetTabBoxes()[ 0 ];
                 }
-                ::_InsTblBox( pDoc, rParam.pTblNd, pNewLine,
-                                    static_cast<SwTableBoxFmt*>(pOld->GetFrmFmt()), pOld, n );
+                ::_InsTableBox( pDoc, rParam.pTableNd, pNewLine,
+                                    static_cast<SwTableBoxFormat*>(pOld->GetFrameFormat()), pOld, n );
 
                 // Special treatment for the border:
                 // The top one needs to be removed
-                const SvxBoxItem& rBoxItem = pOld->GetFrmFmt()->GetBox();
+                const SvxBoxItem& rBoxItem = pOld->GetFrameFormat()->GetBox();
                 if( rBoxItem.GetTop() )
                 {
                     SvxBoxItem aTmp( rBoxItem );
                     aTmp.SetLine( 0, SvxBoxItemLine::TOP );
-                    rParam.aShareFmts.SetAttr( rParam.bTop
+                    rParam.aShareFormats.SetAttr( rParam.bTop
                                                 ? *pOld
                                                 : *rNewBoxes[ n ], aTmp );
                 }
 
                 if( nWidth )
-                    rParam.aShareFmts.SetAttr( *rNewBoxes[ n ],
-                                SwFmtFrmSize( ATT_FIX_SIZE, nWidth, 0 ) );
+                    rParam.aShareFormats.SetAttr( *rNewBoxes[ n ],
+                                SwFormatFrmSize( ATT_FIX_SIZE, nWidth, 0 ) );
             }
         }
     }
@@ -4079,7 +4079,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
         for( auto n = rBoxes.size(); n; )
         {
             SwTableBox* pBox = rBoxes[ --n ];
-            if( pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+            if( pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
                 return false;
 
             if( pBox->GetSttNd() )
@@ -4110,9 +4110,9 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
-        bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff ),
-        bInsDel = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL );
+        bTop = nsTableChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff ),
+        bInsDel = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL );
     sal_uInt16 nBaseLinePos = GetTabLines().GetPos( pBaseLine );
     sal_uLong nBoxIdx = rAktBox.GetSttIdx();
 
@@ -4131,8 +4131,8 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     // How do we get to the height?
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_CELL_TOP:
-    case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
+    case nsTableChgWidthHeightType::WH_CELL_TOP:
+    case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
         if( pLine == pBaseLine )
             break;  // it doesn't work then!
 
@@ -4142,15 +4142,15 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
         pBaseLine = pLine;
         // no break!
 
-    case nsTblChgWidthHeightType::WH_ROW_TOP:
-    case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
+    case nsTableChgWidthHeightType::WH_ROW_TOP:
+    case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
         {
             if( bInsDel && !bBigger )       // By how much does it get higher?
             {
                 nAbsDiff = GetRowFrm( *pBaseLine )->Frm().Height();
             }
 
-            if( TBLVAR_CHGABS == eTblChgMode )
+            if( TBLVAR_CHGABS == eTableChgMode )
             {
                 // First test if we have room at all
                 if( bBigger )
@@ -4175,7 +4175,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                         if( !bBigger &&
                             aParam.m_Boxes.size() == m_TabSortContentBoxes.size())
                         {
-                            GetFrmFmt()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
+                            GetFrameFormat()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
                             return false;
                         }
 
@@ -4185,7 +4185,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                        *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                     (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
                                     nAbsDiff, false );
@@ -4202,7 +4202,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                     nStt = nBaseLinePos + 1, nEnd = pLines->size();
 
                 // Get the current Lines' height
-                if( TBLFIX_CHGPROP == eTblChgMode )
+                if( TBLFIX_CHGPROP == eTableChgMode )
                 {
                     for( auto n = nStt; n < nEnd; ++n )
                     {
@@ -4263,10 +4263,10 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                        *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                     CR_SetLineHeight aParam1( aParam );
-                    if( TBLFIX_CHGPROP == eTblChgMode && !bBigger &&
+                    if( TBLFIX_CHGPROP == eTableChgMode && !bBigger &&
                         !aParam.nMaxSpace )
                     {
                         // We need to distribute the space evenly among all the Lines.
@@ -4294,13 +4294,13 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                 else
                 {
                     // Then call itself recursively; only with another mode (proportional)
-                    TblChgMode eOld = eTblChgMode;
-                    eTblChgMode = TBLVAR_CHGABS;
+                    TableChgMode eOld = eTableChgMode;
+                    eTableChgMode = TBLVAR_CHGABS;
 
                     bRet = SetRowHeight( rAktBox, eType, nAbsDiff,
                                         nRelDiff, ppUndo );
 
-                    eTblChgMode = eOld;
+                    eTableChgMode = eOld;
                     xFndBox.reset();
                 }
             }
@@ -4323,10 +4323,10 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
 
         if (ppUndo && *ppUndo && aParam.pUndo)
         {
-            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTblChgMode), eType,
+            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTableChgMode), eType,
                                             nAbsDiff, nRelDiff );
             if( bBigger )
-                aParam.pUndo->SaveNewBoxes( *aParam.pTblNd, aTmpLst );
+                aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
         }
     }
 
@@ -4335,11 +4335,11 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     return bRet;
 }
 
-SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
+SwFrameFormat* SwShareBoxFormat::GetFormat( long nWidth ) const
 {
-    SwFrmFmt *pRet = 0, *pTmp;
-    for( auto n = aNewFmts.size(); n; )
-        if( ( pTmp = aNewFmts[ --n ])->GetFrmSize().GetWidth()
+    SwFrameFormat *pRet = 0, *pTmp;
+    for( auto n = aNewFormats.size(); n; )
+        if( ( pTmp = aNewFormats[ --n ])->GetFrmSize().GetWidth()
                 == nWidth )
         {
             pRet = pTmp;
@@ -4348,16 +4348,16 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
     return pRet;
 }
 
-SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
+SwFrameFormat* SwShareBoxFormat::GetFormat( const SfxPoolItem& rItem ) const
 {
     const SfxPoolItem* pItem;
     sal_uInt16 nWhich = rItem.Which();
-    SwFrmFmt *pRet = 0, *pTmp;
-    const SfxPoolItem& rFrmSz = pOldFmt->GetFmtAttr( RES_FRM_SIZE, false );
-    for( auto n = aNewFmts.size(); n; )
-        if( SfxItemState::SET == ( pTmp = aNewFmts[ --n ])->
+    SwFrameFormat *pRet = 0, *pTmp;
+    const SfxPoolItem& rFrmSz = pOldFormat->GetFormatAttr( RES_FRM_SIZE, false );
+    for( auto n = aNewFormats.size(); n; )
+        if( SfxItemState::SET == ( pTmp = aNewFormats[ --n ])->
             GetItemState( nWhich, false, &pItem ) && *pItem == rItem &&
-            pTmp->GetFmtAttr( RES_FRM_SIZE, false ) == rFrmSz )
+            pTmp->GetFormatAttr( RES_FRM_SIZE, false ) == rFrmSz )
         {
             pRet = pTmp;
             break;
@@ -4365,51 +4365,51 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
     return pRet;
 }
 
-void SwShareBoxFmt::AddFormat( SwFrmFmt& rNew )
+void SwShareBoxFormat::AddFormat( SwFrameFormat& rNew )
 {
-    aNewFmts.push_back( &rNew );
+    aNewFormats.push_back( &rNew );
 }
 
-bool SwShareBoxFmt::RemoveFormat( const SwFrmFmt& rFmt )
+bool SwShareBoxFormat::RemoveFormat( const SwFrameFormat& rFormat )
 {
     // returns true, if we can delete
-    if( pOldFmt == &rFmt )
+    if( pOldFormat == &rFormat )
         return true;
 
-    std::vector<SwFrmFmt*>::iterator it = std::find( aNewFmts.begin(), aNewFmts.end(), &rFmt );
-    if( aNewFmts.end() != it )
-        aNewFmts.erase( it );
-    return aNewFmts.empty();
+    std::vector<SwFrameFormat*>::iterator it = std::find( aNewFormats.begin(), aNewFormats.end(), &rFormat );
+    if( aNewFormats.end() != it )
+        aNewFormats.erase( it );
+    return aNewFormats.empty();
 }
 
-SwShareBoxFmts::~SwShareBoxFmts()
+SwShareBoxFormats::~SwShareBoxFormats()
 {
 }
 
-SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt, long nWidth ) const
+SwFrameFormat* SwShareBoxFormats::GetFormat( const SwFrameFormat& rFormat, long nWidth ) const
 {
     sal_uInt16 nPos;
-    return Seek_Entry( rFmt, &nPos )
+    return Seek_Entry( rFormat, &nPos )
                     ? aShareArr[ nPos ].GetFormat( nWidth )
                     : 0;
 }
-SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt,
+SwFrameFormat* SwShareBoxFormats::GetFormat( const SwFrameFormat& rFormat,
                                      const SfxPoolItem& rItem ) const
 {
     sal_uInt16 nPos;
-    return Seek_Entry( rFmt, &nPos )
+    return Seek_Entry( rFormat, &nPos )
                     ? aShareArr[ nPos ].GetFormat( rItem )
                     : 0;
 }
 
-void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, SwFrmFmt& rNew )
+void SwShareBoxFormats::AddFormat( const SwFrameFormat& rOld, SwFrameFormat& rNew )
 {
     {
         sal_uInt16 nPos;
-        SwShareBoxFmt* pEntry;
+        SwShareBoxFormat* pEntry;
         if( !Seek_Entry( rOld, &nPos ))
         {
-            pEntry = new SwShareBoxFmt( rOld );
+            pEntry = new SwShareBoxFormat( rOld );
             aShareArr.insert( aShareArr.begin() + nPos, pEntry );
         }
         else
@@ -4419,22 +4419,22 @@ void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, SwFrmFmt& rNew )
     }
 }
 
-void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
-                                    SwFrmFmt& rFmt )
+void SwShareBoxFormats::ChangeFrameFormat( SwTableBox* pBox, SwTableLine* pLn,
+                                    SwFrameFormat& rFormat )
 {
     SwClient aCl;
-    SwFrmFmt* pOld = 0;
+    SwFrameFormat* pOld = 0;
     if( pBox )
     {
-        pOld = pBox->GetFrmFmt();
+        pOld = pBox->GetFrameFormat();
         pOld->Add( &aCl );
-        pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(&rFmt) );
+        pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(&rFormat) );
     }
     else if( pLn )
     {
-        pOld = pLn->GetFrmFmt();
+        pOld = pLn->GetFrameFormat();
         pOld->Add( &aCl );
-        pLn->ChgFrmFmt( static_cast<SwTableLineFmt*>(&rFmt) );
+        pLn->ChgFrameFormat( static_cast<SwTableLineFormat*>(&rFormat) );
     }
     if( pOld && pOld->HasOnlyOneListener() )
     {
@@ -4443,73 +4443,73 @@ void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
     }
 }
 
-void SwShareBoxFmts::SetSize( SwTableBox& rBox, const SwFmtFrmSize& rSz )
+void SwShareBoxFormats::SetSize( SwTableBox& rBox, const SwFormatFrmSize& rSz )
 {
-    SwFrmFmt *pBoxFmt = rBox.GetFrmFmt(),
-             *pRet = GetFormat( *pBoxFmt, rSz.GetWidth() );
+    SwFrameFormat *pBoxFormat = rBox.GetFrameFormat(),
+             *pRet = GetFormat( *pBoxFormat, rSz.GetWidth() );
     if( pRet )
-        ChangeFrmFmt( &rBox, 0, *pRet );
+        ChangeFrameFormat( &rBox, 0, *pRet );
     else
     {
-        pRet = rBox.ClaimFrmFmt();
-        pRet->SetFmtAttr( rSz );
-        AddFormat( *pBoxFmt, *pRet );
+        pRet = rBox.ClaimFrameFormat();
+        pRet->SetFormatAttr( rSz );
+        AddFormat( *pBoxFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem )
+void SwShareBoxFormats::SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem )
 {
-    SwFrmFmt *pBoxFmt = rBox.GetFrmFmt(),
-             *pRet = GetFormat( *pBoxFmt, rItem );
+    SwFrameFormat *pBoxFormat = rBox.GetFrameFormat(),
+             *pRet = GetFormat( *pBoxFormat, rItem );
     if( pRet )
-        ChangeFrmFmt( &rBox, 0, *pRet );
+        ChangeFrameFormat( &rBox, 0, *pRet );
     else
     {
-        pRet = rBox.ClaimFrmFmt();
-        pRet->SetFmtAttr( rItem );
-        AddFormat( *pBoxFmt, *pRet );
+        pRet = rBox.ClaimFrameFormat();
+        pRet->SetFormatAttr( rItem );
+        AddFormat( *pBoxFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem )
+void SwShareBoxFormats::SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem )
 {
-    SwFrmFmt *pLineFmt = rLine.GetFrmFmt(),
-             *pRet = GetFormat( *pLineFmt, rItem );
+    SwFrameFormat *pLineFormat = rLine.GetFrameFormat(),
+             *pRet = GetFormat( *pLineFormat, rItem );
     if( pRet )
-        ChangeFrmFmt( 0, &rLine, *pRet );
+        ChangeFrameFormat( 0, &rLine, *pRet );
     else
     {
-        pRet = rLine.ClaimFrmFmt();
-        pRet->SetFmtAttr( rItem );
-        AddFormat( *pLineFmt, *pRet );
+        pRet = rLine.ClaimFrameFormat();
+        pRet->SetFormatAttr( rItem );
+        AddFormat( *pLineFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::RemoveFormat( const SwFrmFmt& rFmt )
+void SwShareBoxFormats::RemoveFormat( const SwFrameFormat& rFormat )
 {
     for( auto i = aShareArr.size(); i; )
-        if( aShareArr[ --i ].RemoveFormat( rFmt ))
+        if( aShareArr[ --i ].RemoveFormat( rFormat ))
             aShareArr.erase( aShareArr.begin() + i );
 }
 
-bool SwShareBoxFmts::Seek_Entry( const SwFrmFmt& rFmt, sal_uInt16* pPos ) const
+bool SwShareBoxFormats::Seek_Entry( const SwFrameFormat& rFormat, sal_uInt16* pPos ) const
 {
-    sal_uLong nIdx = reinterpret_cast<sal_uLong>(&rFmt);
-    _SwShareBoxFmts::size_type nO = aShareArr.size(), nU = 0;
+    sal_uLong nIdx = reinterpret_cast<sal_uLong>(&rFormat);
+    _SwShareBoxFormats::size_type nO = aShareArr.size(), nU = 0;
     if( nO > 0 )
     {
         nO--;
         while( nU <= nO )
         {
             const auto nM = nU + ( nO - nU ) / 2;
-            sal_uLong nFmt = reinterpret_cast<sal_uLong>(&aShareArr[ nM ].GetOldFormat());
-            if( nFmt == nIdx )
+            sal_uLong nFormat = reinterpret_cast<sal_uLong>(&aShareArr[ nM ].GetOldFormat());
+            if( nFormat == nIdx )
             {
                 if( pPos )
                     *pPos = nM;
                 return true;
             }
-            else if( nFmt < nIdx )
+            else if( nFormat < nIdx )
                 nU = nM + 1;
             else if( nM == 0 )
             {
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index f09e2e92e7cb..57c64f107b26 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -43,7 +43,7 @@
 
 using namespace com::sun::star;
 
-void SwTextBoxHelper::create(SwFrmFmt* pShape)
+void SwTextBoxHelper::create(SwFrameFormat* pShape)
 {
     // If TextBox wasn't enabled previously
     if (!pShape->GetAttrSet().HasItem(RES_CNTNT))
@@ -75,9 +75,9 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
         if (sw::XTextRangeToSwPaM(aInternalPaM, xTextBox))
         {
             SwAttrSet aSet(pShape->GetAttrSet());
-            SwFmtCntnt aCntnt(aInternalPaM.GetNode().StartOfSectionNode());
-            aSet.Put(aCntnt);
-            pShape->SetFmtAttr(aSet);
+            SwFormatContent aContent(aInternalPaM.GetNode().StartOfSectionNode());
+            aSet.Put(aContent);
+            pShape->SetFormatAttr(aSet);
         }
 
         // Also initialize the properties, which are not constant, but inherited from the shape's ones.
@@ -96,38 +96,38 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
     }
 }
 
-void SwTextBoxHelper::destroy(SwFrmFmt* pShape)
+void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
 {
     // If a TextBox was enabled previously
     if (pShape->GetAttrSet().HasItem(RES_CNTNT))
     {
-        SwFrmFmt* pFmt = findTextBox(pShape);
+        SwFrameFormat* pFormat = findTextBox(pShape);
 
         // Unlink the TextBox's text range from the original shape.
-        pShape->ResetFmtAttr(RES_CNTNT);
+        pShape->ResetFormatAttr(RES_CNTNT);
 
         // Delete the associated TextFrame.
-        if (pFmt)
-            pShape->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt(pFmt);
+        if (pFormat)
+            pShape->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat(pFormat);
     }
 }
 
-std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
+std::set<const SwFrameFormat*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
 {
-    std::set<const SwFrmFmt*> aTextBoxes;
-    std::map<SwNodeIndex, const SwFrmFmt*> aFlyFormats, aDrawFormats;
+    std::set<const SwFrameFormat*> aTextBoxes;
+    std::map<SwNodeIndex, const SwFrameFormat*> aFlyFormats, aDrawFormats;
 
-    const SwFrmFmts& rSpzFrmFmts = *pDoc->GetSpzFrmFmts();
-    for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+    const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
+    for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
     {
-        const SwFrmFmt* pFormat = *it;
+        const SwFrameFormat* pFormat = *it;
 
         // A TextBox in the context of this class is a fly frame that has a
         // matching (same RES_CNTNT) draw frame.
-        if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || !pFormat->GetCntnt().GetCntntIdx())
+        if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || !pFormat->GetContent().GetContentIdx())
             continue;
 
-        const SwNodeIndex& rIndex = *pFormat->GetCntnt().GetCntntIdx();
+        const SwNodeIndex& rIndex = *pFormat->GetContent().GetContentIdx();
 
         if (pFormat->Which() == RES_FLYFRMFMT)
         {
@@ -148,23 +148,23 @@ std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
     return aTextBoxes;
 }
 
-std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
+std::set<const SwFrameFormat*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
 {
     const SwDoc* pDoc = rNode.GetDoc();
-    const SwCntntNode* pCntntNode = 0;
-    const SwCntntFrm* pCntntFrm = 0;
+    const SwContentNode* pContentNode = 0;
+    const SwContentFrm* pContentFrm = 0;
     bool bHaveViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
-    if (bHaveViewShell && (pCntntNode = rNode.GetCntntNode()) && (pCntntFrm = pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
+    if (bHaveViewShell && (pContentNode = rNode.GetContentNode()) && (pContentFrm = pContentNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
     {
         // We can use the layout information to iterate over only the frames which are anchored to us.
-        std::set<const SwFrmFmt*> aRet;
-        const SwSortedObjs* pSortedObjs = pCntntFrm->GetDrawObjs();
+        std::set<const SwFrameFormat*> aRet;
+        const SwSortedObjs* pSortedObjs = pContentFrm->GetDrawObjs();
         if (pSortedObjs)
         {
             for (size_t i = 0; i < pSortedObjs->size(); ++i)
             {
                 SwAnchoredObject* pAnchoredObject = (*pSortedObjs)[i];
-                SwFrmFmt* pTextBox = findTextBox(&pAnchoredObject->GetFrmFmt());
+                SwFrameFormat* pTextBox = findTextBox(&pAnchoredObject->GetFrameFormat());
                 if (pTextBox)
                     aRet.insert(pTextBox);
             }
@@ -177,14 +177,14 @@ std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
         return findTextBoxes(pDoc);
 }
 
-std::map<SwFrmFmt*, SwFrmFmt*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
+std::map<SwFrameFormat*, SwFrameFormat*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
 {
-    std::map<SwFrmFmt*, SwFrmFmt*> aRet;
+    std::map<SwFrameFormat*, SwFrameFormat*> aRet;
 
-    const SwFrmFmts& rSpzFrmFmts = *pDoc->GetSpzFrmFmts();
-    for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+    const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
+    for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
     {
-        SwFrmFmt* pTextBox = findTextBox(*it);
+        SwFrameFormat* pTextBox = findTextBox(*it);
         if (pTextBox)
             aRet[pTextBox] = *it;
     }
@@ -193,10 +193,10 @@ std::map<SwFrmFmt*, SwFrmFmt*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
 }
 
 /// If the passed SdrObject is in fact a TextFrame, that is used as a TextBox.
-bool lcl_isTextBox(SdrObject* pSdrObject, std::set<const SwFrmFmt*>& rTextBoxes)
+bool lcl_isTextBox(SdrObject* pSdrObject, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     SwVirtFlyDrawObj* pObject = PTR_CAST(SwVirtFlyDrawObj, pSdrObject);
-    return pObject && rTextBoxes.find(pObject->GetFmt()) != rTextBoxes.end();
+    return pObject && rTextBoxes.find(pObject->GetFormat()) != rTextBoxes.end();
 }
 
 bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
@@ -204,11 +204,11 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
     const SwVirtFlyDrawObj* pVirtFlyDrawObj = PTR_CAST(SwVirtFlyDrawObj, pObject);
     if (!pVirtFlyDrawObj)
         return false;
-    std::set<const SwFrmFmt*> aTextBoxes = findTextBoxes(pVirtFlyDrawObj->GetFmt()->GetDoc());
-    return aTextBoxes.find(pVirtFlyDrawObj->GetFmt()) != aTextBoxes.end();
+    std::set<const SwFrameFormat*> aTextBoxes = findTextBoxes(pVirtFlyDrawObj->GetFormat()->GetDoc());
+    return aTextBoxes.find(pVirtFlyDrawObj->GetFormat()) != aTextBoxes.end();
 }
 
-sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes)
+sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     sal_Int32 nRet = 0;
     for (size_t i = 0; i < pPage->GetObjCount(); ++i)
@@ -220,7 +220,7 @@ sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& r
     return nRet;
 }
 
-uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(lang::IndexOutOfBoundsException)
+uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(lang::IndexOutOfBoundsException)
 {
     if (nIndex < 0)
         throw lang::IndexOutOfBoundsException();
@@ -245,7 +245,7 @@ uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<
     return uno::makeAny(uno::Reference<drawing::XShape>(pRet->getUnoShape(), uno::UNO_QUERY));
 }
 
-sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes)
+sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     if (const SdrPage* pPage = pObject->GetPage())
     {
@@ -264,31 +264,31 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const Sw
     return pObject->GetOrdNum();
 }
 
-SwFrmFmt* SwTextBoxHelper::findTextBox(uno::Reference<drawing::XShape> xShape)
+SwFrameFormat* SwTextBoxHelper::findTextBox(uno::Reference<drawing::XShape> xShape)
 {
     SwXShape* pShape = dynamic_cast<SwXShape*>(xShape.get());
     if (!pShape)
         return 0;
 
-    return findTextBox(pShape->GetFrmFmt());
+    return findTextBox(pShape->GetFrameFormat());
 }
 
-SwFrmFmt* SwTextBoxHelper::findTextBox(const SwFrmFmt* pShape)
+SwFrameFormat* SwTextBoxHelper::findTextBox(const SwFrameFormat* pShape)
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
 
     // Only draw frames can have TextBoxes.
     if (pShape && pShape->Which() == RES_DRAWFRMFMT && pShape->GetAttrSet().HasItem(RES_CNTNT))
     {
-        const SwFmtCntnt& rCntnt = pShape->GetCntnt();
-        const SwFrmFmts& rSpzFrmFmts = *pShape->GetDoc()->GetSpzFrmFmts();
-        for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+        const SwFormatContent& rContent = pShape->GetContent();
+        const SwFrameFormats& rSpzFrameFormats = *pShape->GetDoc()->GetSpzFrameFormats();
+        for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
         {
-            SwFrmFmt* pFmt = *it;
+            SwFrameFormat* pFormat = *it;
             // Only a fly frame can be a TextBox.
-            if (pFmt->Which() == RES_FLYFRMFMT && pFmt->GetAttrSet().HasItem(RES_CNTNT) && pFmt->GetCntnt() == rCntnt)
+            if (pFormat->Which() == RES_FLYFRMFMT && pFormat->GetAttrSet().HasItem(RES_CNTNT) && pFormat->GetContent() == rContent)
             {
-                pRet = pFmt;
+                pRet = pFormat;
                 break;
             }
         }
@@ -298,18 +298,18 @@ SwFrmFmt* SwTextBoxHelper::findTextBox(const SwFrmFmt* pShape)
 }
 
 template < typename T >
-void lcl_queryInterface(SwFrmFmt* pShape, uno::Any& rAny)
+void lcl_queryInterface(SwFrameFormat* pShape, uno::Any& rAny)
 {
-    if (SwFrmFmt* pFmt = SwTextBoxHelper::findTextBox(pShape))
+    if (SwFrameFormat* pFormat = SwTextBoxHelper::findTextBox(pShape))
     {
         uno::Reference<T> const xInterface(
-            SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+            SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
             uno::UNO_QUERY);
         rAny <<= xInterface;
     }
 }
 
-uno::Any SwTextBoxHelper::queryInterface(SwFrmFmt* pShape, const uno::Type& rType)
+uno::Any SwTextBoxHelper::queryInterface(SwFrameFormat* pShape, const uno::Type& rType)
 {
     uno::Any aRet;
 
@@ -330,7 +330,7 @@ uno::Any SwTextBoxHelper::queryInterface(SwFrmFmt* pShape, const uno::Type& rTyp
     return aRet;
 }
 
-Rectangle SwTextBoxHelper::getTextRectangle(SwFrmFmt* pShape, bool bAbsolute)
+Rectangle SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool bAbsolute)
 {
     Rectangle aRet;
     aRet.SetEmpty();
@@ -363,7 +363,7 @@ Rectangle SwTextBoxHelper::getTextRectangle(SwFrmFmt* pShape, bool bAbsolute)
     return aRet;
 }
 
-void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue)
+void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue)
 {
     if (rPropertyName == "CustomShapeGeometry")
     {
@@ -378,22 +378,22 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyNa
             syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, uno::makeAny(static_cast<sal_Int32>(convertTwipToMm100(aRectangle.Top()))));
         }
 
-        if (SwFrmFmt* pFmt = findTextBox(pShape))
+        if (SwFrameFormat* pFormat = findTextBox(pShape))
         {
             comphelper::SequenceAsHashMap aCustomShapeGeometry(rValue);
             // That would be the btLr text direction which we don't support at a frame level, so do it at a character level.
             if (aCustomShapeGeometry.find("TextPreRotateAngle") != aCustomShapeGeometry.end() && aCustomShapeGeometry["TextPreRotateAngle"].get<sal_Int32>() == -270)
             {
-                if (const SwNodeIndex* pNodeIndex = pFmt->GetCntnt().GetCntntIdx())
+                if (const SwNodeIndex* pNodeIndex = pFormat->GetContent().GetContentIdx())
                 {
-                    SwPaM aPaM(*pFmt->GetDoc()->GetNodes()[pNodeIndex->GetIndex() + 1], 0);
+                    SwPaM aPaM(*pFormat->GetDoc()->GetNodes()[pNodeIndex->GetIndex() + 1], 0);
                     aPaM.SetMark();
-                    if (SwTxtNode* pMark = pFmt->GetDoc()->GetNodes()[pNodeIndex->GetNode().EndOfSectionIndex() - 1]->GetTxtNode())
+                    if (SwTextNode* pMark = pFormat->GetDoc()->GetNodes()[pNodeIndex->GetNode().EndOfSectionIndex() - 1]->GetTextNode())
                     {
                         aPaM.GetMark()->nNode = *pMark;
-                        aPaM.GetMark()->nContent.Assign(pMark, pMark->GetTxt().getLength());
+                        aPaM.GetMark()->nContent.Assign(pMark, pMark->GetText().getLength());
                         SvxCharRotateItem aItem(900, false, RES_CHRATR_ROTATE);
-                        pFmt->GetDoc()->getIDocumentContentOperations().InsertPoolItem(aPaM, aItem);
+                        pFormat->GetDoc()->getIDocumentContentOperations().InsertPoolItem(aPaM, aItem);
                     }
                 }
             }
@@ -405,14 +405,14 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyNa
         syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_IS_AUTO_HEIGHT, rValue);
 }
 
-void SwTextBoxHelper::getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, css::uno::Any& rValue)
+void SwTextBoxHelper::getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, css::uno::Any& rValue)
 {
     if (!pShape)
         return;
 
     nMemberId &= ~CONVERT_TWIPS;
 
-    if (SwFrmFmt* pFmt = findTextBox(pShape))
+    if (SwFrameFormat* pFormat = findTextBox(pShape))
     {
         if (nWID == RES_CHAIN)
         {
@@ -421,19 +421,19 @@ void SwTextBoxHelper::getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 n
             case MID_CHAIN_PREVNAME:
             case MID_CHAIN_NEXTNAME:
             {
-                const SwFmtChain& rChain = pFmt->GetChain();
+                const SwFormatChain& rChain = pFormat->GetChain();
                 rChain.QueryValue(rValue, nMemberId);
             }
             break;
             case MID_CHAIN_NAME:
-                rValue = uno::makeAny(pFmt->GetName());
+                rValue = uno::makeAny(pFormat->GetName());
                 break;
             }
         }
     }
 }
 
-void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, const css::uno::Any& rValue)
+void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, const css::uno::Any& rValue)
 {
     // No shape yet? Then nothing to do, initial properties are set by create().
     if (!pShape)
@@ -442,7 +442,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
     uno::Any aValue(rValue);
     nMemberId &= ~CONVERT_TWIPS;
 
-    if (SwFrmFmt* pFmt = findTextBox(pShape))
+    if (SwFrameFormat* pFormat = findTextBox(pShape))
     {
         OUString aPropertyName;
         bool bAdjustX = false;
@@ -499,7 +499,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
                 if (aValue.get<text::TextContentAnchorType>() == text::TextContentAnchorType_AS_CHARACTER)
                 {
                     uno::Reference<beans::XPropertySet> const xPropertySet(
-                        SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+                        SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
                         uno::UNO_QUERY);
                     xPropertySet->setPropertyValue(UNO_NAME_SURROUND, uno::makeAny(text::WrapTextMode_THROUGHT));
                     return;
@@ -511,12 +511,12 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
         {
             uno::Reference<text::XTextRange> xRange;
             rValue >>= xRange;
-            SwUnoInternalPaM aInternalPaM(*pFmt->GetDoc());
+            SwUnoInternalPaM aInternalPaM(*pFormat->GetDoc());
             if (sw::XTextRangeToSwPaM(aInternalPaM, xRange))
             {
-                SwFmtAnchor aAnchor(pFmt->GetAnchor());
+                SwFormatAnchor aAnchor(pFormat->GetAnchor());
                 aAnchor.SetAnchor(aInternalPaM.Start());
-                pFmt->SetFmtAttr(aAnchor);
+                pFormat->SetFormatAttr(aAnchor);
             }
         }
         break;
@@ -565,60 +565,60 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
             }
 
             uno::Reference<beans::XPropertySet> const xPropertySet(
-                SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+                SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
                 uno::UNO_QUERY);
             xPropertySet->setPropertyValue(aPropertyName, aValue);
         }
     }
 }
 
-void SwTextBoxHelper::saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks)
+void SwTextBoxHelper::saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks)
 {
     for (size_t i = 0; i < rFormats.size(); ++i)
     {
-        const SwFrmFmt* pFmt = rFormats[i];
-        if (pFmt->Which() != RES_DRAWFRMFMT)
+        const SwFrameFormat* pFormat = rFormats[i];
+        if (pFormat->Which() != RES_DRAWFRMFMT)
             continue;
-        if (SwFrmFmt* pTextBox = findTextBox(pFmt))
-            rLinks[pFmt] = pTextBox;
+        if (SwFrameFormat* pTextBox = findTextBox(pFormat))
+            rLinks[pFormat] = pTextBox;
     }
 }
 
-void SwTextBoxHelper::resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rMap)
+void SwTextBoxHelper::resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rMap)
 {
     if (pShape->Which() == RES_DRAWFRMFMT)
     {
-        if (pShape->GetCntnt().GetCntntIdx())
-            rMap.insert(std::make_pair(pShape, pShape->GetCntnt()));
-        pShape->ResetFmtAttr(RES_CNTNT);
+        if (pShape->GetContent().GetContentIdx())
+            rMap.insert(std::make_pair(pShape, pShape->GetContent()));
+        pShape->ResetFormatAttr(RES_CNTNT);
     }
 }
 
-void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
+void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
 {
     size_t i = 0;
     for (std::set<_ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i)
     {
-        SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFmt());
+        SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFormat());
         if (aTextBoxIt != rSavedLinks.end())
         {
             size_t j = 0;
             for (std::set<_ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j)
             {
-                if (aSetJt->GetFmt() == aTextBoxIt->second)
-                    rNew[i]->SetFmtAttr(rNew[j]->GetCntnt());
+                if (aSetJt->GetFormat() == aTextBoxIt->second)
+                    rNew[i]->SetFormatAttr(rNew[j]->GetContent());
             }
         }
-        if (rOldContent.find(aSetIt->GetFmt()) != rOldContent.end())
-            const_cast<SwFrmFmt*>(aSetIt->GetFmt())->SetFmtAttr(rOldContent[aSetIt->GetFmt()]);
+        if (rOldContent.find(aSetIt->GetFormat()) != rOldContent.end())
+            const_cast<SwFrameFormat*>(aSetIt->GetFormat())->SetFormatAttr(rOldContent[aSetIt->GetFormat()]);
     }
 }
 
-void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
+void SwTextBoxHelper::syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet)
 {
-    if (SwFrmFmt* pFmt = findTextBox(&rShape))
+    if (SwFrameFormat* pFormat = findTextBox(&rShape))
     {
-        SfxItemSet aTextBoxSet(pFmt->GetDoc()->GetAttrPool(), aFrmFmtSetRange);
+        SfxItemSet aTextBoxSet(pFormat->GetDoc()->GetAttrPool(), aFrameFormatSetRange);
 
         SfxItemIter aIter(rSet);
         sal_uInt16 nWhich = aIter.GetCurItem()->Which();
@@ -628,8 +628,8 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
             {
             case RES_VERT_ORIENT:
             {
-                const SwFmtVertOrient& rOrient = static_cast<const SwFmtVertOrient&>(*aIter.GetCurItem());
-                SwFmtVertOrient aOrient(rOrient);
+                const SwFormatVertOrient& rOrient = static_cast<const SwFormatVertOrient&>(*aIter.GetCurItem());
+                SwFormatVertOrient aOrient(rOrient);
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -638,7 +638,7 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
                 aTextBoxSet.Put(aOrient);
 
                 // restore height (shrinked for extending beyond the page bottom - tdf#91260)
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
                 if (!aRect.IsEmpty())
                 {
                     aSize.SetHeight(aRect.getHeight());
@@ -648,8 +648,8 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
             break;
             case RES_HORI_ORIENT:
             {
-                const SwFmtHoriOrient& rOrient = static_cast<const SwFmtHoriOrient&>(*aIter.GetCurItem());
-                SwFmtHoriOrient aOrient(rOrient);
+                const SwFormatHoriOrient& rOrient = static_cast<const SwFormatHoriOrient&>(*aIter.GetCurItem());
+                SwFormatHoriOrient aOrient(rOrient);
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -664,9 +664,9 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
                 // the position and the size of the textbox (e.g. larger
                 // rounded edges of a rectangle -> need to push right/down the
                 // textbox).
-                SwFmtVertOrient aVertOrient(rShape.GetVertOrient());
-                SwFmtHoriOrient aHoriOrient(rShape.GetHoriOrient());
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFormatVertOrient aVertOrient(rShape.GetVertOrient());
+                SwFormatHoriOrient aHoriOrient(rShape.GetHoriOrient());
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -694,7 +694,7 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
         while (0 != (nWhich = aIter.NextItem()->Which()));
 
         if (aTextBoxSet.Count())
-            pFmt->GetDoc()->SetFlyFrmAttr(*pFmt, aTextBoxSet);
+            pFormat->GetDoc()->SetFlyFrmAttr(*pFormat, aTextBoxSet);
     }
 }
 
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 6f8ea5e8a177..c61bf3baf4bd 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -59,15 +59,15 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
         sal_uInt32 nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
         for( sal_uInt32 n = 0; n < nMaxItems; ++n )
         {
-            const SwFmtINetFmt* pItem = static_cast<const SwFmtINetFmt*>(pDoc->GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n ));
+            const SwFormatINetFormat* pItem = static_cast<const SwFormatINetFormat*>(pDoc->GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n ));
             if( pItem != 0 &&
                 ( pItem->GetValue() == sURL || ( !sBkmk.isEmpty() && pItem->GetValue() == sBkmk )))
             {
-                const SwTxtINetFmt* pTxtAttr = pItem->GetTxtINetFmt();
-                if (pTxtAttr != 0)
+                const SwTextINetFormat* pTextAttr = pItem->GetTextINetFormat();
+                if (pTextAttr != 0)
                 {
-                    const SwTxtNode* pTxtNd = pTxtAttr->GetpTxtNode();
-                    if (pTxtNd != 0)
+                    const SwTextNode* pTextNd = pTextAttr->GetpTextNode();
+                    if (pTextNd != 0)
                     {
                         if( !bAction && pESh )
                         {
@@ -76,14 +76,14 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
                             bUnLockView = !pESh->IsViewLocked();
                             pESh->LockView( true );
                         }
-                        const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid(false);
-                        const SwTxtAttr* pAttr = pTxtAttr;
+                        const_cast<SwTextINetFormat*>(pTextAttr)->SetVisitedValid(false);
+                        const SwTextAttr* pAttr = pTextAttr;
                         SwUpdateAttr aUpdateAttr(
                             pAttr->GetStart(),
                             *pAttr->End(),
                             RES_FMT_CHG);
 
-                        const_cast< SwTxtNode* >(pTxtNd)->ModifyNotification(&aUpdateAttr, &aUpdateAttr);
+                        const_cast< SwTextNode* >(pTextNd)->ModifyNotification(&aUpdateAttr, &aUpdateAttr);
                     }
                 }
             }
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 21dd4b9464ed..571407cacbe6 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -41,76 +41,76 @@
 
 // Structure for the mapping from old and new frame formats to the
 // boxes and lines of a table
-struct _MapTblFrmFmt
+struct _MapTableFrameFormat
 {
-    const SwFrmFmt *pOld;
-    SwFrmFmt *pNew;
-    _MapTblFrmFmt( const SwFrmFmt *pOldFmt, SwFrmFmt*pNewFmt )
-        : pOld( pOldFmt ), pNew( pNewFmt )
+    const SwFrameFormat *pOld;
+    SwFrameFormat *pNew;
+    _MapTableFrameFormat( const SwFrameFormat *pOldFormat, SwFrameFormat*pNewFormat )
+        : pOld( pOldFormat ), pNew( pNewFormat )
     {}
 };
 
-typedef std::vector<_MapTblFrmFmt> _MapTblFrmFmts;
+typedef std::vector<_MapTableFrameFormat> _MapTableFrameFormats;
 
-SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
+SwContentNode* SwTextNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 {
     // the Copy-Textnode is the Node with the Text, the Copy-Attrnode is the
     // node with the collection and hard attributes. Normally is the same
     // node, but if insert a glossary without formatting, then the Attrnode
     // is the prev node of the destionation position in dest. document.
-    SwTxtNode* pCpyTxtNd = const_cast<SwTxtNode*>(this);
-    SwTxtNode* pCpyAttrNd = pCpyTxtNd;
+    SwTextNode* pCpyTextNd = const_cast<SwTextNode*>(this);
+    SwTextNode* pCpyAttrNd = pCpyTextNd;
 
     // Copy the formats to the other document
-    SwTxtFmtColl* pColl = 0;
+    SwTextFormatColl* pColl = 0;
     if( pDoc->IsInsOnlyTextGlossary() )
     {
         SwNodeIndex aIdx( rIdx, -1 );
-        if( aIdx.GetNode().IsTxtNode() )
+        if( aIdx.GetNode().IsTextNode() )
         {
-            pCpyAttrNd = aIdx.GetNode().GetTxtNode();
-            pColl = &pCpyAttrNd->GetTxtColl()->GetNextTxtFmtColl();
+            pCpyAttrNd = aIdx.GetNode().GetTextNode();
+            pColl = &pCpyAttrNd->GetTextColl()->GetNextTextFormatColl();
         }
     }
     if( !pColl )
-        pColl = pDoc->CopyTxtColl( *GetTxtColl() );
+        pColl = pDoc->CopyTextColl( *GetTextColl() );
 
-    SwTxtNode* pTxtNd = pDoc->GetNodes().MakeTxtNode( rIdx, pColl );
+    SwTextNode* pTextNd = pDoc->GetNodes().MakeTextNode( rIdx, pColl );
 
     // METADATA: register copy
-    pTxtNd->RegisterAsCopyOf(*pCpyTxtNd);
+    pTextNd->RegisterAsCopyOf(*pCpyTextNd);
 
     // Copy Attribute/Text
     if( !pCpyAttrNd->HasSwAttrSet() )
         // An AttrSet was added for numbering, so delete it
-        pTxtNd->ResetAllAttr();
+        pTextNd->ResetAllAttr();
 
     // if Copy-Textnode unequal to Copy-Attrnode, then copy first
     // the attributes into the new Node.
-    if( pCpyAttrNd != pCpyTxtNd )
+    if( pCpyAttrNd != pCpyTextNd )
     {
-        pCpyAttrNd->CopyAttr( pTxtNd, 0, 0 );
+        pCpyAttrNd->CopyAttr( pTextNd, 0, 0 );
         if( pCpyAttrNd->HasSwAttrSet() )
         {
             SwAttrSet aSet( *pCpyAttrNd->GetpSwAttrSet() );
             aSet.ClearItem( RES_PAGEDESC );
             aSet.ClearItem( RES_BREAK );
-            aSet.CopyToModify( *pTxtNd );
+            aSet.CopyToModify( *pTextNd );
         }
     }
 
     // Is that enough? What about PostIts/Fields/FieldTypes?
     // #i96213# - force copy of all attributes
-    pCpyTxtNd->CopyText( pTxtNd, SwIndex( pCpyTxtNd ),
-        pCpyTxtNd->GetTxt().getLength(), true );
+    pCpyTextNd->CopyText( pTextNd, SwIndex( pCpyTextNd ),
+        pCpyTextNd->GetText().getLength(), true );
 
     if( RES_CONDTXTFMTCOLL == pColl->Which() )
-        pTxtNd->ChkCondColl();
+        pTextNd->ChkCondColl();
 
-    return pTxtNd;
+    return pTextNd;
 }
 
-static bool lcl_SrchNew( const _MapTblFrmFmt& rMap, SwFrmFmt** pPara )
+static bool lcl_SrchNew( const _MapTableFrameFormat& rMap, SwFrameFormat** pPara )
 {
     if( rMap.pOld != *pPara )
         return true;
@@ -121,68 +121,68 @@ static bool lcl_SrchNew( const _MapTblFrmFmt& rMap, SwFrmFmt** pPara )
 struct _CopyTable
 {
     SwDoc* m_pDoc;
-    sal_uLong m_nOldTblSttIdx;
-    _MapTblFrmFmts& m_rMapArr;
+    sal_uLong m_nOldTableSttIdx;
+    _MapTableFrameFormats& m_rMapArr;
     SwTableLine* m_pInsLine;
     SwTableBox* m_pInsBox;
-    SwTableNode *m_pTblNd;
+    SwTableNode *m_pTableNd;
     const SwTable *m_pOldTable;
 
-    _CopyTable(SwDoc* pDc, _MapTblFrmFmts& rArr, sal_uLong nOldStt,
-               SwTableNode& rTblNd, const SwTable* pOldTable)
-        : m_pDoc(pDc), m_nOldTblSttIdx(nOldStt), m_rMapArr(rArr),
-          m_pInsLine(0), m_pInsBox(0), m_pTblNd(&rTblNd), m_pOldTable(pOldTable)
+    _CopyTable(SwDoc* pDc, _MapTableFrameFormats& rArr, sal_uLong nOldStt,
+               SwTableNode& rTableNd, const SwTable* pOldTable)
+        : m_pDoc(pDc), m_nOldTableSttIdx(nOldStt), m_rMapArr(rArr),
+          m_pInsLine(0), m_pInsBox(0), m_pTableNd(&rTableNd), m_pOldTable(pOldTable)
     {}
 };
 
-static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT );
+static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT );
 
-static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
+static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT )
 {
-    SwTableBoxFmt * pBoxFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-    for (_MapTblFrmFmts::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
-        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrmFmt**>(&pBoxFmt) ) )
+    SwTableBoxFormat * pBoxFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+    for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
+        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pBoxFormat) ) )
             break;
 
-    if (pBoxFmt == pBox->GetFrmFmt()) // Create a new one?
+    if (pBoxFormat == pBox->GetFrameFormat()) // Create a new one?
     {
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_FORMULA, false,
-            &pItem ) && static_cast<const SwTblBoxFormula*>(pItem)->IsIntrnlName() )
+        if( SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_FORMULA, false,
+            &pItem ) && static_cast<const SwTableBoxFormula*>(pItem)->IsIntrnlName() )
         {
-            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->PtrToBoxNm(pCT->m_pOldTable);
+            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->PtrToBoxNm(pCT->m_pOldTable);
         }
 
-        pBoxFmt = pCT->m_pDoc->MakeTableBoxFmt();
-        pBoxFmt->CopyAttrs( *pBox->GetFrmFmt() );
+        pBoxFormat = pCT->m_pDoc->MakeTableBoxFormat();
+        pBoxFormat->CopyAttrs( *pBox->GetFrameFormat() );
 
         if( pBox->GetSttIdx() )
         {
             SvNumberFormatter* pN = pCT->m_pDoc->GetNumberFormatter(false);
-            if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == pBoxFmt->
+            if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == pBoxFormat->
                 GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
             {
-                sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                 if( nNewIdx != nOldIdx )
-                    pBoxFmt->SetFmtAttr( SwTblBoxNumFormat( nNewIdx ));
+                    pBoxFormat->SetFormatAttr( SwTableBoxNumFormat( nNewIdx ));
 
             }
         }
 
-        pCT->m_rMapArr.push_back(_MapTblFrmFmt(pBox->GetFrmFmt(), pBoxFmt));
+        pCT->m_rMapArr.push_back(_MapTableFrameFormat(pBox->GetFrameFormat(), pBoxFormat));
     }
 
     sal_uInt16 nLines = pBox->GetTabLines().size();
     SwTableBox* pNewBox;
     if( nLines )
-        pNewBox = new SwTableBox(pBoxFmt, nLines, pCT->m_pInsLine);
+        pNewBox = new SwTableBox(pBoxFormat, nLines, pCT->m_pInsLine);
     else
     {
-        SwNodeIndex aNewIdx(*pCT->m_pTblNd, pBox->GetSttIdx() - pCT->m_nOldTblSttIdx);
+        SwNodeIndex aNewIdx(*pCT->m_pTableNd, pBox->GetSttIdx() - pCT->m_nOldTableSttIdx);
         OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index is not on the start node" );
 
-        pNewBox = new SwTableBox(pBoxFmt, aNewIdx, pCT->m_pInsLine);
+        pNewBox = new SwTableBox(pBoxFormat, aNewIdx, pCT->m_pInsLine);
         pNewBox->setRowSpan( pBox->getRowSpan() );
     }
 
@@ -193,30 +193,30 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
         _CopyTable aPara(*pCT);
         aPara.m_pInsBox = pNewBox;
         for( const SwTableLine* pLine : pBox->GetTabLines() )
-            lcl_CopyTblLine( pLine, &aPara );
+            lcl_CopyTableLine( pLine, &aPara );
     }
-    else if (pNewBox->IsInHeadline(&pCT->m_pTblNd->GetTable()))
+    else if (pNewBox->IsInHeadline(&pCT->m_pTableNd->GetTable()))
     {
         // In the headline, the paragraphs must match conditional styles
         pNewBox->GetSttNd()->CheckSectionCondColl();
     }
 }
 
-static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT )
+static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT )
 {
-    SwTableLineFmt * pLineFmt = static_cast<SwTableLineFmt*>(pLine->GetFrmFmt());
-    for (_MapTblFrmFmts::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
-        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrmFmt**>(&pLineFmt) ) )
+    SwTableLineFormat * pLineFormat = static_cast<SwTableLineFormat*>(pLine->GetFrameFormat());
+    for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
+        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pLineFormat) ) )
             break;
 
-    if( pLineFmt == pLine->GetFrmFmt() ) // Create a new one?
+    if( pLineFormat == pLine->GetFrameFormat() ) // Create a new one?
     {
-        pLineFmt = pCT->m_pDoc->MakeTableLineFmt();
-        pLineFmt->CopyAttrs( *pLine->GetFrmFmt() );
-        pCT->m_rMapArr.push_back(_MapTblFrmFmt(pLine->GetFrmFmt(), pLineFmt));
+        pLineFormat = pCT->m_pDoc->MakeTableLineFormat();
+        pLineFormat->CopyAttrs( *pLine->GetFrameFormat() );
+        pCT->m_rMapArr.push_back(_MapTableFrameFormat(pLine->GetFrameFormat(), pLineFormat));
     }
 
-    SwTableLine* pNewLine = new SwTableLine(pLineFmt, pLine->GetTabBoxes().size(), pCT->m_pInsBox);
+    SwTableLine* pNewLine = new SwTableLine(pLineFormat, pLine->GetTabBoxes().size(), pCT->m_pInsBox);
     // Insert the new row into the table
     if (pCT->m_pInsBox)
     {
@@ -224,13 +224,13 @@ static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT )
     }
     else
     {
-        pCT->m_pTblNd->GetTable().GetTabLines().push_back(pNewLine);
+        pCT->m_pTableNd->GetTable().GetTabLines().push_back(pNewLine);
     }
 
     pCT->m_pInsLine = pNewLine;
     for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(pLine)->GetTabBoxes().begin();
              it != const_cast<SwTableLine*>(pLine)->GetTabBoxes().end(); ++it)
-        lcl_CopyTblBox(*it, pCT );
+        lcl_CopyTableBox(*it, pCT );
 }
 
 SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
@@ -244,47 +244,47 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
             return 0;
     }
 
-    // Copy the TableFrmFmt
-    OUString sTblName( GetTable().GetFrmFmt()->GetName() );
+    // Copy the TableFrameFormat
+    OUString sTableName( GetTable().GetFrameFormat()->GetName() );
     if( !pDoc->IsCopyIsMove() )
     {
-        const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts();
-        for( size_t n = rTblFmts.size(); n; )
-            if( rTblFmts[ --n ]->GetName() == sTblName )
+        const SwFrameFormats& rTableFormats = *pDoc->GetTableFrameFormats();
+        for( size_t n = rTableFormats.size(); n; )
+            if( rTableFormats[ --n ]->GetName() == sTableName )
             {
-                sTblName = pDoc->GetUniqueTblName();
+                sTableName = pDoc->GetUniqueTableName();
                 break;
             }
     }
 
-    SwFrmFmt* pTblFmt = pDoc->MakeTblFrmFmt( sTblName, pDoc->GetDfltFrmFmt() );
-    pTblFmt->CopyAttrs( *GetTable().GetFrmFmt() );
-    SwTableNode* pTblNd = new SwTableNode( rIdx );
-    SwEndNode* pEndNd = new SwEndNode( rIdx, *pTblNd );
+    SwFrameFormat* pTableFormat = pDoc->MakeTableFrameFormat( sTableName, pDoc->GetDfltFrameFormat() );
+    pTableFormat->CopyAttrs( *GetTable().GetFrameFormat() );
+    SwTableNode* pTableNd = new SwTableNode( rIdx );
+    SwEndNode* pEndNd = new SwEndNode( rIdx, *pTableNd );
     SwNodeIndex aInsPos( *pEndNd );
 
-    SwTable& rTbl = (SwTable&)pTblNd->GetTable();
-    rTbl.RegisterToFormat( *pTblFmt );
+    SwTable& rTable = (SwTable&)pTableNd->GetTable();
+    rTable.RegisterToFormat( *pTableFormat );
 
-    rTbl.SetRowsToRepeat( GetTable().GetRowsToRepeat() );
-    rTbl.SetTblChgMode( GetTable().GetTblChgMode() );
-    rTbl.SetTableModel( GetTable().IsNewModel() );
+    rTable.SetRowsToRepeat( GetTable().GetRowsToRepeat() );
+    rTable.SetTableChgMode( GetTable().GetTableChgMode() );
+    rTable.SetTableModel( GetTable().IsNewModel() );
 
     SwDDEFieldType* pDDEType = 0;
     if( IS_TYPE( SwDDETable, &GetTable() ))
     {
         // We're copying a DDE table
         // Is the field type available in the new document?
-        pDDEType = const_cast<SwDDETable&>(static_cast<const SwDDETable&>(GetTable())).GetDDEFldType();
+        pDDEType = const_cast<SwDDETable&>(static_cast<const SwDDETable&>(GetTable())).GetDDEFieldType();
         if( pDDEType->IsDeleted() )
-            pDoc->getIDocumentFieldsAccess().InsDeletedFldType( *pDDEType );
+            pDoc->getIDocumentFieldsAccess().InsDeletedFieldType( *pDDEType );
         else
-            pDDEType = static_cast<SwDDEFieldType*>(pDoc->getIDocumentFieldsAccess().InsertFldType( *pDDEType ));
+            pDDEType = static_cast<SwDDEFieldType*>(pDoc->getIDocumentFieldsAccess().InsertFieldType( *pDDEType ));
         OSL_ENSURE( pDDEType, "unknown FieldType" );
 
         // Swap the table pointers in the node
-        SwDDETable* pNewTable = new SwDDETable( pTblNd->GetTable(), pDDEType );
-        pTblNd->SetNewTable( pNewTable, false );
+        SwDDETable* pNewTable = new SwDDETable( pTableNd->GetTable(), pDDEType );
+        pTableNd->SetNewTable( pNewTable, false );
     }
     // First copy the content of the tables, we will later assign the
     // boxes/lines and create the frames
@@ -295,36 +295,36 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     // (see IsUsed). Therefore the inner table gets the same name as the outer table.
     // We have to make sure that the table node of the SwTable is accessible, even
     // without any content in m_TabSortContentBoxes. #i26629#
-    pTblNd->GetTable().SetTableNode( pTblNd );
+    pTableNd->GetTable().SetTableNode( pTableNd );
     rNds._Copy( aRg, aInsPos, false );
-    pTblNd->GetTable().SetTableNode( 0 );
+    pTableNd->GetTable().SetTableNode( 0 );
 
     // Special case for a single box
     if( 1 == GetTable().GetTabSortBoxes().size() )
     {
-        aRg.aStart.Assign( *pTblNd, 1 );
-        aRg.aEnd.Assign( *pTblNd->EndOfSectionNode() );
+        aRg.aStart.Assign( *pTableNd, 1 );
+        aRg.aEnd.Assign( *pTableNd->EndOfSectionNode() );
         pDoc->GetNodes().SectionDown( &aRg, SwTableBoxStartNode );
     }
 
     // Delete all frames from the copied area, they will be created
     // during the generation of the table frame
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
-    _MapTblFrmFmts aMapArr;
-    _CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTblNd, &GetTable() );
+    _MapTableFrameFormats aMapArr;
+    _CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTableNd, &GetTable() );
 
     for( const SwTableLine* pLine : GetTable().GetTabLines() )
-        lcl_CopyTblLine( pLine, &aPara );
+        lcl_CopyTableLine( pLine, &aPara );
 
     if( pDDEType )
         pDDEType->IncRefCnt();
 
     CHECK_TABLE( GetTable() );
-    return pTblNd;
+    return pTableNd;
 }
 
-void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
+void SwTextNode::CopyCollFormat( SwTextNode& rDestNd )
 {
     // Copy the formats into the other document:
     // Special case for PageBreak/PageDesc/ColBrk
@@ -343,7 +343,7 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
             aPgBrkSet.Put( *pAttr );
     }
 
-    rDestNd.ChgFmtColl( pDestDoc->CopyTxtColl( *GetTxtColl() ));
+    rDestNd.ChgFormatColl( pDestDoc->CopyTextColl( *GetTextColl() ));
     if( 0 != ( pSet = GetpSwAttrSet() ) )
         pSet->CopyToModify( rDestNd );
 
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 4c6f414c45fe..4c891ce2bfaf 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -36,11 +36,11 @@
 
 #include <frmfmt.hxx>
 
-SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
+SwNoTextNode::SwNoTextNode( const SwNodeIndex & rWhere,
                   const sal_uInt8 nNdType,
-                  SwGrfFmtColl *pGrfColl,
+                  SwGrfFormatColl *pGrfColl,
                   SwAttrSet* pAutoAttr ) :
-    SwCntntNode( rWhere, nNdType, pGrfColl ),
+    SwContentNode( rWhere, nNdType, pGrfColl ),
     pContour( 0 ),
     bAutomaticContour( false ),
     bContourMapModeValid( true ),
@@ -51,42 +51,42 @@ SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
         SetAttr( *pAutoAttr );
 }
 
-SwNoTxtNode::~SwNoTxtNode()
+SwNoTextNode::~SwNoTextNode()
 {
     delete pContour;
 }
 
 /// Creates an AttrSet for all derivations with ranges for frame-
 /// and graphics-attributes.
-void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
+void SwNoTextNode::NewAttrSet( SwAttrPool& rPool )
 {
     OSL_ENSURE( !mpAttrSet.get(), "AttrSet is already set" );
-    SwAttrSet aNewAttrSet( rPool, aNoTxtNodeSetRange );
+    SwAttrSet aNewAttrSet( rPool, aNoTextNodeSetRange );
 
     // put names of parent style and conditional style:
-    const SwFmtColl* pFmtColl = GetFmtColl();
+    const SwFormatColl* pFormatColl = GetFormatColl();
     OUString sVal;
-    SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-    SfxStringItem aFmtColl( RES_FRMATR_STYLE_NAME, sVal );
-    aNewAttrSet.Put( aFmtColl );
+    SwStyleNameMapper::FillProgName( pFormatColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+    SfxStringItem aFormatColl( RES_FRMATR_STYLE_NAME, sVal );
+    aNewAttrSet.Put( aFormatColl );
 
-    aNewAttrSet.SetParent( &GetFmtColl()->GetAttrSet() );
+    aNewAttrSet.SetParent( &GetFormatColl()->GetAttrSet() );
     mpAttrSet = GetDoc()->GetIStyleAccess().getAutomaticStyle( aNewAttrSet, IStyleAccess::AUTO_STYLE_NOTXT );
 }
 
 /// Dummies for loading/saving of persistent data
 /// when working with graphics and OLE objects
-bool SwNoTxtNode::RestorePersistentData()
+bool SwNoTextNode::RestorePersistentData()
 {
     return true;
 }
 
-bool SwNoTxtNode::SavePersistentData()
+bool SwNoTextNode::SavePersistentData()
 {
     return true;
 }
 
-void SwNoTxtNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
+void SwNoTextNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
 {
     delete pContour;
     if ( pPoly )
@@ -98,7 +98,7 @@ void SwNoTxtNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
     bPixelContour = false;
 }
 
-void SwNoTxtNode::CreateContour()
+void SwNoTextNode::CreateContour()
 {
     OSL_ENSURE( !pContour, "Contour available." );
     pContour = new tools::PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic()));
@@ -107,7 +107,7 @@ void SwNoTxtNode::CreateContour()
     bPixelContour = false;
 }
 
-const tools::PolyPolygon *SwNoTxtNode::HasContour() const
+const tools::PolyPolygon *SwNoTextNode::HasContour() const
 {
     if( !bContourMapModeValid )
     {
@@ -172,20 +172,20 @@ const tools::PolyPolygon *SwNoTxtNode::HasContour() const
                 }
             }
         }
-        const_cast<SwNoTxtNode *>(this)->bContourMapModeValid = true;
-        const_cast<SwNoTxtNode *>(this)->bPixelContour = false;
+        const_cast<SwNoTextNode *>(this)->bContourMapModeValid = true;
+        const_cast<SwNoTextNode *>(this)->bPixelContour = false;
     }
 
     return pContour;
 }
 
-void SwNoTxtNode::GetContour( tools::PolyPolygon &rPoly ) const
+void SwNoTextNode::GetContour( tools::PolyPolygon &rPoly ) const
 {
     OSL_ENSURE( pContour, "Contour not available." );
     rPoly = *HasContour();
 }
 
-void SwNoTxtNode::SetContourAPI( const tools::PolyPolygon *pPoly )
+void SwNoTextNode::SetContourAPI( const tools::PolyPolygon *pPoly )
 {
     delete pContour;
     if ( pPoly )
@@ -195,7 +195,7 @@ void SwNoTxtNode::SetContourAPI( const tools::PolyPolygon *pPoly )
     bContourMapModeValid = false;
 }
 
-bool SwNoTxtNode::GetContourAPI( tools::PolyPolygon &rContour ) const
+bool SwNoTextNode::GetContourAPI( tools::PolyPolygon &rContour ) const
 {
     if( !pContour )
         return false;
@@ -231,7 +231,7 @@ bool SwNoTxtNode::GetContourAPI( tools::PolyPolygon &rContour ) const
     return true;
 }
 
-bool SwNoTxtNode::IsPixelContour() const
+bool SwNoTextNode::IsPixelContour() const
 {
     bool bRet;
     if( bContourMapModeValid )
@@ -247,7 +247,7 @@ bool SwNoTxtNode::IsPixelContour() const
     return bRet;
 }
 
-Graphic SwNoTxtNode::GetGraphic() const
+Graphic SwNoTextNode::GetGraphic() const
 {
     Graphic aRet;
     if ( GetGrfNode() )
@@ -263,53 +263,53 @@ Graphic SwNoTxtNode::GetGraphic() const
 }
 
 // #i73249#
-void SwNoTxtNode::SetTitle( const OUString& rTitle, bool bBroadcast )
+void SwNoTextNode::SetTitle( const OUString& rTitle, bool bBroadcast )
 {
     // Title attribute of <SdrObject> replaces own AlternateText attribute
-    SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::SetTitle(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    SwFlyFrameFormat* pFlyFormat = dynamic_cast<SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::SetTitle(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return;
     }
 
-    pFlyFmt->SetObjTitle( rTitle, bBroadcast );
+    pFlyFormat->SetObjTitle( rTitle, bBroadcast );
 }
 
-OUString SwNoTxtNode::GetTitle() const
+OUString SwNoTextNode::GetTitle() const
 {
-    const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::GetTitle(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    const SwFlyFrameFormat* pFlyFormat = dynamic_cast<const SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::GetTitle(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return OUString();
     }
 
-    return pFlyFmt->GetObjTitle();
+    return pFlyFormat->GetObjTitle();
 }
 
-void SwNoTxtNode::SetDescription( const OUString& rDescription, bool bBroadcast )
+void SwNoTextNode::SetDescription( const OUString& rDescription, bool bBroadcast )
 {
-    SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::SetDescription(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    SwFlyFrameFormat* pFlyFormat = dynamic_cast<SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::SetDescription(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return;
     }
 
-    pFlyFmt->SetObjDescription( rDescription, bBroadcast );
+    pFlyFormat->SetObjDescription( rDescription, bBroadcast );
 }
 
-OUString SwNoTxtNode::GetDescription() const
+OUString SwNoTextNode::GetDescription() const
 {
-    const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::GetDescription(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    const SwFlyFrameFormat* pFlyFormat = dynamic_cast<const SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::GetDescription(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return OUString();
     }
 
-    return pFlyFmt->GetObjDescription();
+    return pFlyFormat->GetObjDescription();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 8c8a542d804f..b462f5c81d8a 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -39,20 +39,20 @@ bool SwOutlineNodes::Seek_Entry(SwNode* rP, sal_uInt16* pnPos) const
 
 void SwNodes::UpdateOutlineNode(SwNode & rNd)
 {
-    SwTxtNode * pTxtNd = rNd.GetTxtNode();
+    SwTextNode * pTextNd = rNd.GetTextNode();
 
-    if (pTxtNd && pTxtNd->IsOutlineStateChanged())
+    if (pTextNd && pTextNd->IsOutlineStateChanged())
     {
-        bool bFound = pOutlineNds->find(pTxtNd) != pOutlineNds->end();
+        bool bFound = pOutlineNds->find(pTextNd) != pOutlineNds->end();
 
-        if (pTxtNd->IsOutline())
+        if (pTextNd->IsOutline())
         {
             if (! bFound)
             {
                 // assure that text is in the correct nodes array
-                if ( &(pTxtNd->GetNodes()) == this )
+                if ( &(pTextNd->GetNodes()) == this )
                 {
-                    pOutlineNds->insert(pTxtNd);
+                    pOutlineNds->insert(pTextNd);
                 }
                 else
                 {
@@ -63,17 +63,17 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
         else
         {
             if (bFound)
-                pOutlineNds->erase(pTxtNd);
+                pOutlineNds->erase(pTextNd);
         }
 
-        pTxtNd->UpdateOutlineState();
+        pTextNd->UpdateOutlineState();
 
         // update the structure fields
-        GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
+        GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD )->UpdateFields();
     }
 }
 
-void SwNodes::UpdtOutlineIdx( const SwNode& rNd )
+void SwNodes::UpdateOutlineIdx( const SwNode& rNd )
 {
     if( pOutlineNds->empty() )     // no OutlineNodes present ?
         return;
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 71b418df1e48..e100b39b965c 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -60,15 +60,15 @@
 #include <ndsect.hxx>
 #include <tools/datetimeutils.hxx>
 
-// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
+// #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>.
 // Method now determines the previous/next on its own. Thus, it can be controlled,
 // for which previous/next is checked, if it's visible.
-static bool lcl_IsInSameTblBox( SwNodes& _rNds,
+static bool lcl_IsInSameTableBox( SwNodes& _rNds,
                          const SwNode& _rNd,
                          const bool _bPrev )
 {
-    const SwTableNode* pTblNd = _rNd.FindTableNode();
-    if ( !pTblNd )
+    const SwTableNode* pTableNd = _rNd.FindTableNode();
+    if ( !pTableNd )
     {
         return true;
     }
@@ -87,13 +87,13 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
                  ? !SwNodes::GoPrevSection( &aChkIdx, false, false )
                  : !_rNds.GoNextSection( &aChkIdx, false, false ) )
             {
-                OSL_FAIL( "<lcl_IsInSameTblBox(..)> - no previous/next!" );
+                OSL_FAIL( "<lcl_IsInSameTableBox(..)> - no previous/next!" );
                 return false;
             }
             else
             {
-                if ( aChkIdx < pTblNd->GetIndex() ||
-                     aChkIdx > pTblNd->EndOfSectionNode()->GetIndex() )
+                if ( aChkIdx < pTableNd->GetIndex() ||
+                     aChkIdx > pTableNd->EndOfSectionNode()->GetIndex() )
                 {
                     return false;
                 }
@@ -103,7 +103,7 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
                     // is also inside the table.
                     SwSectionNode* pSectNd = aChkIdx.GetNode().FindSectionNode();
                     if ( !pSectNd ||
-                         pSectNd->GetIndex() < pTblNd->GetIndex() ||
+                         pSectNd->GetIndex() < pTableNd->GetIndex() ||
                          !pSectNd->GetSection().IsHiddenFlag() )
                     {
                         bFound = true;
@@ -114,7 +114,7 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
     }
 
     // Find the Box's StartNode
-    const SwTableSortBoxes& rSortBoxes = pTblNd->GetTable().GetTabSortBoxes();
+    const SwTableSortBoxes& rSortBoxes = pTableNd->GetTable().GetTabSortBoxes();
     sal_uLong nIdx = _rNd.GetIndex();
     for (size_t n = 0; n < rSortBoxes.size(); ++n)
     {
@@ -137,13 +137,13 @@ static void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
     if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
         !CheckNodesRange( rStt, aIdx, true ) ||
         // #i21457#
-        !lcl_IsInSameTblBox( rNds, rStt, true ))
+        !lcl_IsInSameTableBox( rNds, rStt, true ))
     {
         aIdx = rEnd;
         if( !rNds.GoNextSection( &aIdx, true, false ) ||
             !CheckNodesRange( rEnd, aIdx, true ) ||
             // #i21457#
-            !lcl_IsInSameTblBox( rNds, rEnd, false ))
+            !lcl_IsInSameTableBox( rNds, rEnd, false ))
         {
             rSectionData.SetHidden( false );
         }
@@ -171,7 +171,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
     {
         const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
         if( !pStt->nContent.GetIndex() &&
-            pEnd->nNode.GetNode().GetCntntNode()->Len() ==
+            pEnd->nNode.GetNode().GetContentNode()->Len() ==
             pEnd->nContent.GetIndex() )
         {
             ::lcl_CheckEmptyLayFrm( GetNodes(),
@@ -190,10 +190,10 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         GetIDocumentUndoRedo().DoUndo(false);
     }
 
-    SwSectionFmt* const pFmt = MakeSectionFmt( 0 );
+    SwSectionFormat* const pFormat = MakeSectionFormat( 0 );
     if ( pAttr )
     {
-        pFmt->SetFmtAttr( *pAttr );
+        pFormat->SetFormatAttr( *pAttr );
     }
 
     SwSectionNode* pNewSectNode = 0;
@@ -216,7 +216,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
             --aEnd; // End is inclusive in the InsertSection
             pNewSectNode = GetNodes().InsertTextSection(
-                        aStt, *pFmt, rNewData, pTOXBase, & aEnd);
+                        aStt, *pFormat, rNewData, pTOXBase, & aEnd);
         }
         else
         {
@@ -225,8 +225,8 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
                 if( !( pPrvNd && 1 == nRegionRet ) &&
                     pSttPos->nContent.GetIndex() )
                 {
-                    SwTxtNode* const pTNd =
-                        pSttPos->nNode.GetNode().GetTxtNode();
+                    SwTextNode* const pTNd =
+                        pSttPos->nNode.GetNode().GetTextNode();
                     if (pTNd)
                     {
                         pUndoInsSect->SaveSplitNode( pTNd, true );
@@ -235,9 +235,9 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
                 if ( !( pPrvNd && 2 == nRegionRet ) )
                 {
-                    SwTxtNode *const pTNd =
-                        pEndPos->nNode.GetNode().GetTxtNode();
-                    if (pTNd && (pTNd->GetTxt().getLength()
+                    SwTextNode *const pTNd =
+                        pEndPos->nNode.GetNode().GetTextNode();
+                    if (pTNd && (pTNd->GetText().getLength()
                                     != pEndPos->nContent.GetIndex()))
                     {
                         pUndoInsSect->SaveSplitNode( pTNd, false );
@@ -248,7 +248,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
             if( pPrvNd && 1 == nRegionRet )
             {
                 pSttPos->nNode.Assign( *pPrvNd );
-                pSttPos->nContent.Assign( pSttPos->nNode.GetNode().GetCntntNode(), 0 );
+                pSttPos->nContent.Assign( pSttPos->nNode.GetNode().GetContentNode(), 0 );
             }
             else if( pSttPos->nContent.GetIndex() )
             {
@@ -258,61 +258,61 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
             if( pPrvNd && 2 == nRegionRet )
             {
                 pEndPos->nNode.Assign( *pPrvNd );
-                pEndPos->nContent.Assign( pEndPos->nNode.GetNode().GetCntntNode(), 0 );
+                pEndPos->nContent.Assign( pEndPos->nNode.GetNode().GetContentNode(), 0 );
             }
             else
             {
-                const SwCntntNode* pCNd = pEndPos->nNode.GetNode().GetCntntNode();
+                const SwContentNode* pCNd = pEndPos->nNode.GetNode().GetContentNode();
                 if( pCNd && pCNd->Len() != pEndPos->nContent.GetIndex() )
                 {
-                    sal_Int32 nCntnt = pSttPos->nContent.GetIndex();
+                    sal_Int32 nContent = pSttPos->nContent.GetIndex();
                     getIDocumentContentOperations().SplitNode( *pEndPos, false );
 
-                    SwTxtNode* pTNd;
+                    SwTextNode* pTNd;
                     if( pEndPos->nNode.GetIndex() == pSttPos->nNode.GetIndex() )
                     {
                         --pSttPos->nNode;
                         --pEndPos->nNode;
-                        pTNd = pSttPos->nNode.GetNode().GetTxtNode();
-                        pSttPos->nContent.Assign( pTNd, nCntnt );
+                        pTNd = pSttPos->nNode.GetNode().GetTextNode();
+                        pSttPos->nContent.Assign( pTNd, nContent );
                     }
                     else
                     {
                         // Set to the end of the previous
                         --pEndPos->nNode;
-                        pTNd = pEndPos->nNode.GetNode().GetTxtNode();
+                        pTNd = pEndPos->nNode.GetNode().GetTextNode();
                     }
-                    nCntnt = (pTNd) ? pTNd->GetTxt().getLength() : 0;
-                    pEndPos->nContent.Assign( pTNd, nCntnt );
+                    nContent = (pTNd) ? pTNd->GetText().getLength() : 0;
+                    pEndPos->nContent.Assign( pTNd, nContent );
                 }
             }
             pNewSectNode = GetNodes().InsertTextSection(
-                pSttPos->nNode, *pFmt, rNewData, pTOXBase, &pEndPos->nNode);
+                pSttPos->nNode, *pFormat, rNewData, pTOXBase, &pEndPos->nNode);
         }
     }
     else
     {
         const SwPosition* pPos = rRange.GetPoint();
-        const SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
+        const SwContentNode* pCNd = pPos->nNode.GetNode().GetContentNode();
         if( !pPos->nContent.GetIndex() )
         {
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, true);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true);
         }
         else if( pPos->nContent.GetIndex() == pCNd->Len() )
         {
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, false);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, false);
         }
         else
         {
-            if( pUndoInsSect && pCNd->IsTxtNode() )
+            if( pUndoInsSect && pCNd->IsTextNode() )
             {
-                pUndoInsSect->SaveSplitNode( const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCNd)), true );
+                pUndoInsSect->SaveSplitNode( const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCNd)), true );
             }
             getIDocumentContentOperations().SplitNode( *pPos, false );
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, true);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true);
         }
     }
 
@@ -322,8 +322,8 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
     getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         SwPaM aPam( *pNewSectNode->EndOfSectionNode(), *pNewSectNode, 1 );
         if( getIDocumentRedlineAccess().IsRedlineOn() )
@@ -343,31 +343,31 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         SwCalc aCalc( *this );
         if( ! IsInReading() )
         {
-            getIDocumentFieldsAccess().FldsToCalc( aCalc, pNewSectNode->GetIndex(), USHRT_MAX );
+            getIDocumentFieldsAccess().FieldsToCalc( aCalc, pNewSectNode->GetIndex(), USHRT_MAX );
         }
         SwSection& rNewSect = pNewSectNode->GetSection();
         rNewSect.SetCondHidden( aCalc.Calculate( rNewSect.GetCondition() ).GetBool() );
     }
 
-    bool bUpdateFtn = false;
-    if( GetFtnIdxs().size() && pAttr )
+    bool bUpdateFootnote = false;
+    if( GetFootnoteIdxs().size() && pAttr )
     {
-        sal_uInt16 nVal = static_cast<const SwFmtFtnAtTxtEnd&>(pAttr->Get(
+        sal_uInt16 nVal = static_cast<const SwFormatFootnoteAtTextEnd&>(pAttr->Get(
                                             RES_FTN_AT_TXTEND )).GetValue();
            if( ( FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
               FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ) ||
-            ( FTNEND_ATTXTEND_OWNNUMSEQ == ( nVal = static_cast<const SwFmtEndAtTxtEnd&>(
+            ( FTNEND_ATTXTEND_OWNNUMSEQ == ( nVal = static_cast<const SwFormatEndAtTextEnd&>(
                             pAttr->Get( RES_END_AT_TXTEND )).GetValue() ) ||
               FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ))
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
     }
 
     if( pUndoInsSect )
     {
         pUndoInsSect->SetSectNdPos( pNewSectNode->GetIndex() );
-        pUndoInsSect->SetUpdtFtnFlag( bUpdateFtn );
+        pUndoInsSect->SetUpdateFootnoteFlag( bUpdateFootnote );
         GetIDocumentUndoRedo().DoUndo(bUndo);
     }
 
@@ -376,9 +376,9 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         pNewSectNode->GetSection().CreateLink( bUpdate ? CREATE_UPDATE : CREATE_CONNECT );
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
-        GetFtnIdxs().UpdateFtn( SwNodeIndex( *pNewSectNode ));
+        GetFootnoteIdxs().UpdateFootnote( SwNodeIndex( *pNewSectNode ));
     }
 
     getIDocumentState().SetModified();
@@ -395,7 +395,7 @@ sal_uInt16 SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
         const SwPosition* pStt = rRange.Start();
         const SwPosition* pEnd = rRange.End();
 
-        const SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode();
+        const SwContentNode* pCNd = pEnd->nNode.GetNode().GetContentNode();
         const SwNode* pNd = &pStt->nNode.GetNode();
         const SwSectionNode* pSectNd = pNd->FindSectionNode();
         const SwSectionNode* pEndSectNd = pCNd ? pCNd->FindSectionNode() : 0;
@@ -506,29 +506,29 @@ SwSection* SwDoc::GetCurrSection( const SwPosition& rPos )
     return 0;
 }
 
-SwSectionFmt* SwDoc::MakeSectionFmt( SwSectionFmt *pDerivedFrom )
+SwSectionFormat* SwDoc::MakeSectionFormat( SwSectionFormat *pDerivedFrom )
 {
-    SwSectionFmt* pNew = new SwSectionFmt(
-        pDerivedFrom == 0 ? mpDfltFrmFmt : pDerivedFrom, this );
-    mpSectionFmtTbl->push_back( pNew );
+    SwSectionFormat* pNew = new SwSectionFormat(
+        pDerivedFrom == 0 ? mpDfltFrameFormat : pDerivedFrom, this );
+    mpSectionFormatTable->push_back( pNew );
     return pNew;
 }
 
-void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
+void SwDoc::DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes )
 {
-    SwSectionFmts::iterator itFmtPos = std::find( mpSectionFmtTbl->begin(), mpSectionFmtTbl->end(), pFmt );
+    SwSectionFormats::iterator itFormatPos = std::find( mpSectionFormatTable->begin(), mpSectionFormatTable->end(), pFormat );
 
     GetIDocumentUndoRedo().StartUndo(UNDO_DELSECTION, NULL);
 
-    if( mpSectionFmtTbl->end() != itFmtPos )
+    if( mpSectionFormatTable->end() != itFormatPos )
     {
-        const SwNodeIndex* pIdx = pFmt->GetCntnt( false ).GetCntntIdx();
-        const SfxPoolItem* pFtnEndAtTxtEnd;
-        if( SfxItemState::SET != pFmt->GetItemState(
-                            RES_FTN_AT_TXTEND, true, &pFtnEndAtTxtEnd ) ||
-            SfxItemState::SET != pFmt->GetItemState(
-                            RES_END_AT_TXTEND, true, &pFtnEndAtTxtEnd ))
-            pFtnEndAtTxtEnd = 0;
+        const SwNodeIndex* pIdx = pFormat->GetContent( false ).GetContentIdx();
+        const SfxPoolItem* pFootnoteEndAtTextEnd;
+        if( SfxItemState::SET != pFormat->GetItemState(
+                            RES_FTN_AT_TXTEND, true, &pFootnoteEndAtTextEnd ) ||
+            SfxItemState::SET != pFormat->GetItemState(
+                            RES_END_AT_TXTEND, true, &pFootnoteEndAtTextEnd ))
+            pFootnoteEndAtTextEnd = 0;
 
         const SwSectionNode* pSectNd;
 
@@ -540,22 +540,22 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
                 SwNodeIndex aUpdIdx( *pIdx );
                 SwPaM aPaM( *pSectNd->EndOfSectionNode(), *pSectNd );
                 GetIDocumentUndoRedo().AppendUndo( new SwUndoDelete( aPaM ));
-                if( pFtnEndAtTxtEnd )
-                    GetFtnIdxs().UpdateFtn( aUpdIdx );
+                if( pFootnoteEndAtTextEnd )
+                    GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
                 getIDocumentState().SetModified();
                 //#126178# start/end undo have to be pairs!
                 GetIDocumentUndoRedo().EndUndo(UNDO_DELSECTION, NULL);
                 return ;
             }
-            GetIDocumentUndoRedo().AppendUndo( MakeUndoDelSection( *pFmt ) );
+            GetIDocumentUndoRedo().AppendUndo( MakeUndoDelSection( *pFormat ) );
         }
         else if( bDelNodes && pIdx && &GetNodes() == &pIdx->GetNodes() &&
                 0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
         {
             SwNodeIndex aUpdIdx( *pIdx );
             getIDocumentContentOperations().DeleteSection( (SwNode*)pSectNd );
-            if( pFtnEndAtTxtEnd )
-                GetFtnIdxs().UpdateFtn( aUpdIdx );
+            if( pFootnoteEndAtTextEnd )
+                GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
             getIDocumentState().SetModified();
             //#126178# start/end undo have to be pairs!
             GetIDocumentUndoRedo().EndUndo(UNDO_DELSECTION, NULL);
@@ -563,17 +563,17 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
         }
 
         {
-            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-            pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+            pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
         // A ClearRedo could result in a recursive call of this function and delete some section
-        // formats, thus the position inside the SectionFmtTbl could have changed
-        itFmtPos = std::find( mpSectionFmtTbl->begin(), mpSectionFmtTbl->end(), pFmt );
+        // formats, thus the position inside the SectionFormatTable could have changed
+        itFormatPos = std::find( mpSectionFormatTable->begin(), mpSectionFormatTable->end(), pFormat );
 
         // WARNING: First remove from the array and then delete,
         //          as the Section DTOR tries to delete it's format itself.
-        mpSectionFmtTbl->erase( itFmtPos );
+        mpSectionFormatTable->erase( itFormatPos );
 //FEATURE::CONDCOLL
         sal_uLong nCnt = 0, nSttNd = 0;
         if( pIdx && &GetNodes() == &pIdx->GetNodes() &&
@@ -584,19 +584,19 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
         }
 //FEATURE::CONDCOLL
 
-        delete pFmt;
+        delete pFormat;
 
-        if( nSttNd && pFtnEndAtTxtEnd )
+        if( nSttNd && pFootnoteEndAtTextEnd )
         {
             SwNodeIndex aUpdIdx( GetNodes(), nSttNd );
-            GetFtnIdxs().UpdateFtn( aUpdIdx );
+            GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
         }
 
 //FEATURE::CONDCOLL
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         for( ; nCnt--; ++nSttNd )
-            if( 0 != (pCNd = GetNodes()[ nSttNd ]->GetCntntNode() ) &&
-                RES_CONDTXTFMTCOLL == pCNd->GetFmtColl()->Which() )
+            if( 0 != (pCNd = GetNodes()[ nSttNd ]->GetContentNode() ) &&
+                RES_CONDTXTFMTCOLL == pCNd->GetFormatColl()->Which() )
                 pCNd->ChkCondColl();
 //FEATURE::CONDCOLL
     }
@@ -609,8 +609,8 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
 void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
         SfxItemSet const*const pAttr, bool const bPreventLinkUpdate )
 {
-    SwSectionFmt* pFmt = (*mpSectionFmtTbl)[ nPos ];
-    SwSection* pSection = pFmt->GetSection();
+    SwSectionFormat* pFormat = (*mpSectionFormatTable)[ nPos ];
+    SwSection* pSection = pFormat->GetSection();
 
     /// remember hidden condition flag of SwSection before changes
     bool bOldCondHidden = pSection->IsCondHidden();
@@ -625,7 +625,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
             sal_uInt16 nWhich = aIter.GetCurItem()->Which();
             while( true )
             {
-                if( pFmt->GetFmtAttr( nWhich ) != *aIter.GetCurItem() )
+                if( pFormat->GetFormatAttr( nWhich ) != *aIter.GetCurItem() )
                 {
                     bOnlyAttrChg = true;
                     break;
@@ -642,13 +642,13 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().AppendUndo(
-                    MakeUndoUpdateSection( *pFmt, true ) );
+                    MakeUndoUpdateSection( *pFormat, true ) );
             }
-            // #i32968# Inserting columns in the section causes MakeFrmFmt
-            // to put two  objects of type SwUndoFrmFmt on the undo stack.
+            // #i32968# Inserting columns in the section causes MakeFrameFormat
+            // to put two  objects of type SwUndoFrameFormat on the undo stack.
             // We don't want them.
             ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
-            pFmt->SetFmtAttr( *pAttr );
+            pFormat->SetFormatAttr( *pAttr );
             getIDocumentState().SetModified();
         }
         return;
@@ -660,7 +660,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     {
         if (rNewData.IsHidden())
         {
-            pIdx = pFmt->GetCntnt().GetCntntIdx();
+            pIdx = pFormat->GetContent().GetContentIdx();
             if (pIdx)
             {
                 const SwSectionNode* pSectNd =
@@ -676,10 +676,10 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo(MakeUndoUpdateSection(*pFmt, false));
+        GetIDocumentUndoRedo().AppendUndo(MakeUndoUpdateSection(*pFormat, false));
     }
-    // #i32968# Inserting columns in the section causes MakeFrmFmt to put two
-    // objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the section causes MakeFrameFormat to put two
+    // objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     // The LinkFileName could only consist of separators
@@ -705,7 +705,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     pSection->SetSectionData(rNewData);
 
     if( pAttr )
-        pSection->GetFmt()->SetFmtAttr( *pAttr );
+        pSection->GetFormat()->SetFormatAttr( *pAttr );
 
     if( !sSectName.isEmpty() )
     {
@@ -718,12 +718,12 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
         // Then calculate up to that position
         SwCalc aCalc( *this );
         if( !pIdx )
-            pIdx = pFmt->GetCntnt().GetCntntIdx();
-        getIDocumentFieldsAccess().FldsToCalc( aCalc, pIdx->GetIndex(), USHRT_MAX );
+            pIdx = pFormat->GetContent().GetContentIdx();
+        getIDocumentFieldsAccess().FieldsToCalc( aCalc, pIdx->GetIndex(), USHRT_MAX );
 
         /// Because on using SwSection::operator=() to set up <pSection>
         /// with <rNewData> and the above given note, the hidden condition flag
-        /// has to be set to false, if hidden condition flag of <pFmt->GetSection()>
+        /// has to be set to false, if hidden condition flag of <pFormat->GetSection()>
         /// (SwSection before the changes) is false (already saved in <bOldCondHidden>)
         /// and new calculated condition is true.
         /// This is necessary, because otherwise the <SetCondHidden> would have
@@ -748,18 +748,18 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     getIDocumentState().SetModified();
 }
 
-void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
+void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
 {
-    SwFtnIdxs& rFtnArr = pNd->GetDoc()->GetFtnIdxs();
-    if( rFtnArr.size() )
+    SwFootnoteIdxs& rFootnoteArr = pNd->GetDoc()->GetFootnoteIdxs();
+    if( rFootnoteArr.size() )
     {
         size_t nPos = 0;
-        rFtnArr.SeekEntry( SwNodeIndex( *pNd ), &nPos );
-        SwTxtFtn* pSrch;
+        rFootnoteArr.SeekEntry( SwNodeIndex( *pNd ), &nPos );
+        SwTextFootnote* pSrch;
 
         // Delete all succeeding Footnotes
-        while( nPos < rFtnArr.size() &&
-            _SwTxtFtn_GetIndex( (pSrch = rFtnArr[ nPos ]) ) <= nEnd )
+        while( nPos < rFootnoteArr.size() &&
+            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frms) or else they will remain there (Undo does not delete them!)
@@ -768,7 +768,7 @@ void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
         }
 
         while( nPos-- &&
-            _SwTxtFtn_GetIndex( (pSrch = rFtnArr[ nPos ]) ) >= nStt )
+            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frms) or else they will remain there (Undo does not delete them!)
@@ -784,7 +784,7 @@ static inline bool lcl_IsTOXSection(SwSectionData const& rSectionData)
 }
 
 SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
-                                SwSectionFmt& rSectionFmt,
+                                SwSectionFormat& rSectionFormat,
                                 SwSectionData const& rSectionData,
                                 SwTOXBase const*const pTOXBase,
                                 SwNodeIndex const*const pEnde,
@@ -824,7 +824,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
     }
 
     SwSectionNode *const pSectNd =
-            new SwSectionNode(aInsPos, rSectionFmt, pTOXBase);
+            new SwSectionNode(aInsPos, rSectionFormat, pTOXBase);
     if( pEnde )
     {
         // Special case for the Reader/Writer
@@ -857,10 +857,10 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
     }
     else
     {
-        SwTxtNode* pCpyTNd = rNdIdx.GetNode().GetTxtNode();
+        SwTextNode* pCpyTNd = rNdIdx.GetNode().GetTextNode();
         if( pCpyTNd )
         {
-            SwTxtNode* pTNd = new SwTxtNode( aInsPos, pCpyTNd->GetTxtColl() );
+            SwTextNode* pTNd = new SwTextNode( aInsPos, pCpyTNd->GetTextColl() );
             if( pCpyTNd->HasSwAttrSet() )
             {
                 // Move PageDesc/Break to the first Node of the section
@@ -885,12 +885,12 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
             pCpyTNd->MakeFrms( *pTNd );
         }
         else
-            new SwTxtNode( aInsPos, GetDoc()->GetDfltTxtFmtColl() );
+            new SwTextNode( aInsPos, GetDoc()->GetDfltTextFormatColl() );
     }
     new SwEndNode( aInsPos, *pSectNd );
 
     pSectNd->GetSection().SetSectionData(rSectionData);
-    SwSectionFmt* pSectFmt = pSectNd->GetSection().GetFmt();
+    SwSectionFormat* pSectFormat = pSectNd->GetSection().GetFormat();
 
     // We could optimize this, by not removing already contained Frames and recreating them,
     // but by simply rewiring them
@@ -924,8 +924,8 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
             // Make up the Format's nesting
             if( pNd->IsSectionNode() )
             {
-                static_cast<SwSectionNode*>(pNd)->GetSection().GetFmt()->
-                                    SetDerivedFrom( pSectFmt );
+                static_cast<SwSectionNode*>(pNd)->GetSection().GetFormat()->
+                                    SetDerivedFrom( pSectFormat );
                 static_cast<SwSectionNode*>(pNd)->DelFrms();
                 n = pNd->EndOfSectionIndex();
             }
@@ -938,11 +938,11 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
                     nSkipIdx = pNd->EndOfSectionIndex();
             }
         }
-        else if( pNd->IsCntntNode() )
-            static_cast<SwCntntNode*>(pNd)->DelFrms();
+        else if( pNd->IsContentNode() )
+            static_cast<SwContentNode*>(pNd)->DelFrms();
     }
 
-    sw_DeleteFtn( pSectNd, nStart, nEnde );
+    sw_DeleteFootnote( pSectNd, nStart, nEnde );
 
     if( bInsFrm )
     {
@@ -972,32 +972,32 @@ SwSectionNode* SwNode::FindSectionNode()
 // SwSectionNode
 
 // ugly hack to make m_pSection const
-static SwSectionFmt &
-lcl_initParent(SwSectionNode & rThis, SwSectionFmt & rFmt)
+static SwSectionFormat &
+lcl_initParent(SwSectionNode & rThis, SwSectionFormat & rFormat)
 {
     SwSectionNode *const pParent =
         rThis.StartOfSectionNode()->FindSectionNode();
     if( pParent )
     {
         // Register the Format at the right Parent
-        rFmt.SetDerivedFrom( pParent->GetSection().GetFmt() );
+        rFormat.SetDerivedFrom( pParent->GetSection().GetFormat() );
     }
-    return rFmt;
+    return rFormat;
 }
 
 SwSectionNode::SwSectionNode(SwNodeIndex const& rIdx,
-        SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase)
+        SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase)
     : SwStartNode( rIdx, ND_SECTIONNODE )
     , m_pSection( (pTOXBase)
-        ? new SwTOXBaseSection(*pTOXBase, lcl_initParent(*this, rFmt))
-        : new SwSection( CONTENT_SECTION, rFmt.GetName(),
-                lcl_initParent(*this, rFmt) ) )
+        ? new SwTOXBaseSection(*pTOXBase, lcl_initParent(*this, rFormat))
+        : new SwSection( CONTENT_SECTION, rFormat.GetName(),
+                lcl_initParent(*this, rFormat) ) )
 {
     // Set the connection from Format to Node
     // Suppress Modify; no one's interessted anyway
-    rFmt.LockModify();
-    rFmt.SetFmtAttr( SwFmtCntnt( this ) );
-    rFmt.UnlockModify();
+    rFormat.LockModify();
+    rFormat.SetFormatAttr( SwFormatContent( this ) );
+    rFormat.UnlockModify();
 }
 
 #ifdef DBG_UTIL
@@ -1034,15 +1034,15 @@ SwSectionNode::~SwSectionNode()
 {
     // mba: test if iteration works as clients will be removed in callback
     // use hint which allows to specify, if the content shall be saved or not
-    m_pSection->GetFmt()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
-    SwSectionFmt* pFmt = m_pSection->GetFmt();
-    if( pFmt )
+    m_pSection->GetFormat()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
+    SwSectionFormat* pFormat = m_pSection->GetFormat();
+    if( pFormat )
     {
         // Remove the Attributei, because the Section deletes it's Format
-        // and it will neutralize the Section, if the Cntnt Attribute is set
-        pFmt->LockModify();
-        pFmt->ResetFmtAttr( RES_CNTNT );
-        pFmt->UnlockModify();
+        // and it will neutralize the Section, if the Content Attribute is set
+        pFormat->LockModify();
+        pFormat->ResetFormatAttr( RES_CNTNT );
+        pFormat->UnlockModify();
     }
 }
 
@@ -1060,10 +1060,10 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
     SwNodes& rNds = GetNodes();
     if( rNds.IsDocNodes() && rNds.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
-        if( GetSection().IsHidden() || IsCntntHidden() )
+        if( GetSection().IsHidden() || IsContentHidden() )
         {
             SwNodeIndex aIdx( *EndOfSectionNode() );
-            SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+            SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
             if( !pCNd )
             {
                 aIdx = *this;
@@ -1071,8 +1071,8 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                 if (!pCNd)
                     return;
             }
-            pCNd = aIdx.GetNode().GetCntntNode();
-            pCNd->MakeFrms( static_cast<SwCntntNode&>(rIdx.GetNode()) );
+            pCNd = aIdx.GetNode().GetContentNode();
+            pCNd->MakeFrms( static_cast<SwContentNode&>(rIdx.GetNode()) );
         }
         else
         {
@@ -1081,7 +1081,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
             while( 0 != (pFrm = aNode2Layout.NextFrm()) )
             {
                 OSL_ENSURE( pFrm->IsSctFrm(), "Depend of Section not a Section." );
-                SwFrm *pNew = rIdx.GetNode().GetCntntNode()->MakeFrm( pFrm );
+                SwFrm *pNew = rIdx.GetNode().GetContentNode()->MakeFrm( pFrm );
 
                 SwSectionNode* pS = rIdx.GetNode().FindSectionNode();
 
@@ -1118,15 +1118,15 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                     // CONTENT_FLOWS_FROM/_TO relation.
                     // Relation CONTENT_FLOWS_FROM for next paragraph will change
                     // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-                    if ( pNew->IsTxtFrm() )
+                    if ( pNew->IsTextFrm() )
                     {
                         SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
                         if ( pViewShell && pViewShell->GetLayout() &&
                              pViewShell->GetLayout()->IsAnyShellAccessible() )
                         {
                             pViewShell->InvalidateAccessibleParaFlowRelation(
-                                dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                                dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                                dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                                dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
                         }
                     }
                     pNew = pSct;
@@ -1144,15 +1144,15 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                 // CONTENT_FLOWS_FROM/_TO relation.
                 // Relation CONTENT_FLOWS_FROM for next paragraph will change
                 // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-                if ( pNew->IsTxtFrm() )
+                if ( pNew->IsTextFrm() )
                 {
                     SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
                     if ( pViewShell && pViewShell->GetLayout() &&
                          pViewShell->GetLayout()->IsAnyShellAccessible() )
                     {
                         pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
                     }
                 }
                 if ( bInitNewSect )
@@ -1163,7 +1163,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
 }
 
 // Create a new SectionFrm for every occurrence in the Layout and insert before
-// the corresponding CntntFrm
+// the corresponding ContentFrm
 void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEndIdx )
 {
     OSL_ENSURE( pIdxBehind, "no Index" );
@@ -1193,26 +1193,26 @@ void SwSectionNode::DelFrms()
     }
 
     SwNodes& rNds = GetNodes();
-    m_pSection->GetFmt()->DelFrms();
+    m_pSection->GetFormat()->DelFrms();
 
     // Update our Flag
     m_pSection->m_Data.SetHiddenFlag(true);
 
     // If the Area is within a Fly or TableBox, we can only hide it if
     // there is more Content which has Frames.
-    // Or else the Fly/TblBox Frame does not have a Lower!
+    // Or else the Fly/TableBox Frame does not have a Lower!
     {
         SwNodeIndex aIdx( *this );
         if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
             !CheckNodesRange( *this, aIdx, true ) ||
             // #i21457#
-            !lcl_IsInSameTblBox( rNds, *this, true ))
+            !lcl_IsInSameTableBox( rNds, *this, true ))
         {
             aIdx = *EndOfSectionNode();
             if( !rNds.GoNextSection( &aIdx, true, false ) ||
                 !CheckNodesRange( *EndOfSectionNode(), aIdx, true ) ||
                 // #i21457#
-                !lcl_IsInSameTblBox( rNds, *EndOfSectionNode(), false ))
+                !lcl_IsInSameTableBox( rNds, *EndOfSectionNode(), false ))
             {
                 m_pSection->m_Data.SetHiddenFlag(false);
             }
@@ -1225,9 +1225,9 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     // In which array am I: Nodes, UndoNodes?
     const SwNodes& rNds = GetNodes();
 
-    // Copy the SectionFrmFmt
-    SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
-    pSectFmt->CopyAttrs( *GetSection().GetFmt() );
+    // Copy the SectionFrameFormat
+    SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( 0 );
+    pSectFormat->CopyAttrs( *GetSection().GetFormat() );
 
     boost::scoped_ptr<SwTOXBase> pTOXBase;
     if (TOX_CONTENT_SECTION == GetSection().GetType())
@@ -1239,7 +1239,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     }
 
     SwSectionNode *const pSectNd =
-        new SwSectionNode(rIdx, *pSectFmt, pTOXBase.get());
+        new SwSectionNode(rIdx, *pSectFormat, pTOXBase.get());
     SwEndNode* pEndNd = new SwEndNode( rIdx, *pSectNd );
     SwNodeIndex aInsPos( *pEndNd );
 
@@ -1291,12 +1291,12 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     }
 
     // METADATA: copy xml:id; must be done after insertion of node
-    pSectFmt->RegisterAsCopyOf(*GetSection().GetFmt());
+    pSectFormat->RegisterAsCopyOf(*GetSection().GetFormat());
 
     return pSectNd;
 }
 
-bool SwSectionNode::IsCntntHidden() const
+bool SwSectionNode::IsContentHidden() const
 {
     OSL_ENSURE( !m_pSection->IsHidden(),
             "That's simple: Hidden Section => Hidden Content" );
@@ -1313,7 +1313,7 @@ bool SwSectionNode::IsCntntHidden() const
         }
         else
         {
-            if( aTmp.GetNode().IsCntntNode() || aTmp.GetNode().IsTableNode() )
+            if( aTmp.GetNode().IsContentNode() || aTmp.GetNode().IsTableNode() )
                 return false; // We found non-hidden content
             OSL_ENSURE( aTmp.GetNode().IsEndNode(), "EndNode expected" );
         }
@@ -1324,26 +1324,26 @@ bool SwSectionNode::IsCntntHidden() const
 
 void SwSectionNode::NodesArrChgd()
 {
-    SwSectionFmt *const pFmt = m_pSection->GetFmt();
-    if( pFmt )
+    SwSectionFormat *const pFormat = m_pSection->GetFormat();
+    if( pFormat )
     {
         SwNodes& rNds = GetNodes();
-        SwDoc* pDoc = pFmt->GetDoc();
+        SwDoc* pDoc = pFormat->GetDoc();
 
         if( !rNds.IsDocNodes() )
         {
-            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-            pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+            pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
-        pFmt->LockModify();
-        pFmt->SetFmtAttr( SwFmtCntnt( this ));
-        pFmt->UnlockModify();
+        pFormat->LockModify();
+        pFormat->SetFormatAttr( SwFormatContent( this ));
+        pFormat->UnlockModify();
 
         SwSectionNode* pSectNd = StartOfSectionNode()->FindSectionNode();
         // set the correct parent from the new section
-        pFmt->SetDerivedFrom( pSectNd ? pSectNd->GetSection().GetFmt()
-                                      : pDoc->GetDfltFrmFmt() );
+        pFormat->SetDerivedFrom( pSectNd ? pSectNd->GetSection().GetFormat()
+                                      : pDoc->GetDfltFrameFormat() );
 
         // Set the right StartNode for all in this Area
         sal_uLong nStart = GetIndex()+1, nEnde = EndOfSectionIndex();
@@ -1351,7 +1351,7 @@ void SwSectionNode::NodesArrChgd()
             // Make up the Format's nesting
             if( 0 != ( pSectNd = rNds[ n ]->GetSectionNode() ) )
             {
-                pSectNd->GetSection().GetFmt()->SetDerivedFrom( pFmt );
+                pSectNd->GetSection().GetFormat()->SetDerivedFrom( pFormat );
                 n = pSectNd->EndOfSectionIndex();
             }
 
@@ -1385,7 +1385,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
     {
         OUString newName = "MailMergeSection"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpSectionFmtTbl->size() + 1 );
+            + OUString::number( mpSectionFormatTable->size() + 1 );
         if( pChkStr )
             newName += *pChkStr;
         return newName;
@@ -1393,14 +1393,14 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
 
     const OUString aName( ResId( STR_REGION_DEFNAME, *pSwResMgr ) );
 
-    SwSectionFmts::size_type nNum = 0;
-    const SwSectionFmts::size_type nFlagSize = ( mpSectionFmtTbl->size() / 8 ) + 2;
+    SwSectionFormats::size_type nNum = 0;
+    const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) + 2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( auto pFmt : *mpSectionFmtTbl )
+    for( auto pFormat : *mpSectionFormatTable )
     {
-        const SwSectionNode *const pSectNd = pFmt->GetSectionNode( false );
+        const SwSectionNode *const pSectNd = pFormat->GetSectionNode( false );
         if( pSectNd != nullptr )
         {
             const OUString rNm = pSectNd->GetSection().GetSectionName();
@@ -1408,7 +1408,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
             {
                 // Calculate the Number and reset the Flag
                 nNum = rNm.copy( aName.getLength() ).toInt32();
-                if( nNum-- && nNum < mpSectionFmtTbl->size() )
+                if( nNum-- && nNum < mpSectionFormatTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if( pChkStr && *pChkStr==rNm )
@@ -1419,8 +1419,8 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
     if( !pChkStr )
     {
         // Flagged all Numbers accordingly, so get the right Number
-        nNum = mpSectionFmtTbl->size();
-        for( SwSectionFmts::size_type n = 0; n < nFlagSize; ++n )
+        nNum = mpSectionFormatTable->size();
+        for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n )
         {
             auto nTmp = pSetFlags[ n ];
             if( nTmp != 0xFF )
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
index 9ca5f60ddf78..19c3eadbfe2c 100644
--- a/sw/source/core/docnode/ndsect.hxx
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 
-void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
+void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
 
 
 #endif
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c9ebc129ace7..7a77906d430d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star;
 
 const sal_Unicode T2T_PARA = 0x0a;
 
-static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
+static void lcl_SetDfltBoxAttr( SwFrameFormat& rFormat, sal_uInt8 nId )
 {
     bool bTop = false, bBottom = false, bLeft = false, bRight = false;
     switch ( nId )
@@ -117,7 +117,7 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
     case 3: bBottom = bLeft = bRight = true;        break;
     }
 
-    const bool bHTML = rFmt.getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE);
+    const bool bHTML = rFormat.getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE);
     Color aCol( bHTML ? COL_GRAY : COL_BLACK );
     SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
     if ( bHTML )
@@ -134,83 +134,83 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
         aBox.SetLine( &aLine, SvxBoxItemLine::LEFT );
     if ( bRight )
         aBox.SetLine( &aLine, SvxBoxItemLine::RIGHT );
-    rFmt.SetFmtAttr( aBox );
+    rFormat.SetFormatAttr( aBox );
 }
 
-typedef std::map<SwFrmFmt *, SwTableBoxFmt *> DfltBoxAttrMap_t;
+typedef std::map<SwFrameFormat *, SwTableBoxFormat *> DfltBoxAttrMap_t;
 typedef std::vector<DfltBoxAttrMap_t *> DfltBoxAttrList_t;
 
 static void
-lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFmtArr,
-        sal_uInt8 const nId, SwTableAutoFmt const*const pAutoFmt = 0)
+lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFormatArr,
+        sal_uInt8 const nId, SwTableAutoFormat const*const pAutoFormat = 0)
 {
-    DfltBoxAttrMap_t * pMap = rBoxFmtArr[ nId ];
+    DfltBoxAttrMap_t * pMap = rBoxFormatArr[ nId ];
     if (!pMap)
     {
         pMap = new DfltBoxAttrMap_t;
-        rBoxFmtArr[ nId ] = pMap;
+        rBoxFormatArr[ nId ] = pMap;
     }
 
-    SwTableBoxFmt* pNewTableBoxFmt = 0;
-    SwFrmFmt* pBoxFrmFmt = rBox.GetFrmFmt();
-    DfltBoxAttrMap_t::iterator const iter(pMap->find(pBoxFrmFmt));
+    SwTableBoxFormat* pNewTableBoxFormat = 0;
+    SwFrameFormat* pBoxFrameFormat = rBox.GetFrameFormat();
+    DfltBoxAttrMap_t::iterator const iter(pMap->find(pBoxFrameFormat));
     if (pMap->end() != iter)
     {
-        pNewTableBoxFmt = iter->second;
+        pNewTableBoxFormat = iter->second;
     }
     else
     {
-        SwDoc* pDoc = pBoxFrmFmt->GetDoc();
+        SwDoc* pDoc = pBoxFrameFormat->GetDoc();
         // format does not exist, so create it
-        pNewTableBoxFmt = pDoc->MakeTableBoxFmt();
-        pNewTableBoxFmt->SetFmtAttr( pBoxFrmFmt->GetAttrSet().Get( RES_FRM_SIZE ) );
+        pNewTableBoxFormat = pDoc->MakeTableBoxFormat();
+        pNewTableBoxFormat->SetFormatAttr( pBoxFrameFormat->GetAttrSet().Get( RES_FRM_SIZE ) );
 
-        if( pAutoFmt )
-            pAutoFmt->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFmt->GetAttrSet(),
-                                    SwTableAutoFmt::UPDATE_BOX,
+        if( pAutoFormat )
+            pAutoFormat->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFormat->GetAttrSet(),
+                                    SwTableAutoFormat::UPDATE_BOX,
                                     pDoc->GetNumberFormatter( true ) );
         else
-            ::lcl_SetDfltBoxAttr( *pNewTableBoxFmt, nId );
+            ::lcl_SetDfltBoxAttr( *pNewTableBoxFormat, nId );
 
-        (*pMap)[pBoxFrmFmt] = pNewTableBoxFmt;
+        (*pMap)[pBoxFrameFormat] = pNewTableBoxFormat;
     }
-    rBox.ChgFrmFmt( pNewTableBoxFmt );
+    rBox.ChgFrameFormat( pNewTableBoxFormat );
 }
 
-static SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
+static SwTableBoxFormat *lcl_CreateDfltBoxFormat( SwDoc &rDoc, std::vector<SwTableBoxFormat*> &rBoxFormatArr,
                                     sal_uInt16 nCols, sal_uInt8 nId )
 {
-    if ( !rBoxFmtArr[nId] )
+    if ( !rBoxFormatArr[nId] )
     {
-        SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
+        SwTableBoxFormat* pBoxFormat = rDoc.MakeTableBoxFormat();
         if( USHRT_MAX != nCols )
-            pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                             USHRT_MAX / nCols, 0 ));
-        ::lcl_SetDfltBoxAttr( *pBoxFmt, nId );
-        rBoxFmtArr[ nId ] = pBoxFmt;
+        ::lcl_SetDfltBoxAttr( *pBoxFormat, nId );
+        rBoxFormatArr[ nId ] = pBoxFormat;
     }
-    return rBoxFmtArr[nId];
+    return rBoxFormatArr[nId];
 }
 
-static SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
-                                    const SwTableAutoFmt& rAutoFmt,
+static SwTableBoxFormat *lcl_CreateAFormatBoxFormat( SwDoc &rDoc, std::vector<SwTableBoxFormat*> &rBoxFormatArr,
+                                    const SwTableAutoFormat& rAutoFormat,
                                     sal_uInt16 nCols, sal_uInt8 nId )
 {
-    if( !rBoxFmtArr[nId] )
+    if( !rBoxFormatArr[nId] )
     {
-        SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
-        rAutoFmt.UpdateToSet( nId, (SfxItemSet&)pBoxFmt->GetAttrSet(),
-                                SwTableAutoFmt::UPDATE_BOX,
+        SwTableBoxFormat* pBoxFormat = rDoc.MakeTableBoxFormat();
+        rAutoFormat.UpdateToSet( nId, (SfxItemSet&)pBoxFormat->GetAttrSet(),
+                                SwTableAutoFormat::UPDATE_BOX,
                                 rDoc.GetNumberFormatter( true ) );
         if( USHRT_MAX != nCols )
-            pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                             USHRT_MAX / nCols, 0 ));
-        rBoxFmtArr[ nId ] = pBoxFmt;
+        rBoxFormatArr[ nId ] = pBoxFormat;
     }
-    return rBoxFmtArr[nId];
+    return rBoxFormatArr[nId];
 }
 
-SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
+SwTableNode* SwDoc::IsIdxInTable(const SwNodeIndex& rIdx)
 {
     SwTableNode* pTableNd = 0;
     sal_uLong nIndex = rIdx.GetIndex();
@@ -227,10 +227,10 @@ SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
 /**
  * Insert a new Box before the InsPos
  */
-bool SwNodes::InsBoxen( SwTableNode* pTblNd,
+bool SwNodes::InsBoxen( SwTableNode* pTableNd,
                         SwTableLine* pLine,
-                        SwTableBoxFmt* pBoxFmt,
-                        SwTxtFmtColl* pTxtColl,
+                        SwTableBoxFormat* pBoxFormat,
+                        SwTextFormatColl* pTextColl,
                         const SfxItemSet* pAutoAttr,
                         sal_uInt16 nInsPos,
                         sal_uInt16 nCnt )
@@ -246,30 +246,30 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
     {
         if( nInsPos < pLine->GetTabBoxes().size() )
         {
-            if( 0 == (pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable(),
+            if( 0 == (pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable(),
                             pLine->GetTabBoxes()[ nInsPos ] )))
-                pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable() );
+                pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable() );
         }
         else
         {
-            if( 0 == (pNxtBox = pLine->FindNextBox( pTblNd->GetTable(),
+            if( 0 == (pNxtBox = pLine->FindNextBox( pTableNd->GetTable(),
                             pLine->GetTabBoxes().back() )))
-                pNxtBox = pLine->FindNextBox( pTblNd->GetTable() );
+                pNxtBox = pLine->FindNextBox( pTableNd->GetTable() );
         }
     }
-    else if( 0 == ( pNxtBox = pLine->FindNextBox( pTblNd->GetTable() )))
-        pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable() );
+    else if( 0 == ( pNxtBox = pLine->FindNextBox( pTableNd->GetTable() )))
+        pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable() );
 
     if( !pPrvBox && !pNxtBox )
     {
         bool bSetIdxPos = true;
-        if( pTblNd->GetTable().GetTabLines().size() && !nInsPos )
+        if( pTableNd->GetTable().GetTabLines().size() && !nInsPos )
         {
-            const SwTableLine* pTblLn = pLine;
-            while( pTblLn->GetUpper() )
-                pTblLn = pTblLn->GetUpper()->GetUpper();
+            const SwTableLine* pTableLn = pLine;
+            while( pTableLn->GetUpper() )
+                pTableLn = pTableLn->GetUpper()->GetUpper();
 
-            if( pTblNd->GetTable().GetTabLines()[ 0 ] == pTblLn )
+            if( pTableNd->GetTable().GetTabLines()[ 0 ] == pTableLn )
             {
                 // Before the Table's first Box
                 while( ( pNxtBox = pLine->GetTabBoxes()[0])->GetTabLines().size() )
@@ -280,7 +280,7 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
         }
         if( bSetIdxPos )
             // Tables without content or at the end; move before the End
-            nIdxPos = pTblNd->EndOfSectionIndex();
+            nIdxPos = pTableNd->EndOfSectionIndex();
     }
     else if( pNxtBox ) // There is a successor
         nIdxPos = pNxtBox->GetSttIdx();
@@ -292,10 +292,10 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
     {
         SwStartNode* pSttNd = new SwStartNode( aEndIdx, ND_STARTNODE,
                                                 SwTableBoxStartNode );
-        pSttNd->pStartOfSection = pTblNd;
+        pSttNd->pStartOfSection = pTableNd;
         new SwEndNode( aEndIdx, *pSttNd );
 
-        pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+        pPrvBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
 
         SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
         sal_uInt16 nRealInsPos = nInsPos + n;
@@ -304,21 +304,21 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
 
         rTabBoxes.insert( rTabBoxes.begin() + nRealInsPos, pPrvBox );
 
-        if( ! pTxtColl->IsAssignedToListLevelOfOutlineStyle()
+        if( ! pTextColl->IsAssignedToListLevelOfOutlineStyle()
 //FEATURE::CONDCOLL
-            && RES_CONDTXTFMTCOLL != pTxtColl->Which()
+            && RES_CONDTXTFMTCOLL != pTextColl->Which()
 //FEATURE::CONDCOLL
         )
-            new SwTxtNode( SwNodeIndex( *pSttNd->EndOfSectionNode() ),
-                                pTxtColl, pAutoAttr );
+            new SwTextNode( SwNodeIndex( *pSttNd->EndOfSectionNode() ),
+                                pTextColl, pAutoAttr );
         else
         {
             // Handle Outline numbering correctly!
-            SwTxtNode* pTNd = new SwTxtNode(
+            SwTextNode* pTNd = new SwTextNode(
                             SwNodeIndex( *pSttNd->EndOfSectionNode() ),
-                            GetDoc()->GetDfltTxtFmtColl(),
+                            GetDoc()->GetDfltTextFormatColl(),
                             pAutoAttr );
-            pTNd->ChgFmtColl( pTxtColl );
+            pTNd->ChgFormatColl( pTextColl );
         }
     }
     return true;
@@ -327,10 +327,10 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
 /**
  * Insert a new Table
  */
-const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts,
                                    const SwPosition& rPos, sal_uInt16 nRows,
                                    sal_uInt16 nCols, sal_Int16 eAdjust,
-                                   const SwTableAutoFmt* pTAFmt,
+                                   const SwTableAutoFormat* pTAFormat,
                                    const std::vector<sal_uInt16> *pColArr,
                                    bool bCalledFromShell,
                                    bool bNewModel )
@@ -350,68 +350,68 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
             pColArr = 0;
     }
 
-    OUString aTblName = GetUniqueTblName();
+    OUString aTableName = GetUniqueTableName();
 
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoInsTbl( rPos, nCols, nRows, static_cast<sal_uInt16>(eAdjust),
-                                      rInsTblOpts, pTAFmt, pColArr,
-                                      aTblName));
+            new SwUndoInsTable( rPos, nCols, nRows, static_cast<sal_uInt16>(eAdjust),
+                                      rInsTableOpts, pTAFormat, pColArr,
+                                      aTableName));
     }
 
     // Start with inserting the Nodes and get the AutoFormat for the Table
-    SwTxtFmtColl *pBodyColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE ),
+    SwTextFormatColl *pBodyColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE ),
                  *pHeadColl = pBodyColl;
 
-    bool bDfltBorders = 0 != ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER );
+    bool bDfltBorders = 0 != ( rInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER );
 
-    if( (rInsTblOpts.mnInsMode & tabopts::HEADLINE) && (1 != nRows || !bDfltBorders) )
-        pHeadColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN );
+    if( (rInsTableOpts.mnInsMode & tabopts::HEADLINE) && (1 != nRows || !bDfltBorders) )
+        pHeadColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE_HDLN );
 
     const sal_uInt16 nRowsToRepeat =
-            tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-            rInsTblOpts.mnRowsToRepeat :
+            tabopts::HEADLINE == (rInsTableOpts.mnInsMode & tabopts::HEADLINE) ?
+            rInsTableOpts.mnRowsToRepeat :
             0;
 
     /* Save content node to extract FRAMEDIR from. */
-    const SwCntntNode * pCntntNd = rPos.nNode.GetNode().GetCntntNode();
+    const SwContentNode * pContentNd = rPos.nNode.GetNode().GetContentNode();
 
     /* If we are called from a shell pass the attrset from
-        pCntntNd (aka the node the table is inserted at) thus causing
+        pContentNd (aka the node the table is inserted at) thus causing
         SwNodes::InsertTable to propagate an adjust item if
         necessary. */
-    SwTableNode *pTblNd = SwNodes::InsertTable(
+    SwTableNode *pTableNd = SwNodes::InsertTable(
         rPos.nNode,
         nCols,
         pBodyColl,
         nRows,
         nRowsToRepeat,
         pHeadColl,
-        bCalledFromShell ? &pCntntNd->GetSwAttrSet() : 0 );
+        bCalledFromShell ? &pContentNd->GetSwAttrSet() : 0 );
 
     // Create the Box/Line/Table construct
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( aTableName, GetDfltFrameFormat() );
 
     /* If the node to insert the table at is a context node and has a
        non-default FRAMEDIR propagate it to the table. */
-    if (pCntntNd)
+    if (pContentNd)
     {
-        const SwAttrSet & aNdSet = pCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    // Set Orientation at the Table's Fmt
-    pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
+    // Set Orientation at the Table's Format
+    pTableFormat->SetFormatAttr( SwFormatHoriOrient( 0, eAdjust ) );
     // All lines use the left-to-right Fill-Order!
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
 
     // Set USHRT_MAX as the Table's default SSize
     SwTwips nWidth = USHRT_MAX;
@@ -423,7 +423,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         {
             sal_uInt16 nFrmWidth = nLastPos;
             nLastPos = (*pColArr)[ pColArr->size()-2 ];
-            pTableFmt->SetFmtAttr( SvxLRSpaceItem( nSttPos, nFrmWidth - nLastPos, 0, 0, RES_LR_SPACE ) );
+            pTableFormat->SetFormatAttr( SvxLRSpaceItem( nSttPos, nFrmWidth - nLastPos, 0, 0, RES_LR_SPACE ) );
         }
         nWidth = nLastPos - nSttPos;
     }
@@ -432,13 +432,13 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         nWidth /= nCols;
         nWidth *= nCols; // to avoid rounding problems
     }
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth ));
-    if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth ));
+    if( !(rInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
+        pTableFormat->SetFormatAttr( SwFormatLayoutSplit( false ));
 
     // Move the hard PageDesc/PageBreak Attributes if needed
-    SwCntntNode* pNextNd = GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]
-                            ->GetCntntNode();
+    SwContentNode* pNextNd = GetNodes()[ pTableNd->EndOfSectionIndex()+1 ]
+                            ->GetContentNode();
     if( pNextNd && pNextNd->HasSwAttrSet() )
     {
         const SfxItemSet* pNdSet = pNextNd->GetpSwAttrSet();
@@ -446,75 +446,75 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         if( SfxItemState::SET == pNdSet->GetItemState( RES_PAGEDESC, false,
             &pItem ) )
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
             pNextNd->ResetAttr( RES_PAGEDESC );
             pNdSet = pNextNd->GetpSwAttrSet();
         }
         if( pNdSet && SfxItemState::SET == pNdSet->GetItemState( RES_BREAK, false,
              &pItem ) )
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
             pNextNd->ResetAttr( RES_BREAK );
         }
     }
 
-    SwTable& rNdTbl = pTblNd->GetTable();
-    rNdTbl.RegisterToFormat( *pTableFmt );
+    SwTable& rNdTable = pTableNd->GetTable();
+    rNdTable.RegisterToFormat( *pTableFormat );
 
-    rNdTbl.SetRowsToRepeat( nRowsToRepeat );
-    rNdTbl.SetTableModel( bNewModel );
+    rNdTable.SetRowsToRepeat( nRowsToRepeat );
+    rNdTable.SetTableModel( bNewModel );
 
-    std::vector<SwTableBoxFmt*> aBoxFmtArr;
-    SwTableBoxFmt* pBoxFmt = 0;
-    if( !bDfltBorders && !pTAFmt )
+    std::vector<SwTableBoxFormat*> aBoxFormatArr;
+    SwTableBoxFormat* pBoxFormat = 0;
+    if( !bDfltBorders && !pTAFormat )
     {
-        pBoxFmt = MakeTableBoxFmt();
-        pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 ));
+        pBoxFormat = MakeTableBoxFormat();
+        pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 ));
     }
     else
     {
-        const sal_uInt16 nBoxArrLen = pTAFmt ? 16 : 4;
-        aBoxFmtArr.resize( nBoxArrLen, NULL );
+        const sal_uInt16 nBoxArrLen = pTAFormat ? 16 : 4;
+        aBoxFormatArr.resize( nBoxArrLen, NULL );
     }
     SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
 
-    SwNodeIndex aNdIdx( *pTblNd, 1 ); // Set to StartNode of first Box
-    SwTableLines& rLines = rNdTbl.GetTabLines();
+    SwNodeIndex aNdIdx( *pTableNd, 1 ); // Set to StartNode of first Box
+    SwTableLines& rLines = rNdTable.GetTabLines();
     for( sal_uInt16 n = 0; n < nRows; ++n )
     {
-        SwTableLine* pLine = new SwTableLine( pLineFmt, nCols, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, nCols, 0 );
         rLines.insert( rLines.begin() + n, pLine );
         SwTableBoxes& rBoxes = pLine->GetTabBoxes();
         for( sal_uInt16 i = 0; i < nCols; ++i )
         {
-            SwTableBoxFmt *pBoxF;
-            if( pTAFmt )
+            SwTableBoxFormat *pBoxF;
+            if( pTAFormat )
             {
                 sal_uInt8 nId = static_cast<sal_uInt8>(!n ? 0 : (( n+1 == nRows )
                                         ? 12 : (4 * (1 + ((n-1) & 1 )))));
                 nId = nId + static_cast<sal_uInt8>( !i ? 0 :
                             ( i+1 == nCols ? 3 : (1 + ((i-1) & 1))));
-                pBoxF = ::lcl_CreateAFmtBoxFmt( *this, aBoxFmtArr, *pTAFmt,
+                pBoxF = ::lcl_CreateAFormatBoxFormat( *this, aBoxFormatArr, *pTAFormat,
                                                 nCols, nId );
 
                 // Set the Paragraph/Character Attributes if needed
-                if( pTAFmt->IsFont() || pTAFmt->IsJustify() )
+                if( pTAFormat->IsFont() || pTAFormat->IsJustify() )
                 {
                     aCharSet.ClearItem();
-                    pTAFmt->UpdateToSet( nId, aCharSet,
-                                        SwTableAutoFmt::UPDATE_CHAR, 0 );
+                    pTAFormat->UpdateToSet( nId, aCharSet,
+                                        SwTableAutoFormat::UPDATE_CHAR, 0 );
                     if( aCharSet.Count() )
-                        GetNodes()[ aNdIdx.GetIndex()+1 ]->GetCntntNode()->
+                        GetNodes()[ aNdIdx.GetIndex()+1 ]->GetContentNode()->
                             SetAttr( aCharSet );
                 }
             }
             else if( bDfltBorders )
             {
                 sal_uInt8 nBoxId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
-                pBoxF = ::lcl_CreateDfltBoxFmt( *this, aBoxFmtArr, nCols, nBoxId);
+                pBoxF = ::lcl_CreateDfltBoxFormat( *this, aBoxFormatArr, nCols, nBoxId);
             }
             else
-                pBoxF = pBoxFmt;
+                pBoxF = pBoxFormat;
 
             // For AutoFormat on input: the columns are set when inserting the Table
             // The Array contains the columns positions and not their widths!
@@ -525,11 +525,11 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
                 {
                     if( pBoxF->HasWriterListeners() ) // Create new Format
                     {
-                        SwTableBoxFmt *pNewFmt = MakeTableBoxFmt();
-                        *pNewFmt = *pBoxF;
-                        pBoxF = pNewFmt;
+                        SwTableBoxFormat *pNewFormat = MakeTableBoxFormat();
+                        *pNewFormat = *pBoxF;
+                        pBoxF = pNewFormat;
                     }
-                    pBoxF->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth ));
+                    pBoxF->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth ));
                 }
             }
 
@@ -540,12 +540,12 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     }
     // Insert Frms
     GetNodes().GoNext( &aNdIdx ); // Go to the next ContentNode
-    pTblNd->MakeFrms( &aNdIdx );
+    pTableNd->MakeFrms( &aNdIdx );
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
-        SwPaM aPam( *pTblNd->EndOfSectionNode(), *pTblNd, 1 );
+        SwPaM aPam( *pTableNd->EndOfSectionNode(), *pTableNd, 1 );
         if( getIDocumentRedlineAccess().IsRedlineOn() )
             getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true);
         else
@@ -553,42 +553,42 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     }
 
     getIDocumentState().SetModified();
-    CHECK_TABLE(rNdTbl);
-    return &rNdTbl;
+    CHECK_TABLE(rNdTable);
+    return &rNdTable;
 }
 
 SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
                                    sal_uInt16 nBoxes,
-                                   SwTxtFmtColl* pCntntTxtColl,
+                                   SwTextFormatColl* pContentTextColl,
                                    sal_uInt16 nLines,
                                    sal_uInt16 nRepeat,
-                                   SwTxtFmtColl* pHeadlineTxtColl,
+                                   SwTextFormatColl* pHeadlineTextColl,
                                    const SwAttrSet * pAttrSet)
 {
     if( !nBoxes )
         return 0;
 
     // If Lines is given, create the Matrix from Lines and Boxes
-    if( !pHeadlineTxtColl || !nLines )
-        pHeadlineTxtColl = pCntntTxtColl;
+    if( !pHeadlineTextColl || !nLines )
+        pHeadlineTextColl = pContentTextColl;
 
-    SwTableNode * pTblNd = new SwTableNode( rNdIdx );
-    SwEndNode* pEndNd = new SwEndNode( rNdIdx, *pTblNd );
+    SwTableNode * pTableNd = new SwTableNode( rNdIdx );
+    SwEndNode* pEndNd = new SwEndNode( rNdIdx, *pTableNd );
 
     if( !nLines ) // For the for loop
         ++nLines;
 
     SwNodeIndex aIdx( *pEndNd );
-    SwTxtFmtColl* pTxtColl = pHeadlineTxtColl;
+    SwTextFormatColl* pTextColl = pHeadlineTextColl;
     for( sal_uInt16 nL = 0; nL < nLines; ++nL )
     {
         for( sal_uInt16 nB = 0; nB < nBoxes; ++nB )
         {
             SwStartNode* pSttNd = new SwStartNode( aIdx, ND_STARTNODE,
                                                     SwTableBoxStartNode );
-            pSttNd->pStartOfSection = pTblNd;
+            pSttNd->pStartOfSection = pTableNd;
 
-            SwTxtNode * pTmpNd = new SwTxtNode( aIdx, pTxtColl );
+            SwTextNode * pTmpNd = new SwTextNode( aIdx, pTextColl );
 
             // #i60422# Propagate some more attributes.
             const SfxPoolItem* pItem = NULL;
@@ -605,7 +605,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
                 {
                     if ( SfxItemState::SET != pTmpNd->GetSwAttrSet().GetItemState( *pIdx ) &&
                          SfxItemState::SET == pAttrSet->GetItemState( *pIdx, true, &pItem ) )
-                        static_cast<SwCntntNode *>(pTmpNd)->SetAttr(*pItem);
+                        static_cast<SwContentNode *>(pTmpNd)->SetAttr(*pItem);
                     ++pIdx;
                 }
             }
@@ -613,41 +613,41 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
             new SwEndNode( aIdx, *pSttNd );
         }
         if ( nL + 1 >= nRepeat )
-            pTxtColl = pCntntTxtColl;
+            pTextColl = pContentTextColl;
     }
-    return pTblNd;
+    return pTableNd;
 }
 
 /**
  * Text to Table
  */
-const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTableOpts,
                                    const SwPaM& rRange, sal_Unicode cCh,
                                    sal_Int16 eAdjust,
-                                   const SwTableAutoFmt* pTAFmt )
+                                   const SwTableAutoFormat* pTAFormat )
 {
     // See if the selection contains a Table
     const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
     {
         sal_uLong nCnt = pStt->nNode.GetIndex();
         for( ; nCnt <= pEnd->nNode.GetIndex(); ++nCnt )
-            if( !GetNodes()[ nCnt ]->IsTxtNode() )
+            if( !GetNodes()[ nCnt ]->IsTextNode() )
                 return 0;
     }
 
     // Save first node in the selection if it is a context node
-    SwCntntNode * pSttCntntNd = pStt->nNode.GetNode().GetCntntNode();
+    SwContentNode * pSttContentNd = pStt->nNode.GetNode().GetContentNode();
 
     SwPaM aOriginal( *pStt, *pEnd );
     pStt = aOriginal.GetMark();
     pEnd = aOriginal.GetPoint();
 
-    SwUndoTxtToTbl* pUndo = 0;
+    SwUndoTextToTable* pUndo = 0;
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_TEXTTOTABLE, NULL );
-        pUndo = new SwUndoTxtToTbl( aOriginal, rInsTblOpts, cCh,
-                    static_cast<sal_uInt16>(eAdjust), pTAFmt );
+        pUndo = new SwUndoTextToTable( aOriginal, rInsTableOpts, cCh,
+                    static_cast<sal_uInt16>(eAdjust), pTAFormat );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
 
         // Do not add splitting the TextNode to the Undo history
@@ -661,18 +661,18 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     if( pStt->nContent.GetIndex() )
         getIDocumentContentOperations().SplitNode( *pStt, false );
 
-    bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+    bool bEndContent = 0 != pEnd->nContent.GetIndex();
 
     // Do not split at the End of a Line (except at the End of the Doc)
-    if( bEndCntnt )
+    if( bEndContent )
     {
-        if( pEnd->nNode.GetNode().GetCntntNode()->Len() != pEnd->nContent.GetIndex()
+        if( pEnd->nNode.GetNode().GetContentNode()->Len() != pEnd->nContent.GetIndex()
             || pEnd->nNode.GetIndex() >= GetNodes().GetEndOfContent().GetIndex()-1 )
         {
             getIDocumentContentOperations().SplitNode( *pEnd, false );
             --((SwNodeIndex&)pEnd->nNode);
             ((SwIndex&)pEnd->nContent).Assign(
-                                pEnd->nNode.GetNode().GetCntntNode(), 0 );
+                                pEnd->nNode.GetNode().GetContentNode(), 0 );
             // A Node and at the End?
             if( pStt->nNode.GetIndex() >= pEnd->nNode.GetIndex() )
                 --aRg.aStart;
@@ -693,78 +693,78 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     GetIDocumentUndoRedo().DoUndo( 0 != pUndo );
 
     // Create the Box/Line/Table construct
-    SwTableBoxFmt* pBoxFmt = MakeTableBoxFmt();
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() );
+    SwTableBoxFormat* pBoxFormat = MakeTableBoxFormat();
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( GetUniqueTableName(), GetDfltFrameFormat() );
 
     // All Lines have a left-to-right Fill Order
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
     // The Table's SSize is USHRT_MAX
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
-    if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
+    if( !(rInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
+        pTableFormat->SetFormatAttr( SwFormatLayoutSplit( false ));
 
     /* If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
        replacing table. */
-    if (pSttCntntNd)
+    if (pSttContentNd)
     {
-        const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pSttContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    SwTableNode* pTblNd = GetNodes().TextToTable(
-            aRg, cCh, pTableFmt, pLineFmt, pBoxFmt,
-            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), pUndo );
+    SwTableNode* pTableNd = GetNodes().TextToTable(
+            aRg, cCh, pTableFormat, pLineFormat, pBoxFormat,
+            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ), pUndo );
 
-    SwTable& rNdTbl = pTblNd->GetTable();
+    SwTable& rNdTable = pTableNd->GetTable();
 
     const sal_uInt16 nRowsToRepeat =
-            tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-            rInsTblOpts.mnRowsToRepeat :
+            tabopts::HEADLINE == (rInsTableOpts.mnInsMode & tabopts::HEADLINE) ?
+            rInsTableOpts.mnRowsToRepeat :
             0;
-    rNdTbl.SetRowsToRepeat(nRowsToRepeat);
+    rNdTable.SetRowsToRepeat(nRowsToRepeat);
 
-    bool bUseBoxFmt = false;
-    if( !pBoxFmt->HasWriterListeners() )
+    bool bUseBoxFormat = false;
+    if( !pBoxFormat->HasWriterListeners() )
     {
         // The Box's Formats already have the right size, we must only set
-        // the right Border/AutoFmt.
-        bUseBoxFmt = true;
-        pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
-        delete pBoxFmt;
+        // the right Border/AutoFormat.
+        bUseBoxFormat = true;
+        pTableFormat->SetFormatAttr( pBoxFormat->GetFrmSize() );
+        delete pBoxFormat;
         eAdjust = text::HoriOrientation::NONE;
     }
 
-    // Set Orientation in the Table's Fmt
-    pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
+    // Set Orientation in the Table's Format
+    pTableFormat->SetFormatAttr( SwFormatHoriOrient( 0, eAdjust ) );
 
-    if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
+    if( pTAFormat || ( rInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
     {
-        sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4;
-        std::unique_ptr< DfltBoxAttrList_t > aBoxFmtArr1;
-        std::unique_ptr< std::vector<SwTableBoxFmt*> > aBoxFmtArr2;
-        if( bUseBoxFmt )
+        sal_uInt8 nBoxArrLen = pTAFormat ? 16 : 4;
+        std::unique_ptr< DfltBoxAttrList_t > aBoxFormatArr1;
+        std::unique_ptr< std::vector<SwTableBoxFormat*> > aBoxFormatArr2;
+        if( bUseBoxFormat )
         {
-            aBoxFmtArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
+            aBoxFormatArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
         }
         else
         {
-            aBoxFmtArr2.reset(new std::vector<SwTableBoxFmt*>( nBoxArrLen, NULL ));
+            aBoxFormatArr2.reset(new std::vector<SwTableBoxFormat*>( nBoxArrLen, NULL ));
         }
 
         SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
 
         SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
 
-        SwTableBoxFmt *pBoxF = 0;
-        SwTableLines& rLines = rNdTbl.GetTabLines();
+        SwTableBoxFormat *pBoxF = 0;
+        SwTableLines& rLines = rNdTable.GetTabLines();
         const SwTableLines::size_type nRows = rLines.size();
         for( SwTableLines::size_type n = 0; n < nRows; ++n )
         {
@@ -775,34 +775,34 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                 SwTableBox* pBox = rBoxes[ i ];
                 bool bChgSz = false;
 
-                if( pTAFmt )
+                if( pTAFormat )
                 {
                     sal_uInt8 nId = static_cast<sal_uInt8>(!n ? 0 : (( n+1 == nRows )
                                             ? 12 : (4 * (1 + ((n-1) & 1 )))));
                     nId = nId + static_cast<sal_uInt8>(!i ? 0 :
                                 ( i+1 == nCols ? 3 : (1 + ((i-1) & 1))));
-                    if( bUseBoxFmt )
-                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFmtArr1, nId, pTAFmt );
+                    if( bUseBoxFormat )
+                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFormatArr1, nId, pTAFormat );
                     else
                     {
-                        bChgSz = 0 == (*aBoxFmtArr2)[ nId ];
-                        pBoxF = ::lcl_CreateAFmtBoxFmt( *this, *aBoxFmtArr2,
-                                                *pTAFmt, USHRT_MAX, nId );
+                        bChgSz = 0 == (*aBoxFormatArr2)[ nId ];
+                        pBoxF = ::lcl_CreateAFormatBoxFormat( *this, *aBoxFormatArr2,
+                                                *pTAFormat, USHRT_MAX, nId );
                     }
 
                     // Set Paragraph/Character Attributes if needed
-                    if( pTAFmt->IsFont() || pTAFmt->IsJustify() )
+                    if( pTAFormat->IsFont() || pTAFormat->IsJustify() )
                     {
                         aCharSet.ClearItem();
-                        pTAFmt->UpdateToSet( nId, aCharSet,
-                                            SwTableAutoFmt::UPDATE_CHAR, 0 );
+                        pTAFormat->UpdateToSet( nId, aCharSet,
+                                            SwTableAutoFormat::UPDATE_CHAR, 0 );
                         if( aCharSet.Count() )
                         {
                             sal_uLong nSttNd = pBox->GetSttIdx()+1;
                             sal_uLong nEndNd = pBox->GetSttNd()->EndOfSectionIndex();
                             for( ; nSttNd < nEndNd; ++nSttNd )
                             {
-                                SwCntntNode* pNd = GetNodes()[ nSttNd ]->GetCntntNode();
+                                SwContentNode* pNd = GetNodes()[ nSttNd ]->GetContentNode();
                                 if( pNd )
                                 {
                                     if( pHistory )
@@ -820,51 +820,51 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                 else
                 {
                     sal_uInt8 nId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
-                    if( bUseBoxFmt )
-                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFmtArr1, nId );
+                    if( bUseBoxFormat )
+                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFormatArr1, nId );
                     else
                     {
-                        bChgSz = 0 == (*aBoxFmtArr2)[ nId ];
-                        pBoxF = ::lcl_CreateDfltBoxFmt( *this, *aBoxFmtArr2,
+                        bChgSz = 0 == (*aBoxFormatArr2)[ nId ];
+                        pBoxF = ::lcl_CreateDfltBoxFormat( *this, *aBoxFormatArr2,
                                                         USHRT_MAX, nId );
                     }
                 }
 
-                if( !bUseBoxFmt )
+                if( !bUseBoxFormat )
                 {
                     if( bChgSz )
-                        pBoxF->SetFmtAttr( pBox->GetFrmFmt()->GetFrmSize() );
-                    pBox->ChgFrmFmt( pBoxF );
+                        pBoxF->SetFormatAttr( pBox->GetFrameFormat()->GetFrmSize() );
+                    pBox->ChgFrameFormat( pBoxF );
                 }
             }
         }
 
-        if( bUseBoxFmt )
+        if( bUseBoxFormat )
         {
             for( sal_uInt8 i = 0; i < nBoxArrLen; ++i )
             {
-                delete (*aBoxFmtArr1)[ i ];
+                delete (*aBoxFormatArr1)[ i ];
             }
         }
     }
 
     // Check the boxes for numbers
-    if( IsInsTblFormatNum() )
+    if( IsInsTableFormatNum() )
     {
-        for (size_t nBoxes = rNdTbl.GetTabSortBoxes().size(); nBoxes; )
+        for (size_t nBoxes = rNdTable.GetTabSortBoxes().size(); nBoxes; )
         {
-            ChkBoxNumFmt(*rNdTbl.GetTabSortBoxes()[ --nBoxes ], false);
+            ChkBoxNumFormat(*rNdTable.GetTabSortBoxes()[ --nBoxes ], false);
         }
     }
 
-    sal_uLong nIdx = pTblNd->GetIndex();
+    sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     {
         SwPaM& rTmp = (SwPaM&)rRange; // Point always at the Start
         rTmp.DeleteMark();
-        rTmp.GetPoint()->nNode = *pTblNd;
-        SwCntntNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
+        rTmp.GetPoint()->nNode = *pTableNd;
+        SwContentNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
         rTmp.GetPoint()->nContent.Assign( pCNd, 0 );
     }
 
@@ -875,44 +875,44 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
 
     getIDocumentState().SetModified();
     getIDocumentFieldsAccess().SetFieldsDirty(true, NULL, 0);
-    return &rNdTbl;
+    return &rNdTable;
 }
 
-static void lcl_RemoveBreaks(SwCntntNode & rNode, SwTableFmt *const pTableFmt)
+static void lcl_RemoveBreaks(SwContentNode & rNode, SwTableFormat *const pTableFormat)
 {
     // delete old layout frames, new ones need to be created...
     rNode.DelFrms();
 
-    if (!rNode.IsTxtNode())
+    if (!rNode.IsTextNode())
     {
         return;
     }
 
-    SwTxtNode & rTxtNode = *rNode.GetTxtNode();
+    SwTextNode & rTextNode = *rNode.GetTextNode();
     // remove PageBreaks/PageDesc/ColBreak
-    SfxItemSet const* pSet = rTxtNode.GetpSwAttrSet();
+    SfxItemSet const* pSet = rTextNode.GetpSwAttrSet();
     if (pSet)
     {
         const SfxPoolItem* pItem;
         if (SfxItemState::SET == pSet->GetItemState(RES_BREAK, false, &pItem))
         {
-            if (pTableFmt)
+            if (pTableFormat)
             {
-                pTableFmt->SetFmtAttr(*pItem);
+                pTableFormat->SetFormatAttr(*pItem);
             }
-            rTxtNode.ResetAttr(RES_BREAK);
-            pSet = rTxtNode.GetpSwAttrSet();
+            rTextNode.ResetAttr(RES_BREAK);
+            pSet = rTextNode.GetpSwAttrSet();
         }
 
         if (pSet
             && (SfxItemState::SET == pSet->GetItemState(RES_PAGEDESC, false, &pItem))
-            && static_cast<SwFmtPageDesc const*>(pItem)->GetPageDesc())
+            && static_cast<SwFormatPageDesc const*>(pItem)->GetPageDesc())
         {
-            if (pTableFmt)
+            if (pTableFormat)
             {
-                pTableFmt->SetFmtAttr(*pItem);
+                pTableFormat->SetFormatAttr(*pItem);
             }
-            rTxtNode.ResetAttr(RES_PAGEDESC);
+            rTextNode.ResetAttr(RES_PAGEDESC);
         }
     }
 }
@@ -922,8 +922,8 @@ static void lcl_RemoveBreaks(SwCntntNode & rNode, SwTableFmt *const pTableFmt)
  */
 static void
 lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
-    SwTableNode & rTblNd, SwTableBoxFmt & rBoxFmt, SwTxtFmtColl & rTxtColl,
-    SwUndoTxtToTbl *const pUndo, std::vector<sal_uInt16> *const pPositions)
+    SwTableNode & rTableNd, SwTableBoxFormat & rBoxFormat, SwTextFormatColl & rTextColl,
+    SwUndoTextToTable *const pUndo, std::vector<sal_uInt16> *const pPositions)
 {
     for (size_t n = 0; n < rTable.GetTabLines().size(); ++n)
     {
@@ -931,7 +931,7 @@ lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
         size_t const nBoxes = pCurrLine->GetTabBoxes().size();
         if (nMaxBoxes != nBoxes)
         {
-            rTblNd.GetNodes().InsBoxen(&rTblNd, pCurrLine, &rBoxFmt, &rTxtColl,
+            rTableNd.GetNodes().InsBoxen(&rTableNd, pCurrLine, &rBoxFormat, &rTextColl,
                     0, nBoxes, nMaxBoxes - nBoxes);
 
             if (pUndo)
@@ -953,7 +953,7 @@ lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
 
 static void
 lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
-        SwTableBoxFmt & rBoxFmt, SwDoc & rDoc,
+        SwTableBoxFormat & rBoxFormat, SwDoc & rDoc,
         std::vector<sal_uInt16> *const pPositions)
 {
     if (pPositions && !pPositions->empty())
@@ -962,71 +962,71 @@ lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
         sal_uInt16 nLastPos = 0;
         for (size_t n = 0; n < pPositions->size(); ++n)
         {
-            SwTableBoxFmt *pNewFmt = rDoc.MakeTableBoxFmt();
-            pNewFmt->SetFmtAttr(
-                    SwFmtFrmSize(ATT_VAR_SIZE, (*pPositions)[n] - nLastPos));
+            SwTableBoxFormat *pNewFormat = rDoc.MakeTableBoxFormat();
+            pNewFormat->SetFormatAttr(
+                    SwFormatFrmSize(ATT_VAR_SIZE, (*pPositions)[n] - nLastPos));
             for (size_t nTmpLine = 0; nTmpLine < rLns.size(); ++nTmpLine)
             {
                 // Have to do an Add here, because the BoxFormat
                 // is still needed by the caller
-                pNewFmt->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
+                pNewFormat->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
             }
 
             nLastPos = (*pPositions)[ n ];
         }
 
         // propagate size upwards from format, so the table gets the right size
-        SAL_WARN_IF(rBoxFmt.HasWriterListeners(), "sw.core",
+        SAL_WARN_IF(rBoxFormat.HasWriterListeners(), "sw.core",
                 "who is still registered in the format?");
-        rBoxFmt.SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
+        rBoxFormat.SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nLastPos ));
     }
     else
     {
         size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
-        rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+        rBoxFormat.SetFormatAttr(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
     }
 }
 
 SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
-                                    SwTableFmt* pTblFmt,
-                                    SwTableLineFmt* pLineFmt,
-                                    SwTableBoxFmt* pBoxFmt,
-                                    SwTxtFmtColl* pTxtColl,
-                                    SwUndoTxtToTbl* pUndo )
+                                    SwTableFormat* pTableFormat,
+                                    SwTableLineFormat* pLineFormat,
+                                    SwTableBoxFormat* pBoxFormat,
+                                    SwTextFormatColl* pTextColl,
+                                    SwUndoTextToTable* pUndo )
 {
     if( rRange.aStart >= rRange.aEnd )
         return 0;
 
-    SwTableNode * pTblNd = new SwTableNode( rRange.aStart );
-    new SwEndNode( rRange.aEnd, *pTblNd );
+    SwTableNode * pTableNd = new SwTableNode( rRange.aStart );
+    new SwEndNode( rRange.aEnd, *pTableNd );
 
     SwDoc* pDoc = GetDoc();
     std::vector<sal_uInt16> aPosArr;
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     SwTableBox* pBox;
     sal_uInt16 nBoxes, nLines, nMaxBoxes = 0;
 
-    SwNodeIndex aSttIdx( *pTblNd, 1 );
+    SwNodeIndex aSttIdx( *pTableNd, 1 );
     SwNodeIndex aEndIdx( rRange.aEnd, -1 );
     for( nLines = 0, nBoxes = 0;
         aSttIdx.GetIndex() < aEndIdx.GetIndex();
         aSttIdx += 2, nLines++, nBoxes = 0 )
     {
-        SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNd, "Only add TextNodes to the Table" );
+        SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNd, "Only add TextNodes to the Table" );
 
         if( !nLines && 0x0b == cCh )
         {
             cCh = 0x09;
 
             // Get the separator's position from the first Node, in order for the Boxes to be set accordingly
-            SwTxtFrmInfo aFInfo( static_cast<SwTxtFrm*>(pTxtNd->getLayoutFrm( pTxtNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )) );
+            SwTextFrmInfo aFInfo( static_cast<SwTextFrm*>(pTextNd->getLayoutFrm( pTextNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )) );
             if( aFInfo.IsOneLine() ) // only makes sense in this case
             {
-                OUString const& rTxt(pTxtNd->GetTxt());
-                for (sal_Int32 nChPos = 0; nChPos < rTxt.getLength(); ++nChPos)
+                OUString const& rText(pTextNd->GetText());
+                for (sal_Int32 nChPos = 0; nChPos < rText.getLength(); ++nChPos)
                 {
-                    if (rTxt[nChPos] == cCh)
+                    if (rText[nChPos] == cCh)
                     {
                         aPosArr.push_back( static_cast<sal_uInt16>(
                                         aFInfo.GetCharPos( nChPos+1, false )) );
@@ -1041,34 +1041,34 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
             }
         }
 
-        lcl_RemoveBreaks(*pTxtNd, (0 == nLines) ? pTblFmt : 0);
+        lcl_RemoveBreaks(*pTextNd, (0 == nLines) ? pTableFormat : 0);
 
         // Set the TableNode as StartNode for all TextNodes in the Table
-        pTxtNd->pStartOfSection = pTblNd;
+        pTextNd->pStartOfSection = pTableNd;
 
-        SwTableLine* pLine = new SwTableLine( pLineFmt, 1, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, 1, 0 );
         rTable.GetTabLines().insert(rTable.GetTabLines().begin() + nLines, pLine);
 
         SwStartNode* pSttNd;
-        SwPosition aCntPos( aSttIdx, SwIndex( pTxtNd ));
+        SwPosition aCntPos( aSttIdx, SwIndex( pTextNd ));
 
-        const std::shared_ptr< sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save( pDoc, aSttIdx.GetIndex(), pTxtNd->GetTxt().getLength() );
+        const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save( pDoc, aSttIdx.GetIndex(), pTextNd->GetText().getLength() );
 
         if( T2T_PARA != cCh )
         {
-            for (sal_Int32 nChPos = 0; nChPos < pTxtNd->GetTxt().getLength();)
+            for (sal_Int32 nChPos = 0; nChPos < pTextNd->GetText().getLength();)
             {
-                if (pTxtNd->GetTxt()[nChPos] == cCh)
+                if (pTextNd->GetText()[nChPos] == cCh)
                 {
                     aCntPos.nContent = nChPos;
-                    SwCntntNode* pNewNd = pTxtNd->SplitCntntNode( aCntPos );
+                    SwContentNode* pNewNd = pTextNd->SplitContentNode( aCntPos );
 
-                    if( !pCntntStore->Empty() )
-                        pCntntStore->Restore( *pNewNd, nChPos, nChPos + 1 );
+                    if( !pContentStore->Empty() )
+                        pContentStore->Restore( *pNewNd, nChPos, nChPos + 1 );
 
                     // Delete separator and correct search string
-                    pTxtNd->EraseText( aCntPos.nContent, 1 );
+                    pTextNd->EraseText( aCntPos.nContent, 1 );
                     nChPos = 0;
 
                     // Set the TableNode as StartNode for all TextNodes in the Table
@@ -1079,7 +1079,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
                     pNewNd->pStartOfSection = pSttNd;
 
                     // Assign Section to the Box
-                    pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+                    pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
                     pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
                 }
                 else
@@ -1090,26 +1090,26 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
         }
 
         // Now for the last substring
-        if( !pCntntStore->Empty())
-            pCntntStore->Restore( *pTxtNd, pTxtNd->GetTxt().getLength(), pTxtNd->GetTxt().getLength()+1 );
+        if( !pContentStore->Empty())
+            pContentStore->Restore( *pTextNd, pTextNd->GetText().getLength(), pTextNd->GetText().getLength()+1 );
 
         pSttNd = new SwStartNode( aCntPos.nNode, ND_STARTNODE, SwTableBoxStartNode );
         const SwNodeIndex aTmpIdx( aCntPos.nNode, 1 );
         new SwEndNode( aTmpIdx, *pSttNd  );
-        pTxtNd->pStartOfSection = pSttNd;
+        pTextNd->pStartOfSection = pSttNd;
 
-        pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+        pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
         pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
         if( nMaxBoxes < nBoxes )
             nMaxBoxes = nBoxes;
     }
 
-    lcl_BalanceTable(rTable, nMaxBoxes, *pTblNd, *pBoxFmt, *pTxtColl,
+    lcl_BalanceTable(rTable, nMaxBoxes, *pTableNd, *pBoxFormat, *pTextColl,
             pUndo, &aPosArr);
-    rTable.RegisterToFormat(*pTblFmt);
-    lcl_SetTableBoxWidths(rTable, nMaxBoxes, *pBoxFmt, *pDoc, &aPosArr);
+    rTable.RegisterToFormat(*pTableFormat);
+    lcl_SetTableBoxWidths(rTable, nMaxBoxes, *pBoxFormat, *pDoc, &aPosArr);
 
-    return pTblNd;
+    return pTableNd;
 }
 
 const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes )
@@ -1128,7 +1128,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
         return NULL;
 
     /* Save first node in the selection if it is a content node. */
-    SwCntntNode * pSttCntntNd = rFirstRange.begin()->aStart.GetNode().GetCntntNode();
+    SwContentNode * pSttContentNd = rFirstRange.begin()->aStart.GetNode().GetContentNode();
 
     const SwNodeRange& rStartRange = *rFirstRange.begin();
     const SwNodeRange& rEndRange = *rLastRange.rbegin();
@@ -1152,18 +1152,18 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     if( pStt->nContent.GetIndex() )
         getIDocumentContentOperations().SplitNode( *pStt, false );
 
-    bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+    bool bEndContent = 0 != pEnd->nContent.GetIndex();
 
     // Do not split at the End of a Line (except at the End of the Doc)
-    if( bEndCntnt )
+    if( bEndContent )
     {
-        if( pEnd->nNode.GetNode().GetCntntNode()->Len() != pEnd->nContent.GetIndex()
+        if( pEnd->nNode.GetNode().GetContentNode()->Len() != pEnd->nContent.GetIndex()
             || pEnd->nNode.GetIndex() >= GetNodes().GetEndOfContent().GetIndex()-1 )
         {
             getIDocumentContentOperations().SplitNode( *pEnd, false );
             --((SwNodeIndex&)pEnd->nNode);
             ((SwIndex&)pEnd->nContent).Assign(
-                                pEnd->nNode.GetNode().GetCntntNode(), 0 );
+                                pEnd->nNode.GetNode().GetContentNode(), 0 );
             // A Node and at the End?
             if( pStt->nNode.GetIndex() >= pEnd->nNode.GetIndex() )
                 --aRg.aStart;
@@ -1193,16 +1193,16 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
             {
                 assert(SwNodeIndex(*pPrev, +1) == cell->aStart);
                 SwPaM pam(cell->aStart, 0, *pPrev,
-                        (pPrev->GetNode().IsCntntNode())
-                            ? pPrev->GetNode().GetCntntNode()->Len() : 0);
+                        (pPrev->GetNode().IsContentNode())
+                            ? pPrev->GetNode().GetContentNode()->Len() : 0);
                 rIDRA.SplitRedline(pam);
                 pPrev = &cell->aEnd;
             }
         }
         // another one to break between last cell and node after table
         SwPaM pam(SwNodeIndex(*pPrev, +1), 0, *pPrev,
-                    (pPrev->GetNode().IsCntntNode())
-                        ? pPrev->GetNode().GetCntntNode()->Len() : 0);
+                    (pPrev->GetNode().IsContentNode())
+                        ? pPrev->GetNode().GetContentNode()->Len() : 0);
         rIDRA.SplitRedline(pam);
     }
 
@@ -1212,50 +1212,50 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     GetIDocumentUndoRedo().DoUndo(bUndo);
 
     // Create the Box/Line/Table construct
-    SwTableBoxFmt* pBoxFmt = MakeTableBoxFmt();
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() );
+    SwTableBoxFormat* pBoxFormat = MakeTableBoxFormat();
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( GetUniqueTableName(), GetDfltFrameFormat() );
 
     // All Lines have a left-to-right Fill Order
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
     // The Table's SSize is USHRT_MAX
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
 
     /* If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
        replacing table. */
-    if (pSttCntntNd)
+    if (pSttContentNd)
     {
-        const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pSttContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    SwTableNode* pTblNd = GetNodes().TextToTable(
-            rTableNodes, pTableFmt, pLineFmt, pBoxFmt,
-            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
+    SwTableNode* pTableNd = GetNodes().TextToTable(
+            rTableNodes, pTableFormat, pLineFormat, pBoxFormat,
+            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
 
-    SwTable& rNdTbl = pTblNd->GetTable();
+    SwTable& rNdTable = pTableNd->GetTable();
 
-    if( !pBoxFmt->HasWriterListeners() )
+    if( !pBoxFormat->HasWriterListeners() )
     {
         // The Box's Formats already have the right size, we must only set
-        // the right Border/AutoFmt.
-        pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
-        delete pBoxFmt;
+        // the right Border/AutoFormat.
+        pTableFormat->SetFormatAttr( pBoxFormat->GetFrmSize() );
+        delete pBoxFormat;
     }
 
-    sal_uLong nIdx = pTblNd->GetIndex();
+    sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     getIDocumentState().SetModified();
     getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
-    return &rNdTbl;
+    return &rNdTable;
 }
 
 SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
@@ -1322,7 +1322,7 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
 
 static void
 lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
-        SwTableBoxFmt & rBoxFmt, SwDoc & rDoc)
+        SwTableBoxFormat & rBoxFormat, SwDoc & rDoc)
 {
     // rhbz#820283, fdo#55462: set default box widths so table width is covered
     SwTableLines & rLines = rTable.GetTabLines();
@@ -1333,35 +1333,35 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
         if (nMissing)
         {
             // default width for box at the end of an incomplete line
-            SwTableBoxFmt *const pNewFmt = rDoc.MakeTableBoxFmt();
+            SwTableBoxFormat *const pNewFormat = rDoc.MakeTableBoxFormat();
             size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
-            pNewFmt->SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE,
+            pNewFormat->SetFormatAttr( SwFormatFrmSize(ATT_VAR_SIZE,
                         nWidth * (nMissing + 1)) );
-            pNewFmt->Add(rBoxes.back());
+            pNewFormat->Add(rBoxes.back());
         }
     }
     size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
     // default width for all boxes not at the end of an incomplete line
-    rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+    rBoxFormat.SetFormatAttr(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
 }
 
 SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
-                                    SwTableFmt* pTblFmt,
-                                    SwTableLineFmt* pLineFmt,
-                                    SwTableBoxFmt* pBoxFmt,
-                                    SwTxtFmtColl* /*pTxtColl*/  /*, SwUndo... pUndo*/  )
+                                    SwTableFormat* pTableFormat,
+                                    SwTableLineFormat* pLineFormat,
+                                    SwTableBoxFormat* pBoxFormat,
+                                    SwTextFormatColl* /*pTextColl*/  /*, SwUndo... pUndo*/  )
 {
     if( !rTableNodes.size() )
         return 0;
 
-    SwTableNode * pTblNd = new SwTableNode( rTableNodes.begin()->begin()->aStart );
+    SwTableNode * pTableNd = new SwTableNode( rTableNodes.begin()->begin()->aStart );
     //insert the end node after the last text node
     SwNodeIndex aInsertIndex( rTableNodes.rbegin()->rbegin()->aEnd );
     ++aInsertIndex;
 
     //!! ownership will be transferred in c-tor to SwNodes array.
     //!! Thus no real problem here...
-    new SwEndNode( aInsertIndex, *pTblNd );
+    new SwEndNode( aInsertIndex, *pTableNd );
 
 #if OSL_DEBUG_LEVEL > 1
     const SwNodeRange& rStartRange = *rTableNodes.begin()->begin();
@@ -1371,7 +1371,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
 #endif
 
     SwDoc* pDoc = GetDoc();
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     SwTableBox* pBox;
     sal_uInt16 nBoxes, nLines, nMaxBoxes = 0;
 
@@ -1380,10 +1380,10 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
     for( nLines = 0; aNodeIndex <= rTableNodes.rbegin()->rbegin()->aEnd; ++aNodeIndex,++nLines )
     {
         SwNode& rNode = aNodeIndex.GetNode();
-        if( rNode.IsCntntNode() )
+        if( rNode.IsContentNode() )
         {
-            lcl_RemoveBreaks(static_cast<SwCntntNode&>(rNode),
-                    (0 == nLines) ? pTblFmt : 0);
+            lcl_RemoveBreaks(static_cast<SwContentNode&>(rNode),
+                    (0 == nLines) ? pTableFormat : 0);
         }
     }
 
@@ -1392,7 +1392,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
         aRowIter != rTableNodes.end();
         ++aRowIter, nLines++, nBoxes = 0 )
     {
-        SwTableLine* pLine = new SwTableLine( pLineFmt, 1, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, 1, 0 );
         rTable.GetTabLines().insert(rTable.GetTabLines().begin() + nLines, pLine);
 
         std::vector< SwNodeRange >::const_iterator aCellIter = aRowIter->begin();
@@ -1422,47 +1422,47 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                 }
 
                 // assign Section to the Box
-                pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+                pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
                 pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
         }
         if( nMaxBoxes < nBoxes )
             nMaxBoxes = nBoxes;
     }
 
-    rTable.RegisterToFormat(*pTblFmt);
-    lcl_SetTableBoxWidths2(rTable, nMaxBoxes, *pBoxFmt, *pDoc);
+    rTable.RegisterToFormat(*pTableFormat);
+    lcl_SetTableBoxWidths2(rTable, nMaxBoxes, *pBoxFormat, *pDoc);
 
-    return pTblNd;
+    return pTableNd;
 }
 
 /**
  * Table to Text
  */
-bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
+bool SwDoc::TableToText( const SwTableNode* pTableNd, sal_Unicode cCh )
 {
-    if( !pTblNd )
+    if( !pTableNd )
         return false;
 
     // #i34471#
-    // If this is trigged by SwUndoTblToTxt::Repeat() nobody ever deleted
+    // If this is trigged by SwUndoTableToText::Repeat() nobody ever deleted
     // the table cursor.
     SwEditShell* pESh = GetEditShell();
     if( pESh && pESh->IsTableMode() )
         pESh->ClearMark();
 
-    SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode() );
-    SwUndoTblToTxt* pUndo = 0;
+    SwNodeRange aRg( *pTableNd, 0, *pTableNd->EndOfSectionNode() );
+    SwUndoTableToText* pUndo = 0;
     SwNodeRange* pUndoRg = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().ClearRedo();
         pUndoRg = new SwNodeRange( aRg.aStart, -1, aRg.aEnd, +1 );
-        pUndo = new SwUndoTblToTxt( pTblNd->GetTable(), cCh );
+        pUndo = new SwUndoTableToText( pTableNd->GetTable(), cCh );
     }
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXNAME;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXNAME;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool bRet = GetNodes().TableToText( aRg, cCh, pUndo );
     if( pUndoRg )
@@ -1486,12 +1486,12 @@ bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
  */
 struct _DelTabPara
 {
-    SwTxtNode* pLastNd;
+    SwTextNode* pLastNd;
     SwNodes& rNds;
-    SwUndoTblToTxt* pUndo;
+    SwUndoTableToText* pUndo;
     sal_Unicode cCh;
 
-    _DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTblToTxt* pU ) :
+    _DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) :
         pLastNd(0), rNds( rNodes ), pUndo( pU ), cCh( cChar ) {}
     _DelTabPara( const _DelTabPara& rPara ) :
         pLastNd(rPara.pLastNd), rNds( rPara.rNds ),
@@ -1530,9 +1530,9 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
                             *pBox->GetSttNd()->EndOfSectionNode() );
         // Delete the Section
         pDelPara->rNds.SectionUp( &aDelRg );
-        const SwTxtNode* pCurTxtNd;
+        const SwTextNode* pCurTextNd;
         if( T2T_PARA != pDelPara->cCh && pDelPara->pLastNd &&
-            0 != ( pCurTxtNd = aDelRg.aStart.GetNode().GetTxtNode() ))
+            0 != ( pCurTextNd = aDelRg.aStart.GetNode().GetTextNode() ))
         {
             // Join the current text node with the last from the previous box if possible
             sal_uLong nNdIdx = aDelRg.aStart.GetIndex();
@@ -1541,21 +1541,21 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
             {
                 // Inserting the separator
                 SwIndex aCntIdx( pDelPara->pLastNd,
-                        pDelPara->pLastNd->GetTxt().getLength());
+                        pDelPara->pLastNd->GetText().getLength());
                 pDelPara->pLastNd->InsertText( OUString(pDelPara->cCh), aCntIdx,
                     SwInsertFlags::EMPTYEXPAND );
                 if( pDelPara->pUndo )
                     pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx, aDelRg.aEnd.GetIndex(),
                                                 aCntIdx.GetIndex() );
 
-                const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-                const sal_Int32 nOldTxtLen = aCntIdx.GetIndex();
-                pCntntStore->Save( pDoc, nNdIdx, pCurTxtNd->GetTxt().getLength() );
+                const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+                const sal_Int32 nOldTextLen = aCntIdx.GetIndex();
+                pContentStore->Save( pDoc, nNdIdx, pCurTextNd->GetText().getLength() );
 
                 pDelPara->pLastNd->JoinNext();
 
-                if( !pCntntStore->Empty() )
-                    pCntntStore->Restore( pDoc, pDelPara->pLastNd->GetIndex(), nOldTxtLen );
+                if( !pContentStore->Empty() )
+                    pContentStore->Restore( pDoc, pDelPara->pLastNd->GetIndex(), nOldTextLen );
             }
             else if( pDelPara->pUndo )
             {
@@ -1566,7 +1566,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
         else if( pDelPara->pUndo )
             pDelPara->pUndo->AddBoxPos( *pDoc, aDelRg.aStart.GetIndex(), aDelRg.aEnd.GetIndex() );
         --aDelRg.aEnd;
-        pDelPara->pLastNd = aDelRg.aEnd.GetNode().GetTxtNode();
+        pDelPara->pLastNd = aDelRg.aEnd.GetNode().GetTextNode();
 
         // Do not take over the NumberFormatting's adjustment
         if( pDelPara->pLastNd && pDelPara->pLastNd->HasSwAttrSet() )
@@ -1575,13 +1575,13 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
 }
 
 bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
-                            SwUndoTblToTxt* pUndo )
+                            SwUndoTableToText* pUndo )
 {
     // Is a Table selected?
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     if( rRange.aStart.GetIndex() >= rRange.aEnd.GetIndex() ||
-        0 == ( pTblNd = rRange.aStart.GetNode().GetTableNode()) ||
-        &rRange.aEnd.GetNode() != pTblNd->EndOfSectionNode() )
+        0 == ( pTableNd = rRange.aStart.GetNode().GetTableNode()) ||
+        &rRange.aEnd.GetNode() != pTableNd->EndOfSectionNode() )
         return false;
 
     // If the Table was alone in a Section, create the Frames via the Table's Upper
@@ -1590,14 +1590,14 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     SwNode* pFrmNd = FindPrvNxtFrmNode( aFrmIdx, &rRange.aEnd.GetNode() );
     if( !pFrmNd )
         // Collect all Uppers
-        pNode2Layout = new SwNode2Layout( *pTblNd );
+        pNode2Layout = new SwNode2Layout( *pTableNd );
 
     // Delete the Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
     // "Delete" the Table and merge all Lines/Boxes
     _DelTabPara aDelPara( *this, cCh, pUndo );
-    for( SwTableLine *pLine : pTblNd->pTable->GetTabLines() )
+    for( SwTableLine *pLine : pTableNd->pTable->GetTabLines() )
         lcl_DelLine( pLine, &aDelPara );
 
     // We just created a TextNode with fitting separator for every TableLine.
@@ -1609,17 +1609,17 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     // first Text Node
     {
         // What about UNDO?
-        const SfxItemSet& rTblSet = pTblNd->pTable->GetFrmFmt()->GetAttrSet();
+        const SfxItemSet& rTableSet = pTableNd->pTable->GetFrameFormat()->GetAttrSet();
         const SfxPoolItem *pBreak, *pDesc;
-        if( SfxItemState::SET != rTblSet.GetItemState( RES_PAGEDESC, false, &pDesc ))
+        if( SfxItemState::SET != rTableSet.GetItemState( RES_PAGEDESC, false, &pDesc ))
             pDesc = 0;
-        if( SfxItemState::SET != rTblSet.GetItemState( RES_BREAK, false, &pBreak ))
+        if( SfxItemState::SET != rTableSet.GetItemState( RES_BREAK, false, &pBreak ))
             pBreak = 0;
 
         if( pBreak || pDesc )
         {
-            SwNodeIndex aIdx( *pTblNd  );
-            SwCntntNode* pCNd = GoNext( &aIdx );
+            SwNodeIndex aIdx( *pTableNd  );
+            SwContentNode* pCNd = GoNext( &aIdx );
             if( pBreak )
                 pCNd->SetAttr( *pBreak );
             if( pDesc )
@@ -1638,14 +1638,14 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     }
     else
     {
-        SwCntntNode *pCNd;
+        SwContentNode *pCNd;
         SwSectionNode *pSNd;
         while( aDelRg.aStart.GetIndex() < nEnd )
         {
-            if( 0 != ( pCNd = aDelRg.aStart.GetNode().GetCntntNode()))
+            if( 0 != ( pCNd = aDelRg.aStart.GetNode().GetContentNode()))
             {
-                if( pFrmNd->IsCntntNode() )
-                    static_cast<SwCntntNode*>(pFrmNd)->MakeFrms( *pCNd );
+                if( pFrmNd->IsContentNode() )
+                    static_cast<SwContentNode*>(pFrmNd)->MakeFrms( *pCNd );
                 else if( pFrmNd->IsTableNode() )
                     static_cast<SwTableNode*>(pFrmNd)->MakeFrms( aDelRg.aStart );
                 else if( pFrmNd->IsSectionNode() )
@@ -1654,7 +1654,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
             }
             else if( 0 != ( pSNd = aDelRg.aStart.GetNode().GetSectionNode()))
             {
-                if( !pSNd->GetSection().IsHidden() && !pSNd->IsCntntHidden() )
+                if( !pSNd->GetSection().IsHidden() && !pSNd->IsContentHidden() )
                 {
                     pSNd->MakeFrms( &aFrmIdx, &aDelRg.aEnd );
                     pFrmNd = pSNd;
@@ -1668,19 +1668,19 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
 
     // #i28006# Fly frames have to be restored even if the table was
     // #alone in the section
-    const SwFrmFmts& rFlyArr = *GetDoc()->GetSpzFrmFmts();
+    const SwFrameFormats& rFlyArr = *GetDoc()->GetSpzFrameFormats();
     for( auto pFly : rFlyArr )
     {
-        SwFrmFmt *const pFmt = (SwFrmFmt*)pFly;
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-        SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+        SwFrameFormat *const pFormat = (SwFrameFormat*)pFly;
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+        SwPosition const*const pAPos = rAnchor.GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
              (FLY_AT_CHAR == rAnchor.GetAnchorId())) &&
             nStt <= pAPos->nNode.GetIndex() &&
             pAPos->nNode.GetIndex() < nEnd )
         {
-            pFmt->MakeFrms();
+            pFormat->MakeFrms();
         }
     }
 
@@ -1692,12 +1692,12 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
  */
 bool SwDoc::InsertCol( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 {
-    if( !::CheckSplitCells( rCursor, nCnt + 1, nsSwTblSearchType::TBLSEARCH_COL ) )
+    if( !::CheckSplitCells( rCursor, nCnt + 1, nsSwTableSearchType::TBLSEARCH_COL ) )
         return false;
 
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    ::GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    ::GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
 
     bool bRet = false;
     if( !aBoxes.empty() )
@@ -1708,32 +1708,32 @@ bool SwDoc::InsertCol( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSCOL, rBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_INSCOL, rBoxes, *pTableNd,
                                      0, 0, nCnt, bBehind, false );
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     bool bRet(false);
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        bRet = rTbl.InsertCol( this, rBoxes, nCnt, bBehind );
+        bRet = rTable.InsertCol( this, rBoxes, nCnt, bBehind );
         if (bRet)
         {
             getIDocumentState().SetModified();
@@ -1746,7 +1746,7 @@ bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     {
         if( bRet )
         {
-            pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+            pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -1759,7 +1759,7 @@ bool SwDoc::InsertRow( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
 
     bool bRet = false;
     if( !aBoxes.empty() )
@@ -1770,32 +1770,32 @@ bool SwDoc::InsertRow( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW,rBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_INSROW,rBoxes, *pTableNd,
                                      0, 0, nCnt, bBehind, false );
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     bool bRet(false);
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        bRet = rTbl.InsertRow( this, rBoxes, nCnt, bBehind );
+        bRet = rTable.InsertRow( this, rBoxes, nCnt, bBehind );
         if (bRet)
         {
             getIDocumentState().SetModified();
@@ -1808,7 +1808,7 @@ bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     {
         if( bRet )
         {
-            pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+            pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -1825,7 +1825,7 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
     if( ::HasProtectedCells( aBoxes ))
         return false;
 
@@ -1834,16 +1834,16 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
     //  - when there's another Line, we place it in that one
     //  - when a Line precedes it, we place it in that one
     {
-        SwTableNode* pTblNd = rCursor.GetNode().FindTableNode();
+        SwTableNode* pTableNd = rCursor.GetNode().FindTableNode();
 
-        if( pTblNd->GetTable().ISA( SwDDETable ))
+        if( pTableNd->GetTable().ISA( SwDDETable ))
             return false;
 
         // Find all Boxes/Lines
         _FndBox aFndBox( 0, 0 );
         {
             _FndPara aPara( aBoxes, &aFndBox );
-            ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+            ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
         }
 
         if( !aFndBox.GetLines().size() )
@@ -1874,11 +1874,11 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
                         pDelBox->GetTabLines().size()-1 ];
             pDelBox = pLn->GetTabBoxes().back();
         }
-        SwTableBox* pNextBox = pDelLine->FindNextBox( pTblNd->GetTable(),
+        SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(),
                                                         pDelBox, true );
         while( pNextBox &&
-                pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-            pNextBox = pNextBox->FindNextBox( pTblNd->GetTable(), pNextBox );
+                pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+            pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox );
 
         if( !pNextBox ) // No succeeding Boxes? Then take the preceding one
         {
@@ -1886,21 +1886,21 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
             pDelBox = pDelLine->GetTabBoxes()[ 0 ];
             while( !pDelBox->GetSttNd() )
                 pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0];
-            pNextBox = pDelLine->FindPreviousBox( pTblNd->GetTable(),
+            pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(),
                                                         pDelBox, true );
             while( pNextBox &&
-                    pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-                pNextBox = pNextBox->FindPreviousBox( pTblNd->GetTable(), pNextBox );
+                    pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+                pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox );
         }
 
         sal_uLong nIdx;
         if( pNextBox ) // Place the Cursor here
             nIdx = pNextBox->GetSttIdx() + 1;
         else // Else after the Table
-            nIdx = pTblNd->EndOfSectionIndex() + 1;
+            nIdx = pTableNd->EndOfSectionIndex() + 1;
 
         SwNodeIndex aIdx( GetNodes(), nIdx );
-        SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
         if( !pCNd )
             pCNd = GetNodes().GoNext( &aIdx );
 
@@ -1927,7 +1927,7 @@ bool SwDoc::DeleteCol( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
     if( ::HasProtectedCells( aBoxes ))
         return false;
 
@@ -1955,16 +1955,16 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         return false;
 
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    if( pTblNd->GetTable().ISA( SwDDETable ))
+    if( pTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
     ::ClearFEShellTabCols();
     SwSelBoxes aSelBoxes( rBoxes );
-    SwTable &rTable = pTblNd->GetTable();
+    SwTable &rTable = pTableNd->GetTable();
     long nMin = 0;
     long nMax = 0;
     if( rTable.IsNewModel() )
@@ -1976,35 +1976,35 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
     }
 
     // Are we deleting the whole Table?
-    const sal_uLong nTmpIdx1 = pTblNd->GetIndex();
+    const sal_uLong nTmpIdx1 = pTableNd->GetIndex();
     const sal_uLong nTmpIdx2 = aSelBoxes.back()->GetSttNd()->EndOfSectionIndex() + 1;
-    if( pTblNd->GetTable().GetTabSortBoxes().size() == aSelBoxes.size() &&
+    if( pTableNd->GetTable().GetTabSortBoxes().size() == aSelBoxes.size() &&
         aSelBoxes[0]->GetSttIdx()-1 == nTmpIdx1 &&
-        nTmpIdx2 == pTblNd->EndOfSectionIndex() )
+        nTmpIdx2 == pTableNd->EndOfSectionIndex() )
     {
-        bool bNewTxtNd = false;
+        bool bNewTextNd = false;
         // Is it alone in a FlyFrame?
-        SwNodeIndex aIdx( *pTblNd, -1 );
+        SwNodeIndex aIdx( *pTableNd, -1 );
         const SwStartNode* pSttNd = aIdx.GetNode().GetStartNode();
         if( pSttNd )
         {
-            const sal_uLong nTblEnd = pTblNd->EndOfSectionIndex() + 1;
+            const sal_uLong nTableEnd = pTableNd->EndOfSectionIndex() + 1;
             const sal_uLong nSectEnd = pSttNd->EndOfSectionIndex();
-            if( nTblEnd == nSectEnd )
+            if( nTableEnd == nSectEnd )
             {
                 if( SwFlyStartNode == pSttNd->GetStartNodeType() )
                 {
-                    SwFrmFmt* pFmt = pSttNd->GetFlyFmt();
-                    if( pFmt )
+                    SwFrameFormat* pFormat = pSttNd->GetFlyFormat();
+                    if( pFormat )
                     {
                         // That's the FlyFormat we're looking for
-                        getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                        getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
                         return true;
                     }
                 }
                 // No Fly? Thus Header or Footer: always leave a TextNode
                 // We can forget about Undo then!
-                bNewTxtNd = true;
+                bNewTextNd = true;
             }
         }
 
@@ -2013,44 +2013,44 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             GetIDocumentUndoRedo().ClearRedo();
-            SwPaM aPaM( *pTblNd->EndOfSectionNode(), aIdx.GetNode() );
+            SwPaM aPaM( *pTableNd->EndOfSectionNode(), aIdx.GetNode() );
 
-            if( bNewTxtNd )
+            if( bNewTextNd )
             {
-                const SwNodeIndex aTmpIdx( *pTblNd->EndOfSectionNode(), 1 );
-                GetNodes().MakeTxtNode( aTmpIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+                const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
+                GetNodes().MakeTextNode( aTmpIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
             }
 
             // Save the cursors (UNO and otherwise)
-            SwPaM aSavePaM( SwNodeIndex( *pTblNd->EndOfSectionNode() ) );
+            SwPaM aSavePaM( SwNodeIndex( *pTableNd->EndOfSectionNode() ) );
             if( ! aSavePaM.Move( fnMoveForward, fnGoNode ) )
             {
-                *aSavePaM.GetMark() = SwPosition( *pTblNd );
+                *aSavePaM.GetMark() = SwPosition( *pTableNd );
                 aSavePaM.Move( fnMoveBackward, fnGoNode );
             }
             {
-                SwPaM const tmpPaM(*pTblNd, *pTblNd->EndOfSectionNode());
+                SwPaM const tmpPaM(*pTableNd, *pTableNd->EndOfSectionNode());
                 ::PaMCorrAbs(tmpPaM, *aSavePaM.GetMark());
             }
 
             // Move hard PageBreaks to the succeeding Node
             bool bSavePageBreak = false, bSavePageDesc = false;
-            sal_uLong nNextNd = pTblNd->EndOfSectionIndex()+1;
-            SwCntntNode* pNextNd = GetNodes()[ nNextNd ]->GetCntntNode();
+            sal_uLong nNextNd = pTableNd->EndOfSectionIndex()+1;
+            SwContentNode* pNextNd = GetNodes()[ nNextNd ]->GetContentNode();
             if( pNextNd )
             {
                 {
-                    SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+                    SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                     const SfxPoolItem *pItem;
-                    if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+                    if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
                         false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
                         bSavePageDesc = true;
                     }
 
-                    if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+                    if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
                         false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
@@ -2059,60 +2059,60 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
                 }
             }
             SwUndoDelete* pUndo = new SwUndoDelete( aPaM );
-            if( bNewTxtNd )
-                pUndo->SetTblDelLastNd();
+            if( bNewTextNd )
+                pUndo->SetTableDelLastNd();
             pUndo->SetPgBrkFlags( bSavePageBreak, bSavePageDesc );
-            pUndo->SetTableName(pTblNd->GetTable().GetFrmFmt()->GetName());
+            pUndo->SetTableName(pTableNd->GetTable().GetFrameFormat()->GetName());
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
         {
-            if( bNewTxtNd )
+            if( bNewTextNd )
             {
-                const SwNodeIndex aTmpIdx( *pTblNd->EndOfSectionNode(), 1 );
-                GetNodes().MakeTxtNode( aTmpIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+                const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
+                GetNodes().MakeTextNode( aTmpIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
             }
 
             // Save the cursors (UNO and otherwise)
-            SwPaM aSavePaM( SwNodeIndex( *pTblNd->EndOfSectionNode() ) );
+            SwPaM aSavePaM( SwNodeIndex( *pTableNd->EndOfSectionNode() ) );
             if( ! aSavePaM.Move( fnMoveForward, fnGoNode ) )
             {
-                *aSavePaM.GetMark() = SwPosition( *pTblNd );
+                *aSavePaM.GetMark() = SwPosition( *pTableNd );
                 aSavePaM.Move( fnMoveBackward, fnGoNode );
             }
             {
-                SwPaM const tmpPaM(*pTblNd, *pTblNd->EndOfSectionNode());
+                SwPaM const tmpPaM(*pTableNd, *pTableNd->EndOfSectionNode());
                 ::PaMCorrAbs(tmpPaM, *aSavePaM.GetMark());
             }
 
             // Move hard PageBreaks to the succeeding Node
-            SwCntntNode* pNextNd = GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]->GetCntntNode();
+            SwContentNode* pNextNd = GetNodes()[ pTableNd->EndOfSectionIndex()+1 ]->GetContentNode();
             if( pNextNd )
             {
-                SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+                SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                 const SfxPoolItem *pItem;
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
 
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
             }
 
-            pTblNd->DelFrms();
-            getIDocumentContentOperations().DeleteSection( pTblNd );
+            pTableNd->DelFrms();
+            getIDocumentContentOperations().DeleteSection( pTableNd );
         }
         getIDocumentState().SetModified();
         getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
         return true;
     }
 
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_DELBOX, aSelBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_DELBOX, aSelBoxes, *pTableNd,
                                      nMin, nMax, 0, false, false );
     }
 
@@ -2120,9 +2120,9 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (rTable.IsNewModel())
         {
@@ -2156,27 +2156,27 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
 /**
  * Split up/merge Boxes in the Table
  */
-bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
+bool SwDoc::SplitTable( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
                       bool bSameHeight )
 {
     OSL_ENSURE( !rBoxes.empty() && nCnt, "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     std::vector<sal_uLong> aNdsCnts;
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_SPLIT, rBoxes, *pTblNd, 0, 0,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_SPLIT, rBoxes, *pTableNd, 0, 0,
                                      nCnt, bVert, bSameHeight );
 
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
         if( !bVert )
         {
             for (size_t n = 0; n < rBoxes.size(); ++n)
@@ -2192,14 +2192,14 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (bVert)
-            bRet = rTbl.SplitCol( this, rBoxes, nCnt );
+            bRet = rTable.SplitCol( this, rBoxes, nCnt );
         else
-            bRet = rTbl.SplitRow( this, rBoxes, nCnt, bSameHeight );
+            bRet = rTable.SplitRow( this, rBoxes, nCnt, bSameHeight );
 
         if (bRet)
         {
@@ -2213,9 +2213,9 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
         if( bRet )
         {
             if( bVert )
-                pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+                pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             else
-                pUndo->SaveNewBoxes( *pTblNd, aTmpLst, rBoxes, aNdsCnts );
+                pUndo->SaveNewBoxes( *pTableNd, aTmpLst, rBoxes, aNdsCnts );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -2225,13 +2225,13 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
     return bRet;
 }
 
-sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
+sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
 {
     // Check if the current cursor's Point/Mark are inside a Table
-    SwTableNode* pTblNd = rPam.GetNode().FindTableNode();
-    if( !pTblNd )
+    SwTableNode* pTableNd = rPam.GetNode().FindTableNode();
+    if( !pTableNd )
         return TBLMERGE_NOSELECTION;
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     if( rTable.ISA(SwDDETable) )
         return TBLMERGE_NOSELECTION;
     sal_uInt16 nRet = TBLMERGE_NOSELECTION;
@@ -2249,8 +2249,8 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
     RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
     getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
-    SwUndoTblMerge *const pUndo( (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoTblMerge( rPam )
+    SwUndoTableMerge *const pUndo( (GetIDocumentUndoRedo().DoesUndo())
+        ?   new SwUndoTableMerge( rPam )
         :   0 );
 
     // Find the Boxes via the Layout
@@ -2303,11 +2303,11 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
         }
 
         // Merge them
-        SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        if( pTblNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, pUndo ))
+        if( pTableNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, pUndo ))
         {
             nRet = TBLMERGE_OK;
             getIDocumentState().SetModified();
@@ -2339,10 +2339,10 @@ SwTableNode::SwTableNode( const SwNodeIndex& rIdx )
 SwTableNode::~SwTableNode()
 {
     // Notify UNO wrappers
-    SwFrmFmt* pTblFmt = GetTable().GetFrmFmt();
+    SwFrameFormat* pTableFormat = GetTable().GetFrameFormat();
     SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
-                                pTblFmt );
-    pTblFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+                                pTableFormat );
+    pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
     DelFrms();
     delete pTable;
 }
@@ -2358,11 +2358,11 @@ SwTabFrm *SwTableNode::MakeFrm( SwFrm* pSib )
  */
 void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
 {
-    if( !GetTable().GetFrmFmt()->HasWriterListeners()) // Do we actually have Frame?
+    if( !GetTable().GetFrameFormat()->HasWriterListeners()) // Do we actually have Frame?
         return;
 
     SwFrm *pFrm;
-    SwCntntNode * pNode = rIdx.GetNode().GetCntntNode();
+    SwContentNode * pNode = rIdx.GetNode().GetContentNode();
 
     OSL_ENSURE( pNode, "No ContentNode or CopyNode and new Node is identical");
 
@@ -2384,7 +2384,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
 }
 
 /**
- * Create a TblFrm for every Shell and insert before the corresponding CntntFrm.
+ * Create a TableFrm for every Shell and insert before the corresponding ContentFrm.
  */
 void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
 {
@@ -2412,8 +2412,8 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
             }
         }
         pNew->RegistFlys();
@@ -2423,10 +2423,10 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
 void SwTableNode::DelFrms()
 {
     /* For a start, cut out and delete the TabFrms (which will also delete the Columns and Rows)
-       The TabFrms are attached to the FrmFmt of the SwTable.
+       The TabFrms are attached to the FrameFormat of the SwTable.
        We need to delete them in a more cumbersome way, for the Master to also delete the Follows. */
 
-    SwIterator<SwTabFrm,SwFmt> aIter( *(pTable->GetFrmFmt()) );
+    SwIterator<SwTabFrm,SwFormat> aIter( *(pTable->GetFrameFormat()) );
     SwTabFrm *pFrm = aIter.First();
     while ( pFrm )
     {
@@ -2447,8 +2447,8 @@ void SwTableNode::DelFrms()
                          pViewShell->GetLayout()->IsAnyShellAccessible() )
                     {
                         pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
                     }
                 }
                 pFrm->Cut();
@@ -2478,9 +2478,9 @@ void SwTableNode::RemoveRedlines()
     SwDoc* pDoc = GetDoc();
     if (pDoc)
     {
-        SwTable& rTbl = GetTable();
-        if ( pDoc->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAllTableRedlines( pDoc, rTbl, true, USHRT_MAX );
+        SwTable& rTable = GetTable();
+        if ( pDoc->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            pDoc->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAllTableRedlines( pDoc, rTable, true, USHRT_MAX );
     }
 }
 
@@ -2497,7 +2497,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
     }
     else if( pCrsr )
     {
-        const SwCntntNode* pCNd = pCrsr->GetCntntNode();
+        const SwContentNode* pCNd = pCrsr->GetContentNode();
         if( !pCNd )
             return ;
 
@@ -2573,16 +2573,16 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
 
     // #i39552# Collection of the boxes of the current
     // column has to be done at the beginning of this function, because
-    // the table may be formatted in ::GetTblSel.
+    // the table may be formatted in ::GetTableSel.
     SwDeletionChecker aDelCheck( pBoxFrm );
 
     SwSelBoxes aBoxes;
-    const SwCntntFrm* pCntnt = ::GetCellCntnt( *pBoxFrm );
-    if ( pCntnt && pCntnt->IsTxtFrm() )
+    const SwContentFrm* pContent = ::GetCellContent( *pBoxFrm );
+    if ( pContent && pContent->IsTextFrm() )
     {
-        const SwPosition aPos( *static_cast<const SwTxtFrm*>(pCntnt)->GetTxtNode() );
+        const SwPosition aPos( *static_cast<const SwTextFrm*>(pContent)->GetTextNode() );
         const SwCursor aTmpCrsr( aPos, 0, false );
-        ::GetTblSel( aTmpCrsr, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+        ::GetTableSel( aTmpCrsr, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
     }
 
     // Make code robust:
@@ -2711,7 +2711,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
     }
     else if( pCrsr )
     {
-        const SwCntntNode* pCNd = pCrsr->GetCntntNode();
+        const SwContentNode* pCNd = pCrsr->GetContentNode();
         if( !pCNd )
             return ;
 
@@ -2738,22 +2738,22 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
     // If the Table is still using relative values (USHRT_MAX)
     // we need to switch to absolute ones.
     SwTable& rTab = *pTab->GetTable();
-    const SwFmtFrmSize& rTblFrmSz = rTab.GetFrmFmt()->GetFrmSize();
+    const SwFormatFrmSize& rTableFrmSz = rTab.GetFrameFormat()->GetFrmSize();
     SWRECTFN( pTab )
     // #i17174# - With fix for #i9040# the shadow size is taken
     // from the table width. Thus, add its left and right size to current table
     // printing area width in order to get the correct table size attribute.
     SwTwips nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
     {
-        SvxShadowItem aShadow( rTab.GetFrmFmt()->GetShadow() );
+        SvxShadowItem aShadow( rTab.GetFrameFormat()->GetShadow() );
         nPrtWidth += aShadow.CalcShadowSpace( SvxShadowItemSide::LEFT ) +
                      aShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT );
     }
-    if( nPrtWidth != rTblFrmSz.GetWidth() )
+    if( nPrtWidth != rTableFrmSz.GetWidth() )
     {
-        SwFmtFrmSize aSz( rTblFrmSz );
+        SwFormatFrmSize aSz( rTableFrmSz );
         aSz.SetWidth( nPrtWidth );
-        rTab.GetFrmFmt()->SetFmtAttr( aSz );
+        rTab.GetFrameFormat()->SetFormatAttr( aSz );
     }
 
     SwTabCols aOld( rNew.Count() );
@@ -2833,12 +2833,12 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
         const long nDiff = nNewRowHeight - nOldRowHeight;
         if ( std::abs( nDiff ) >= ROWFUZZY )
         {
-            // For the old table model pTxtFrm and pLine will be set for every box.
-            // For the new table model pTxtFrm will be set if the box is not covered,
+            // For the old table model pTextFrm and pLine will be set for every box.
+            // For the new table model pTextFrm will be set if the box is not covered,
             // but the pLine will be set if the box is not an overlapping box
             // In the new table model the row height can be adjusted,
             // when both variables are set.
-            const SwTxtFrm* pTxtFrm = 0;
+            const SwTextFrm* pTextFrm = 0;
             const SwTableLine* pLine = 0;
 
             // Iterate over all SwCellFrms with Bottom = nOldPos
@@ -2853,20 +2853,20 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
                     {
                         if ( !bCurColOnly || pFrm == pBoxFrm )
                         {
-                            const SwFrm* pCntnt = ::GetCellCntnt( static_cast<const SwCellFrm&>(*pFrm) );
+                            const SwFrm* pContent = ::GetCellContent( static_cast<const SwCellFrm&>(*pFrm) );
 
-                            if ( pCntnt && pCntnt->IsTxtFrm() )
+                            if ( pContent && pContent->IsTextFrm() )
                             {
                                 const SwTableBox* pBox = static_cast<const SwCellFrm*>(pFrm)->GetTabBox();
                                 const long nRowSpan = pBox->getRowSpan();
                                 if( nRowSpan > 0 ) // Not overlapped
-                                    pTxtFrm = static_cast<const SwTxtFrm*>(pCntnt);
+                                    pTextFrm = static_cast<const SwTextFrm*>(pContent);
                                 if( nRowSpan < 2 ) // Not overlapping for row height
                                     pLine = pBox->GetUpper();
-                                if( pLine && pTxtFrm ) // always for old table model
+                                if( pLine && pTextFrm ) // always for old table model
                                 {
                                     // The new row height must not to be calculated from a overlapping box
-                                    SwFmtFrmSize aNew( pLine->GetFrmFmt()->GetFrmSize() );
+                                    SwFormatFrmSize aNew( pLine->GetFrameFormat()->GetFrmSize() );
                                     const long nNewSize = (pFrm->Frm().*fnRect->fnGetHeight)() + nDiff;
                                     if( nNewSize != aNew.GetHeight() )
                                     {
@@ -2874,7 +2874,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
                                         if ( ATT_VAR_SIZE == aNew.GetHeightSizeType() )
                                             aNew.SetHeightSizeType( ATT_MIN_SIZE );
                                         // This position must not be in an overlapped box
-                                        const SwPosition aPos( *static_cast<const SwTxtFrm*>(pCntnt)->GetTxtNode() );
+                                        const SwPosition aPos( *static_cast<const SwTextFrm*>(pContent)->GetTextNode() );
                                         const SwCursor aTmpCrsr( aPos, 0, false );
                                         SetRowHeight( aTmpCrsr, aNew );
                                         // For the new table model we're done, for the old one
@@ -2907,7 +2907,7 @@ void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rO
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoAttrTbl( *rTab.GetTableNode(), true ));
+            new SwUndoAttrTable( *rTab.GetTableNode(), true ));
     }
     rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly );
       ::ClearFEShellTabCols();
@@ -2922,30 +2922,30 @@ void SwDoc::SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet )
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoTblHeadline(rTable, rTable.GetRowsToRepeat(), nSet) );
+            new SwUndoTableHeadline(rTable, rTable.GetRowsToRepeat(), nSet) );
     }
 
     SwMsgPoolItem aChg( RES_TBLHEADLINECHG );
     rTable.SetRowsToRepeat( nSet );
-    rTable.GetFrmFmt()->ModifyNotification( &aChg, &aChg );
+    rTable.GetFrameFormat()->ModifyNotification( &aChg, &aChg );
     getIDocumentState().SetModified();
 }
 
-void SwCollectTblLineBoxes::AddToUndoHistory( const SwCntntNode& rNd )
+void SwCollectTableLineBoxes::AddToUndoHistory( const SwContentNode& rNd )
 {
     if( pHst )
-        pHst->Add( rNd.GetFmtColl(), rNd.GetIndex(), ND_TEXTNODE );
+        pHst->Add( rNd.GetFormatColl(), rNd.GetIndex(), ND_TEXTNODE );
 }
 
-void SwCollectTblLineBoxes::AddBox( const SwTableBox& rBox )
+void SwCollectTableLineBoxes::AddBox( const SwTableBox& rBox )
 {
     aPosArr.push_back(nWidth);
     SwTableBox* p = const_cast<SwTableBox*>(&rBox);
     m_Boxes.push_back(p);
-    nWidth = nWidth + (sal_uInt16)rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+    nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrmSize().GetWidth();
 }
 
-const SwTableBox* SwCollectTblLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
+const SwTableBox* SwCollectTableLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
 {
     const SwTableBox* pRet = 0;
 
@@ -2965,13 +2965,13 @@ const SwTableBox* SwCollectTblLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
         if( n >= aPosArr.size() )
             --n;
 
-        nWidth = nWidth + (sal_uInt16)rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrmSize().GetWidth();
         pRet = m_Boxes[ n ];
     }
     return pRet;
 }
 
-bool SwCollectTblLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
+bool SwCollectTableLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
 {
     if( !aPosArr.empty() )
     {
@@ -3012,7 +3012,7 @@ bool SwCollectTblLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
 
 bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
 {
-    SwCollectTblLineBoxes* pSplPara = static_cast<SwCollectTblLineBoxes*>(pPara);
+    SwCollectTableLineBoxes* pSplPara = static_cast<SwCollectTableLineBoxes*>(pPara);
     if( pSplPara->IsGetValues() )
         for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(rpLine)->GetTabBoxes().begin();
                  it != const_cast<SwTableLine*>(rpLine)->GetTabBoxes().end(); ++it)
@@ -3020,11 +3020,11 @@ bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
     else
         for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(rpLine)->GetTabBoxes().begin();
                  it != const_cast<SwTableLine*>(rpLine)->GetTabBoxes().end(); ++it)
-            sw_BoxSetSplitBoxFmts(*it, pSplPara );
+            sw_BoxSetSplitBoxFormats(*it, pSplPara );
     return true;
 }
 
-void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara )
 {
     auto nLen = pBox->GetTabLines().size();
     if( nLen )
@@ -3042,7 +3042,7 @@ void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara
         pSplPara->AddBox( *pBox );
 }
 
-void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara )
 {
     auto nLen = pBox->GetTabLines().size();
     if( nLen )
@@ -3059,17 +3059,17 @@ void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
     else
     {
         const SwTableBox* pSrcBox = pSplPara->GetBoxOfPos( *pBox );
-        SwFrmFmt* pFmt = pSrcBox->GetFrmFmt();
+        SwFrameFormat* pFormat = pSrcBox->GetFrameFormat();
 
         if( HEADLINE_BORDERCOPY == pSplPara->GetMode() )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
             if( !rBoxItem.GetTop() )
             {
                 SvxBoxItem aNew( rBoxItem );
-                aNew.SetLine( pFmt->GetBox().GetBottom(), SvxBoxItemLine::TOP );
+                aNew.SetLine( pFormat->GetBox().GetBottom(), SvxBoxItemLine::TOP );
                 if( aNew != rBoxItem )
-                    pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                    pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
             }
         }
         else
@@ -3081,27 +3081,27 @@ void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
                 RES_VERT_ORIENT,    RES_VERT_ORIENT,
                 0 };
 
-            SfxItemSet aTmpSet( pFmt->GetDoc()->GetAttrPool(),
+            SfxItemSet aTmpSet( pFormat->GetDoc()->GetAttrPool(),
                                 aTableSplitBoxSetRange );
-            aTmpSet.Put( pFmt->GetAttrSet() );
+            aTmpSet.Put( pFormat->GetAttrSet() );
             if( aTmpSet.Count() )
-                pBox->ClaimFrmFmt()->SetFmtAttr( aTmpSet );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aTmpSet );
 
             if( HEADLINE_BOXATRCOLLCOPY == pSplPara->GetMode() )
             {
                 SwNodeIndex aIdx( *pSrcBox->GetSttNd(), 1 );
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( !pCNd )
                     pCNd = aIdx.GetNodes().GoNext( &aIdx );
                 aIdx = *pBox->GetSttNd();
-                SwCntntNode* pDNd = aIdx.GetNodes().GoNext( &aIdx );
+                SwContentNode* pDNd = aIdx.GetNodes().GoNext( &aIdx );
 
                 // If the Node is alone in the Section
                 if( 2 == pDNd->EndOfSectionIndex() -
                         pDNd->StartOfSectionIndex() )
                 {
                     pSplPara->AddToUndoHistory( *pDNd );
-                    pDNd->ChgFmtColl( pCNd->GetFmtColl() );
+                    pDNd->ChgFormatColl( pCNd->GetFormatColl() );
                 }
             }
 
@@ -3131,22 +3131,22 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
     if( pTNd->GetTable().ISA( SwDDETable ))
         return false;
 
-    SwTable& rTbl = pTNd->GetTable();
-    rTbl.SetHTMLTableLayout( 0 ); // Delete HTML Layout
+    SwTable& rTable = pTNd->GetTable();
+    rTable.SetHTMLTableLayout( 0 ); // Delete HTML Layout
 
-    SwTableFmlUpdate aMsgHnt( &rTbl );
+    SwTableFormulaUpdate aMsgHint( &rTable );
 
     SwHistory aHistory;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        aMsgHnt.pHistory = &aHistory;
+        aMsgHint.pHistory = &aHistory;
     }
 
     {
         sal_uLong nSttIdx = pNd->FindTableBoxStartNode()->GetIndex();
 
         // Find top-level Line
-        SwTableBox* pBox = rTbl.GetTblBox( nSttIdx );
+        SwTableBox* pBox = rTable.GetTableBox( nSttIdx );
         if( pBox )
         {
             SwTableLine* pLine = pBox->GetUpper();
@@ -3154,29 +3154,29 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLine = pLine->GetUpper()->GetUpper();
 
             // pLine contains the top-level Line now
-            aMsgHnt.nSplitLine = rTbl.GetTabLines().GetPos( pLine );
+            aMsgHint.nSplitLine = rTable.GetTabLines().GetPos( pLine );
         }
 
-        OUString sNewTblNm( GetUniqueTblName() );
-        aMsgHnt.DATA.pNewTblNm = &sNewTblNm;
-        aMsgHnt.eFlags = TBL_SPLITTBL;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        OUString sNewTableNm( GetUniqueTableName() );
+        aMsgHint.DATA.pNewTableNm = &sNewTableNm;
+        aMsgHint.eFlags = TBL_SPLITTBL;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // Find Lines for the Layout update
     _FndBox aFndBox( 0, 0 );
-    aFndBox.SetTableLines( rTbl );
-    aFndBox.DelFrms( rTbl );
+    aFndBox.SetTableLines( rTable );
+    aFndBox.DelFrms( rTable );
 
     SwTableNode* pNew = GetNodes().SplitTable( rPos.nNode, false, bCalcNewSize );
 
     if( pNew )
     {
-        SwSaveRowSpan* pSaveRowSp = pNew->GetTable().CleanUpTopRowSpan( rTbl.GetTabLines().size() );
-        SwUndoSplitTbl* pUndo = 0;
+        SwSaveRowSpan* pSaveRowSp = pNew->GetTable().CleanUpTopRowSpan( rTable.GetTabLines().size() );
+        SwUndoSplitTable* pUndo = 0;
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            pUndo = new SwUndoSplitTbl(
+            pUndo = new SwUndoSplitTable(
                         *pNew, pSaveRowSp, eHdlnMode, bCalcNewSize);
             GetIDocumentUndoRedo().AppendUndo(pUndo);
             if( aHistory.Count() )
@@ -3189,9 +3189,9 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
         // the upper Border of the current one
         case HEADLINE_BORDERCOPY:
             {
-                SwCollectTblLineBoxes aPara( false, eHdlnMode );
-                SwTableLine* pLn = rTbl.GetTabLines()[
-                            rTbl.GetTabLines().size() - 1 ];
+                SwCollectTableLineBoxes aPara( false, eHdlnMode );
+                SwTableLine* pLn = rTable.GetTabLines()[
+                            rTable.GetTabLines().size() - 1 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
                     sw_Box_CollectBox(*it, &aPara );
@@ -3200,7 +3200,7 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLn = pNew->GetTable().GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aPara );
 
                 // Switch off repeating Header
                 pNew->GetTable().SetRowsToRepeat( 0 );
@@ -3215,8 +3215,8 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 if( HEADLINE_BOXATRCOLLCOPY == eHdlnMode && pUndo )
                     pHst = pUndo->GetHistory();
 
-                SwCollectTblLineBoxes aPara( true, eHdlnMode, pHst );
-                SwTableLine* pLn = rTbl.GetTabLines()[ 0 ];
+                SwCollectTableLineBoxes aPara( true, eHdlnMode, pHst );
+                SwTableLine* pLn = rTable.GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
                     sw_Box_CollectBox(*it, &aPara );
@@ -3225,14 +3225,14 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLn = pNew->GetTable().GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aPara );
             }
             break;
 
         case HEADLINE_CNTNTCOPY:
-            rTbl.CopyHeadlineIntoTable( *pNew );
+            rTable.CopyHeadlineIntoTable( *pNew );
             if( pUndo )
-                pUndo->SetTblNodeOffset( pNew->GetIndex() );
+                pUndo->SetTableNodeOffset( pNew->GetIndex() );
             break;
 
         case HEADLINE_NONE:
@@ -3247,78 +3247,78 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
         pNew->MakeFrms( &aNdIdx );
 
         // Insert a paragraph between the Table
-        GetNodes().MakeTxtNode( SwNodeIndex( *pNew ),
-                                getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        GetNodes().MakeTextNode( SwNodeIndex( *pNew ),
+                                getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
     }
 
     // Update Layout
-    aFndBox.MakeFrms( rTbl );
+    aFndBox.MakeFrms( rTable );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    UpdateCharts( rTbl.GetFrmFmt()->GetName() );
+    UpdateCharts( rTable.GetFrameFormat()->GetName() );
 
     getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
 
     return 0 != pNew;
 }
 
-static bool lcl_ChgTblSize( SwTable& rTbl )
+static bool lcl_ChgTableSize( SwTable& rTable )
 {
     // The Attribute must not be set via the Modify or else all Boxes are
     // set back to 0.
     // So lock the Format.
-    SwFrmFmt* pFmt = rTbl.GetFrmFmt();
-    SwFmtFrmSize aTblMaxSz( pFmt->GetFrmSize() );
+    SwFrameFormat* pFormat = rTable.GetFrameFormat();
+    SwFormatFrmSize aTableMaxSz( pFormat->GetFrmSize() );
 
-    if( USHRT_MAX == aTblMaxSz.GetWidth() )
+    if( USHRT_MAX == aTableMaxSz.GetWidth() )
         return false;
 
-    bool bLocked = pFmt->IsModifyLocked();
-    pFmt->LockModify();
+    bool bLocked = pFormat->IsModifyLocked();
+    pFormat->LockModify();
 
-    aTblMaxSz.SetWidth( 0 );
+    aTableMaxSz.SetWidth( 0 );
 
-    SwTableLines& rLns = rTbl.GetTabLines();
+    SwTableLines& rLns = rTable.GetTabLines();
     for( auto pLn : rLns )
     {
         SwTwips nMaxLnWidth = 0;
         SwTableBoxes& rBoxes = pLn->GetTabBoxes();
         for( auto pBox : rBoxes )
-            nMaxLnWidth += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nMaxLnWidth += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
 
-        if( nMaxLnWidth > aTblMaxSz.GetWidth() )
-            aTblMaxSz.SetWidth( nMaxLnWidth );
+        if( nMaxLnWidth > aTableMaxSz.GetWidth() )
+            aTableMaxSz.SetWidth( nMaxLnWidth );
     }
-    pFmt->SetFmtAttr( aTblMaxSz );
+    pFormat->SetFormatAttr( aTableMaxSz );
     if( !bLocked ) // Release the Lock if appropriate
-        pFmt->UnlockModify();
+        pFormat->UnlockModify();
 
     return true;
 }
 
 class _SplitTable_Para
 {
-    std::map<SwFrmFmt*, SwFrmFmt*> aSrcDestMap;
-    SwTableNode* pNewTblNd;
-    SwTable& rOldTbl;
+    std::map<SwFrameFormat*, SwFrameFormat*> aSrcDestMap;
+    SwTableNode* pNewTableNd;
+    SwTable& rOldTable;
 
 public:
     _SplitTable_Para( SwTableNode* pNew, SwTable& rOld )
-        : aSrcDestMap(), pNewTblNd( pNew ), rOldTbl( rOld )
+        : aSrcDestMap(), pNewTableNd( pNew ), rOldTable( rOld )
     {}
-    SwFrmFmt* GetDestFmt( SwFrmFmt* pSrcFmt ) const
+    SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const
     {
-        std::map<SwFrmFmt*, SwFrmFmt*>::const_iterator it = aSrcDestMap.find( pSrcFmt );
+        std::map<SwFrameFormat*, SwFrameFormat*>::const_iterator it = aSrcDestMap.find( pSrcFormat );
         return it == aSrcDestMap.end() ? NULL : it->second;
     }
 
-    void InsertSrcDest( SwFrmFmt* pSrcFmt, SwFrmFmt* pDestFmt )
-            { aSrcDestMap[ pSrcFmt ] = pDestFmt; }
+    void InsertSrcDest( SwFrameFormat* pSrcFormat, SwFrameFormat* pDestFormat )
+            { aSrcDestMap[ pSrcFormat ] = pDestFormat; }
 
     void ChgBox( SwTableBox* pBox )
     {
-        rOldTbl.GetTabSortBoxes().erase( pBox );
-        pNewTblNd->GetTable().GetTabSortBoxes().insert( pBox );
+        rOldTable.GetTabSortBoxes().erase( pBox );
+        pNewTableNd->GetTable().GetTabSortBoxes().insert( pBox );
     }
 };
 
@@ -3326,14 +3326,14 @@ static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara );
 
 static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara )
 {
-    SwFrmFmt *pSrcFmt = pLn->GetFrmFmt();
-    SwTableLineFmt* pDestFmt = static_cast<SwTableLineFmt*>( pPara->GetDestFmt( pSrcFmt ) );
-    if( pDestFmt == NULL )
+    SwFrameFormat *pSrcFormat = pLn->GetFrameFormat();
+    SwTableLineFormat* pDestFormat = static_cast<SwTableLineFormat*>( pPara->GetDestFormat( pSrcFormat ) );
+    if( pDestFormat == NULL )
     {
-        pPara->InsertSrcDest( pSrcFmt, pLn->ClaimFrmFmt() );
+        pPara->InsertSrcDest( pSrcFormat, pLn->ClaimFrameFormat() );
     }
     else
-        pLn->ChgFrmFmt( pDestFmt );
+        pLn->ChgFrameFormat( pDestFormat );
 
     for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
              it != pLn->GetTabBoxes().end(); ++it)
@@ -3342,14 +3342,14 @@ static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara )
 
 static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara )
 {
-    SwFrmFmt *pSrcFmt = pBox->GetFrmFmt();
-    SwTableBoxFmt* pDestFmt = static_cast<SwTableBoxFmt*>(pPara->GetDestFmt( pSrcFmt ));
-    if( pDestFmt == NULL )
+    SwFrameFormat *pSrcFormat = pBox->GetFrameFormat();
+    SwTableBoxFormat* pDestFormat = static_cast<SwTableBoxFormat*>(pPara->GetDestFormat( pSrcFormat ));
+    if( pDestFormat == NULL )
     {
-        pPara->InsertSrcDest( pSrcFmt, pBox->ClaimFrmFmt() );
+        pPara->InsertSrcDest( pSrcFormat, pBox->ClaimFrameFormat() );
     }
     else
-        pBox->ChgFrmFmt( pDestFmt );
+        pBox->ChgFrameFormat( pDestFormat );
 
     if( pBox->GetSttNd() )
         pPara->ChgBox( pBox );
@@ -3369,8 +3369,8 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
     sal_uLong nSttIdx = pNd->FindTableBoxStartNode()->GetIndex();
 
     // Find this Box/top-level line
-    SwTable& rTbl = pTNd->GetTable();
-    SwTableBox* pBox = rTbl.GetTblBox( nSttIdx );
+    SwTable& rTable = pTNd->GetTable();
+    SwTableBox* pBox = rTable.GetTableBox( nSttIdx );
     if( !pBox )
         return 0;
 
@@ -3379,95 +3379,95 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
         pLine = pLine->GetUpper()->GetUpper();
 
     // pLine now contains the top-level line
-    sal_uInt16 nLinePos = rTbl.GetTabLines().GetPos( pLine );
+    sal_uInt16 nLinePos = rTable.GetTabLines().GetPos( pLine );
     if( USHRT_MAX == nLinePos ||
-        ( bAfter ? ++nLinePos >= rTbl.GetTabLines().size() : !nLinePos ))
+        ( bAfter ? ++nLinePos >= rTable.GetTabLines().size() : !nLinePos ))
         return 0; // Not found or last Line!
 
     // Find the first Box of the succeeding Line
-    SwTableLine* pNextLine = rTbl.GetTabLines()[ nLinePos ];
+    SwTableLine* pNextLine = rTable.GetTabLines()[ nLinePos ];
     pBox = pNextLine->GetTabBoxes()[0];
     while( !pBox->GetSttNd() )
         pBox = pBox->GetTabLines()[0]->GetTabBoxes()[0];
 
     // Insert an EndNode and TableNode into the Nodes Array
-    SwTableNode * pNewTblNd;
+    SwTableNode * pNewTableNd;
     {
-        SwEndNode* pOldTblEndNd = pTNd->EndOfSectionNode()->GetEndNode();
-        OSL_ENSURE( pOldTblEndNd, "Where is the EndNode?" );
+        SwEndNode* pOldTableEndNd = pTNd->EndOfSectionNode()->GetEndNode();
+        OSL_ENSURE( pOldTableEndNd, "Where is the EndNode?" );
 
         SwNodeIndex aIdx( *pBox->GetSttNd() );
         new SwEndNode( aIdx, *pTNd );
-        pNewTblNd = new SwTableNode( aIdx );
-        pNewTblNd->GetTable().SetTableModel( rTbl.IsNewModel() );
+        pNewTableNd = new SwTableNode( aIdx );
+        pNewTableNd->GetTable().SetTableModel( rTable.IsNewModel() );
 
-        pOldTblEndNd->pStartOfSection = pNewTblNd;
-        pNewTblNd->pEndOfSection = pOldTblEndNd;
+        pOldTableEndNd->pStartOfSection = pNewTableNd;
+        pNewTableNd->pEndOfSection = pOldTableEndNd;
 
         SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
         do {
             OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" );
-            pBoxNd->pStartOfSection = pNewTblNd;
+            pBoxNd->pStartOfSection = pNewTableNd;
             pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
-        } while( pBoxNd != pOldTblEndNd );
+        } while( pBoxNd != pOldTableEndNd );
     }
 
     {
         // Move the Lines
-        SwTable& rNewTbl = pNewTblNd->GetTable();
-        rNewTbl.GetTabLines().insert( rNewTbl.GetTabLines().begin(),
-                      rTbl.GetTabLines().begin() + nLinePos, rTbl.GetTabLines().end() );
+        SwTable& rNewTable = pNewTableNd->GetTable();
+        rNewTable.GetTabLines().insert( rNewTable.GetTabLines().begin(),
+                      rTable.GetTabLines().begin() + nLinePos, rTable.GetTabLines().end() );
 
         /* From the back (bottom right) to the front (top left) deregister all Boxes from the
            Chart Data Provider. The Modify event is triggered in the calling function.
          TL_CHART2: */
-        SwChartDataProvider *pPCD = rTbl.GetFrmFmt()->getIDocumentChartDataProviderAccess()->GetChartDataProvider();
+        SwChartDataProvider *pPCD = rTable.GetFrameFormat()->getIDocumentChartDataProviderAccess()->GetChartDataProvider();
         if( pPCD )
         {
-            for (SwTableLines::size_type k = nLinePos;  k < rTbl.GetTabLines().size(); ++k)
+            for (SwTableLines::size_type k = nLinePos;  k < rTable.GetTabLines().size(); ++k)
             {
-                const SwTableLines::size_type nLineIdx = (rTbl.GetTabLines().size() - 1) - k + nLinePos;
-                const SwTableBoxes::size_type nBoxCnt = rTbl.GetTabLines()[ nLineIdx ]->GetTabBoxes().size();
+                const SwTableLines::size_type nLineIdx = (rTable.GetTabLines().size() - 1) - k + nLinePos;
+                const SwTableBoxes::size_type nBoxCnt = rTable.GetTabLines()[ nLineIdx ]->GetTabBoxes().size();
                 for (SwTableBoxes::size_type j = 0;  j < nBoxCnt;  ++j)
                 {
                     const SwTableBoxes::size_type nIdx = nBoxCnt - 1 - j;
-                    pPCD->DeleteBox( &rTbl, *rTbl.GetTabLines()[ nLineIdx ]->GetTabBoxes()[nIdx] );
+                    pPCD->DeleteBox( &rTable, *rTable.GetTabLines()[ nLineIdx ]->GetTabBoxes()[nIdx] );
                 }
             }
         }
 
         // Delete
-        sal_uInt16 nDeleted = rTbl.GetTabLines().size() - nLinePos;
-        rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + nLinePos, rTbl.GetTabLines().end() );
+        sal_uInt16 nDeleted = rTable.GetTabLines().size() - nLinePos;
+        rTable.GetTabLines().erase( rTable.GetTabLines().begin() + nLinePos, rTable.GetTabLines().end() );
 
         // Move the affected Boxes. Make the Formats unique and correct the StartNodes
-        _SplitTable_Para aPara( pNewTblNd, rTbl );
-        for( SwTableLine* pNewLine : rNewTbl.GetTabLines() )
+        _SplitTable_Para aPara( pNewTableNd, rTable );
+        for( SwTableLine* pNewLine : rNewTable.GetTabLines() )
             lcl_SplitTable_CpyLine( pNewLine, &aPara );
-        rTbl.CleanUpBottomRowSpan( nDeleted );
+        rTable.CleanUpBottomRowSpan( nDeleted );
     }
 
     {
         // Copy the Table FrmFormat
-        SwFrmFmt* pOldTblFmt = rTbl.GetFrmFmt();
-        SwFrmFmt* pNewTblFmt = pOldTblFmt->GetDoc()->MakeTblFrmFmt(
-                                pOldTblFmt->GetDoc()->GetUniqueTblName(),
-                                pOldTblFmt->GetDoc()->GetDfltFrmFmt() );
+        SwFrameFormat* pOldTableFormat = rTable.GetFrameFormat();
+        SwFrameFormat* pNewTableFormat = pOldTableFormat->GetDoc()->MakeTableFrameFormat(
+                                pOldTableFormat->GetDoc()->GetUniqueTableName(),
+                                pOldTableFormat->GetDoc()->GetDfltFrameFormat() );
 
-        *pNewTblFmt = *pOldTblFmt;
-        pNewTblNd->GetTable().RegisterToFormat( *pNewTblFmt );
+        *pNewTableFormat = *pOldTableFormat;
+        pNewTableNd->GetTable().RegisterToFormat( *pNewTableFormat );
 
         // Calculate a new Size?
-        // lcl_ChgTblSize: Only execute the second call if the first call was
+        // lcl_ChgTableSize: Only execute the second call if the first call was
         // successful, thus has an absolute Size
-        if( bCalcNewSize && lcl_ChgTblSize( rTbl ) )
-            lcl_ChgTblSize( pNewTblNd->GetTable() );
+        if( bCalcNewSize && lcl_ChgTableSize( rTable ) )
+            lcl_ChgTableSize( pNewTableNd->GetTable() );
     }
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    rTbl.UpdateCharts();
+    rTable.UpdateCharts();
 
-    return pNewTblNd; // That's it!
+    return pNewTableNd; // That's it!
 }
 
 /**
@@ -3478,45 +3478,45 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
  */
 bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode )
 {
-    SwTableNode* pTblNd = rPos.nNode.GetNode().FindTableNode(), *pDelTblNd;
-    if( !pTblNd )
+    SwTableNode* pTableNd = rPos.nNode.GetNode().FindTableNode(), *pDelTableNd;
+    if( !pTableNd )
         return false;
 
     SwNodes& rNds = GetNodes();
     if( bWithPrev )
-        pDelTblNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+        pDelTableNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
     else
-        pDelTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
-    if( !pDelTblNd )
+        pDelTableNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+    if( !pDelTableNd )
         return false;
 
-    if( pTblNd->GetTable().ISA( SwDDETable ) ||
-        pDelTblNd->GetTable().ISA( SwDDETable ))
+    if( pTableNd->GetTable().ISA( SwDDETable ) ||
+        pDelTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
     // Delete HTML Layout
-    pTblNd->GetTable().SetHTMLTableLayout( 0 );
-    pDelTblNd->GetTable().SetHTMLTableLayout( 0 );
+    pTableNd->GetTable().SetHTMLTableLayout( 0 );
+    pDelTableNd->GetTable().SetHTMLTableLayout( 0 );
 
     // Both Tables are present; we can start
-    SwUndoMergeTbl* pUndo = 0;
+    SwUndoMergeTable* pUndo = 0;
     SwHistory* pHistory = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoMergeTbl( *pTblNd, *pDelTblNd, bWithPrev, nMode );
+        pUndo = new SwUndoMergeTable( *pTableNd, *pDelTableNd, bWithPrev, nMode );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
         pHistory = new SwHistory;
     }
 
     // Adapt all "TableFormulas"
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.DATA.pDelTbl = &pDelTblNd->GetTable();
-    aMsgHnt.eFlags = TBL_MERGETBL;
-    aMsgHnt.pHistory = pHistory;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.DATA.pDelTable = &pDelTableNd->GetTable();
+    aMsgHint.eFlags = TBL_MERGETBL;
+    aMsgHint.pHistory = pHistory;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // The actual merge
-    SwNodeIndex aIdx( bWithPrev ? *pTblNd : *pDelTblNd );
+    SwNodeIndex aIdx( bWithPrev ? *pTableNd : *pDelTableNd );
     bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode, pHistory );
 
     if( pHistory )
@@ -3536,40 +3536,40 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
 bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
                             sal_uInt16 nMode, SwHistory* )
 {
-    SwTableNode* pDelTblNd = rPos.GetNode().GetTableNode();
-    OSL_ENSURE( pDelTblNd, "Where did the TableNode go?" );
+    SwTableNode* pDelTableNd = rPos.GetNode().GetTableNode();
+    OSL_ENSURE( pDelTableNd, "Where did the TableNode go?" );
 
-    SwTableNode* pTblNd = (*this)[ rPos.GetIndex() - 1]->FindTableNode();
-    OSL_ENSURE( pTblNd, "Where did the TableNode go?" );
+    SwTableNode* pTableNd = (*this)[ rPos.GetIndex() - 1]->FindTableNode();
+    OSL_ENSURE( pTableNd, "Where did the TableNode go?" );
 
-    if( !pDelTblNd || !pTblNd )
+    if( !pDelTableNd || !pTableNd )
         return false;
 
-    pDelTblNd->DelFrms();
+    pDelTableNd->DelFrms();
 
-    SwTable& rDelTbl = pDelTblNd->GetTable();
-    SwTable& rTbl = pTblNd->GetTable();
+    SwTable& rDelTable = pDelTableNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
 
     // Find Lines for the Layout update
     _FndBox aFndBox( 0, 0 );
-    aFndBox.SetTableLines( rTbl );
-    aFndBox.DelFrms( rTbl );
+    aFndBox.SetTableLines( rTable );
+    aFndBox.DelFrms( rTable );
 
     // TL_CHART2:
     // tell the charts about the table to be deleted and have them use their own data
-    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &rDelTbl );
+    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &rDelTable );
 
     // Sync the TableFormat's Width
     {
-        const SwFmtFrmSize& rTblSz = rTbl.GetFrmFmt()->GetFrmSize();
-        const SwFmtFrmSize& rDelTblSz = rDelTbl.GetFrmFmt()->GetFrmSize();
-        if( rTblSz != rDelTblSz )
+        const SwFormatFrmSize& rTableSz = rTable.GetFrameFormat()->GetFrmSize();
+        const SwFormatFrmSize& rDelTableSz = rDelTable.GetFrameFormat()->GetFrmSize();
+        if( rTableSz != rDelTableSz )
         {
             // The needs correction
             if( bWithPrev )
-                rDelTbl.GetFrmFmt()->SetFmtAttr( rTblSz );
+                rDelTable.GetFrameFormat()->SetFormatAttr( rTableSz );
             else
-                rTbl.GetFrmFmt()->SetFmtAttr( rDelTblSz );
+                rTable.GetFrameFormat()->SetFormatAttr( rDelTableSz );
         }
     }
 
@@ -3577,44 +3577,44 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
     {
         // Transfer all Attributes of the succeeding Table to the preceding one
         // We do this, because the succeeding one is deleted when deleting the Node
-        rTbl.SetRowsToRepeat( rDelTbl.GetRowsToRepeat() );
-        rTbl.SetTblChgMode( rDelTbl.GetTblChgMode() );
+        rTable.SetRowsToRepeat( rDelTable.GetRowsToRepeat() );
+        rTable.SetTableChgMode( rDelTable.GetTableChgMode() );
 
-        rTbl.GetFrmFmt()->LockModify();
-        *rTbl.GetFrmFmt() = *rDelTbl.GetFrmFmt();
+        rTable.GetFrameFormat()->LockModify();
+        *rTable.GetFrameFormat() = *rDelTable.GetFrameFormat();
         // Also switch the Name
-        rTbl.GetFrmFmt()->SetName( rDelTbl.GetFrmFmt()->GetName() );
-        rTbl.GetFrmFmt()->UnlockModify();
+        rTable.GetFrameFormat()->SetName( rDelTable.GetFrameFormat()->GetName() );
+        rTable.GetFrameFormat()->UnlockModify();
     }
 
     // Move the Lines and Boxes
-    SwTableLines::size_type nOldSize = rTbl.GetTabLines().size();
-    rTbl.GetTabLines().insert( rTbl.GetTabLines().begin() + nOldSize,
-                               rDelTbl.GetTabLines().begin(), rDelTbl.GetTabLines().end() );
-    rDelTbl.GetTabLines().clear();
+    SwTableLines::size_type nOldSize = rTable.GetTabLines().size();
+    rTable.GetTabLines().insert( rTable.GetTabLines().begin() + nOldSize,
+                               rDelTable.GetTabLines().begin(), rDelTable.GetTabLines().end() );
+    rDelTable.GetTabLines().clear();
 
-    rTbl.GetTabSortBoxes().insert( rDelTbl.GetTabSortBoxes() );
-    rDelTbl.GetTabSortBoxes().clear();
+    rTable.GetTabSortBoxes().insert( rDelTable.GetTabSortBoxes() );
+    rDelTable.GetTabSortBoxes().clear();
 
     // The preceding Table always remains, while the succeeding one is deleted
-    SwEndNode* pTblEndNd = pDelTblNd->EndOfSectionNode();
-    pTblNd->pEndOfSection = pTblEndNd;
+    SwEndNode* pTableEndNd = pDelTableNd->EndOfSectionNode();
+    pTableNd->pEndOfSection = pTableEndNd;
 
-    SwNodeIndex aIdx( *pDelTblNd, 1 );
+    SwNodeIndex aIdx( *pDelTableNd, 1 );
 
     SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
     do {
         OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" );
-        pBoxNd->pStartOfSection = pTblNd;
+        pBoxNd->pStartOfSection = pTableNd;
         pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
-    } while( pBoxNd != pTblEndNd );
-    pBoxNd->pStartOfSection = pTblNd;
+    } while( pBoxNd != pTableEndNd );
+    pBoxNd->pStartOfSection = pTableNd;
 
     aIdx -= 2;
     DelNodes( aIdx, 2 );
 
     // tweak the conditional styles at the first inserted Line
-    const SwTableLine* pFirstLn = rTbl.GetTabLines()[ nOldSize ];
+    const SwTableLine* pFirstLn = rTable.GetTabLines()[ nOldSize ];
     if( 1 == nMode )
     {
         // Set Header Template in the Line and save in the History
@@ -3625,69 +3625,69 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
     // Clean up the Borders
     if( nOldSize )
     {
-        _SwGCLineBorder aPara( rTbl );
+        _SwGCLineBorder aPara( rTable );
         aPara.nLinePos = --nOldSize;
-        pFirstLn = rTbl.GetTabLines()[ nOldSize ];
+        pFirstLn = rTable.GetTabLines()[ nOldSize ];
         sw_GC_Line_Border( pFirstLn, &aPara );
     }
 
     // Update Layout
-    aFndBox.MakeFrms( rTbl );
+    aFndBox.MakeFrms( rTable );
 
     return true;
 }
 
 // Use the PtrArray's ForEach method
-struct _SetAFmtTabPara
+struct _SetAFormatTabPara
 {
-    SwTableAutoFmt& rTblFmt;
-    SwUndoTblAutoFmt* pUndo;
+    SwTableAutoFormat& rTableFormat;
+    SwUndoTableAutoFormat* pUndo;
     sal_uInt16 nEndBox, nCurBox;
-    sal_uInt8 nAFmtLine, nAFmtBox;
+    sal_uInt8 nAFormatLine, nAFormatBox;
 
-    _SetAFmtTabPara( const SwTableAutoFmt& rNew )
-        : rTblFmt( (SwTableAutoFmt&)rNew ), pUndo( 0 ),
-        nEndBox( 0 ), nCurBox( 0 ), nAFmtLine( 0 ), nAFmtBox( 0 )
+    _SetAFormatTabPara( const SwTableAutoFormat& rNew )
+        : rTableFormat( (SwTableAutoFormat&)rNew ), pUndo( 0 ),
+        nEndBox( 0 ), nCurBox( 0 ), nAFormatLine( 0 ), nAFormatBox( 0 )
     {}
 };
 
 // Forward declare so that the Lines and Boxes can use recursion
-static bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
-static bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
+static bool lcl_SetAFormatBox(_FndBox &, _SetAFormatTabPara *pSetPara);
+static bool lcl_SetAFormatLine(_FndLine &, _SetAFormatTabPara *pPara);
 
-static bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
+static bool lcl_SetAFormatLine(_FndLine & rLine, _SetAFormatTabPara *pPara)
 {
     for (_FndBoxes::iterator it = rLine.GetBoxes().begin();
          it != rLine.GetBoxes().end(); ++it)
     {
-        lcl_SetAFmtBox(*it, pPara);
+        lcl_SetAFormatBox(*it, pPara);
     }
     return true;
 }
 
-static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
+static bool lcl_SetAFormatBox( _FndBox & rBox, _SetAFormatTabPara *pSetPara )
 {
     if (!rBox.GetUpper()->GetUpper()) // Box on first level?
     {
         if( !pSetPara->nCurBox )
-            pSetPara->nAFmtBox = 0;
+            pSetPara->nAFormatBox = 0;
         else if( pSetPara->nCurBox == pSetPara->nEndBox )
-            pSetPara->nAFmtBox = 3;
+            pSetPara->nAFormatBox = 3;
         else
-            pSetPara->nAFmtBox = (sal_uInt8)(1 + ((pSetPara->nCurBox-1) & 1));
+            pSetPara->nAFormatBox = (sal_uInt8)(1 + ((pSetPara->nCurBox-1) & 1));
     }
 
     if (rBox.GetBox()->GetSttNd())
     {
         SwTableBox* pSetBox = static_cast<SwTableBox*>(rBox.GetBox());
-        SwDoc* pDoc = pSetBox->GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = pSetBox->GetFrameFormat()->GetDoc();
         SfxItemSet aCharSet( pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
         SfxItemSet aBoxSet( pDoc->GetAttrPool(), aTableBoxSetRange );
-        sal_uInt8 nPos = pSetPara->nAFmtLine * 4 + pSetPara->nAFmtBox;
-        pSetPara->rTblFmt.UpdateToSet( nPos, aCharSet,
-                                        SwTableAutoFmt::UPDATE_CHAR, 0 );
-        pSetPara->rTblFmt.UpdateToSet( nPos, aBoxSet,
-                                        SwTableAutoFmt::UPDATE_BOX,
+        sal_uInt8 nPos = pSetPara->nAFormatLine * 4 + pSetPara->nAFormatBox;
+        pSetPara->rTableFormat.UpdateToSet( nPos, aCharSet,
+                                        SwTableAutoFormat::UPDATE_CHAR, 0 );
+        pSetPara->rTableFormat.UpdateToSet( nPos, aBoxSet,
+                                        SwTableAutoFormat::UPDATE_BOX,
                                         pDoc->GetNumberFormatter( true ) );
         if( aCharSet.Count() )
         {
@@ -3695,7 +3695,7 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
             sal_uLong nEndNd = pSetBox->GetSttNd()->EndOfSectionIndex();
             for( ; nSttNd < nEndNd; ++nSttNd )
             {
-                SwCntntNode* pNd = pDoc->GetNodes()[ nSttNd ]->GetCntntNode();
+                SwContentNode* pNd = pDoc->GetNodes()[ nSttNd ]->GetContentNode();
                 if( pNd )
                     pNd->SetAttr( aCharSet );
             }
@@ -3705,15 +3705,15 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
         {
             if( pSetPara->pUndo &&
                 SfxItemState::SET == aBoxSet.GetItemState( RES_BOXATR_FORMAT ))
-                pSetPara->pUndo->SaveBoxCntnt( *pSetBox );
+                pSetPara->pUndo->SaveBoxContent( *pSetBox );
 
-            pSetBox->ClaimFrmFmt()->SetFmtAttr( aBoxSet );
+            pSetBox->ClaimFrameFormat()->SetFormatAttr( aBoxSet );
         }
     }
     else
     {
         for( _FndLine& rFndLine : rBox.GetLines() )
-            lcl_SetAFmtLine( rFndLine, pSetPara );
+            lcl_SetAFormatLine( rFndLine, pSetPara );
     }
 
     if (!rBox.GetUpper()->GetUpper()) // a BaseLine
@@ -3724,23 +3724,23 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
 /**
  * AutoFormat for the Table/TableSelection
  */
-bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew )
+bool SwDoc::SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
         return false;
 
-    SwTable &table = pTblNd->GetTable();
+    SwTable &table = pTableNd->GetTable();
     table.SetHTMLTableLayout( 0 );
 
     _FndBox* pFndBox = &aFndBox;
@@ -3754,18 +3754,18 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
         pFndBox = pFndBox->GetUpper()->GetUpper();
 
     // Disable Undo, but first store parameters
-    SwUndoTblAutoFmt* pUndo = 0;
+    SwUndoTableAutoFormat* pUndo = 0;
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
     if (bUndo)
     {
-        pUndo = new SwUndoTblAutoFmt( *pTblNd, rNew );
+        pUndo = new SwUndoTableAutoFormat( *pTableNd, rNew );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
         GetIDocumentUndoRedo().DoUndo(false);
     }
 
     rNew.RestoreTableProperties(table);
 
-    _SetAFmtTabPara aPara( rNew );
+    _SetAFormatTabPara aPara( rNew );
     _FndLines& rFLns = pFndBox->GetLines();
 
     for( _FndLines::size_type n = 0; n < rFLns.size(); ++n )
@@ -3777,20 +3777,20 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
         pLine->SetUpper( 0 );
 
         if( !n )
-            aPara.nAFmtLine = 0;
+            aPara.nAFormatLine = 0;
         else if (static_cast<size_t>(n+1) == rFLns.size())
-            aPara.nAFmtLine = 3;
+            aPara.nAFormatLine = 3;
         else
-            aPara.nAFmtLine = (sal_uInt8)(1 + ((n-1) & 1 ));
+            aPara.nAFormatLine = (sal_uInt8)(1 + ((n-1) & 1 ));
 
-        aPara.nAFmtBox = 0;
+        aPara.nAFormatBox = 0;
         aPara.nCurBox = 0;
         aPara.nEndBox = pLine->GetBoxes().size()-1;
         aPara.pUndo = pUndo;
         for (_FndBoxes::iterator it = pLine->GetBoxes().begin();
              it != pLine->GetBoxes().end(); ++it)
         {
-            lcl_SetAFmtBox(*it, &aPara);
+            lcl_SetAFormatBox(*it, &aPara);
         }
 
         pLine->SetUpper( pSaveBox );
@@ -3810,24 +3810,24 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
 /**
  * Find out who has the Attributes
  */
-bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
+bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
         return false;
 
     // Store table properties
-    SwTable &table = pTblNd->GetTable();
+    SwTable &table = pTableNd->GetTable();
     rGet.StoreTableProperties(table);
 
     _FndBox* pFndBox = &aFndBox;
@@ -3867,15 +3867,15 @@ bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
 
             sal_uInt8 nPos = nLine * 4 + nBox;
             SwNodeIndex aIdx( *pFBox->GetSttNd(), 1 );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = GetNodes().GoNext( &aIdx );
 
             if( pCNd )
                 rGet.UpdateFromSet( nPos, pCNd->GetSwAttrSet(),
-                                    SwTableAutoFmt::UPDATE_CHAR, 0 );
-            rGet.UpdateFromSet( nPos, pFBox->GetFrmFmt()->GetAttrSet(),
-                                SwTableAutoFmt::UPDATE_BOX,
+                                    SwTableAutoFormat::UPDATE_CHAR, 0 );
+            rGet.UpdateFromSet( nPos, pFBox->GetFrameFormat()->GetAttrSet(),
+                                SwTableAutoFormat::UPDATE_BOX,
                                 GetNumberFormatter( true ) );
         }
     }
@@ -3883,40 +3883,40 @@ bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
     return true;
 }
 
-OUString SwDoc::GetUniqueTblName() const
+OUString SwDoc::GetUniqueTableName() const
 {
     if( IsInMailMerge())
     {
         OUString newName = "MailMergeTable"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpTblFrmFmtTbl->size() + 1 );
+            + OUString::number( mpTableFrameFormatTable->size() + 1 );
         return newName;
     }
 
     ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
     const OUString aName( aId );
 
-    const size_t nFlagSize = ( mpTblFrmFmtTbl->size() / 8 ) + 2;
+    const size_t nFlagSize = ( mpTableFrameFormatTable->size() / 8 ) + 2;
 
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( size_t n = 0; n < mpTblFrmFmtTbl->size(); ++n )
+    for( size_t n = 0; n < mpTableFrameFormatTable->size(); ++n )
     {
-        const SwFrmFmt* pFmt = (*mpTblFrmFmtTbl)[ n ];
-        if( !pFmt->IsDefault() && IsUsed( *pFmt )  &&
-            pFmt->GetName().startsWith( aName ) )
+        const SwFrameFormat* pFormat = (*mpTableFrameFormatTable)[ n ];
+        if( !pFormat->IsDefault() && IsUsed( *pFormat )  &&
+            pFormat->GetName().startsWith( aName ) )
         {
             // Get number and set the Flag
             const sal_Int32 nNmLen = aName.getLength();
-            size_t nNum = pFmt->GetName().copy( nNmLen ).toInt32();
-            if( nNum-- && nNum < mpTblFrmFmtTbl->size() )
+            size_t nNum = pFormat->GetName().copy( nNmLen ).toInt32();
+            if( nNum-- && nNum < mpTableFrameFormatTable->size() )
                 pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
         }
     }
 
     // All numbers are flagged properly, thus calculate the right number
-    size_t nNum = mpTblFrmFmtTbl->size();
+    size_t nNum = mpTableFrameFormatTable->size();
     for( size_t n = 0; n < nFlagSize; ++n )
     {
         auto nTmp = pSetFlags[ n ];
@@ -3937,60 +3937,60 @@ OUString SwDoc::GetUniqueTblName() const
     return aName + OUString::number( ++nNum );
 }
 
-SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, bool bAll ) const
+SwTableFormat* SwDoc::FindTableFormatByName( const OUString& rName, bool bAll ) const
 {
-    const SwFmt* pRet = 0;
+    const SwFormat* pRet = 0;
     if( bAll )
-        pRet = FindFmtByName( *mpTblFrmFmtTbl, rName );
+        pRet = FindFormatByName( *mpTableFrameFormatTable, rName );
     else
     {
         // Only the ones set in the Doc
-        for( size_t n = 0; n < mpTblFrmFmtTbl->size(); ++n )
+        for( size_t n = 0; n < mpTableFrameFormatTable->size(); ++n )
         {
-            const SwFrmFmt* pFmt = (*mpTblFrmFmtTbl)[ n ];
-            if( !pFmt->IsDefault() && IsUsed( *pFmt ) &&
-                pFmt->GetName() == rName )
+            const SwFrameFormat* pFormat = (*mpTableFrameFormatTable)[ n ];
+            if( !pFormat->IsDefault() && IsUsed( *pFormat ) &&
+                pFormat->GetName() == rName )
             {
-                pRet = pFmt;
+                pRet = pFormat;
                 break;
             }
         }
     }
-    return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(pRet));
+    return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(pRet));
 }
 
 bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                     SwTwips nAbsDiff, SwTwips nRelDiff )
 {
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode());
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode());
     SwUndo* pUndo = 0;
 
-    if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType && pTblNd->GetTable().ISA( SwDDETable ))
+    if( nsTableChgWidthHeightType::WH_FLAG_INSDEL & eType && pTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
     bool bRet = false;
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_COL_LEFT:
-    case nsTblChgWidthHeightType::WH_COL_RIGHT:
-    case nsTblChgWidthHeightType::WH_CELL_LEFT:
-    case nsTblChgWidthHeightType::WH_CELL_RIGHT:
+    case nsTableChgWidthHeightType::WH_COL_LEFT:
+    case nsTableChgWidthHeightType::WH_COL_RIGHT:
+    case nsTableChgWidthHeightType::WH_CELL_LEFT:
+    case nsTableChgWidthHeightType::WH_CELL_RIGHT:
         {
-             bRet = pTblNd->GetTable().SetColWidth( rAktBox,
+             bRet = pTableNd->GetTable().SetColWidth( rAktBox,
                                 eType, nAbsDiff, nRelDiff,
                                 (bUndo) ? &pUndo : 0 );
         }
         break;
-    case nsTblChgWidthHeightType::WH_ROW_TOP:
-    case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
-    case nsTblChgWidthHeightType::WH_CELL_TOP:
-    case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
-        bRet = pTblNd->GetTable().SetRowHeight( rAktBox,
+    case nsTableChgWidthHeightType::WH_ROW_TOP:
+    case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
+    case nsTableChgWidthHeightType::WH_CELL_TOP:
+    case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
+        bRet = pTableNd->GetTable().SetRowHeight( rAktBox,
                             eType, nAbsDiff, nRelDiff,
                             (bUndo) ? &pUndo : 0 );
         break;
@@ -4005,28 +4005,28 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     if( bRet )
     {
         getIDocumentState().SetModified();
-        if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType )
+        if( nsTableChgWidthHeightType::WH_FLAG_INSDEL & eType )
             getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
     }
     return bRet;
 }
 
-void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
+void SwDoc::ChkBoxNumFormat( SwTableBox& rBox, bool bCallUpdate )
 {
     // Optimization: If the Box says it's Text, it remains Text
-    const SfxPoolItem* pNumFmtItem = 0;
-    if( SfxItemState::SET == rBox.GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT,
-        false, &pNumFmtItem ) && GetNumberFormatter()->IsTextFormat(
-            static_cast<const SwTblBoxNumFormat*>(pNumFmtItem)->GetValue() ))
+    const SfxPoolItem* pNumFormatItem = 0;
+    if( SfxItemState::SET == rBox.GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT,
+        false, &pNumFormatItem ) && GetNumberFormatter()->IsTextFormat(
+            static_cast<const SwTableBoxNumFormat*>(pNumFormatItem)->GetValue() ))
         return ;
 
-    SwUndoTblNumFmt* pUndo = 0;
+    SwUndoTableNumFormat* pUndo = 0;
 
-    bool bIsEmptyTxtNd;
+    bool bIsEmptyTextNd;
     bool bChgd = true;
-    sal_uInt32 nFmtIdx;
+    sal_uInt32 nFormatIdx;
     double fNumber;
-    if( rBox.HasNumCntnt( fNumber, nFmtIdx, bIsEmptyTxtNd ) )
+    if( rBox.HasNumContent( fNumber, nFormatIdx, bIsEmptyTextNd ) )
     {
         if( !rBox.IsNumberChanged() )
             bChgd = false;
@@ -4035,31 +4035,31 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_AUTOFMT, NULL );
-                pUndo = new SwUndoTblNumFmt( rBox );
-                pUndo->SetNumFmt( nFmtIdx, fNumber );
+                pUndo = new SwUndoTableNumFormat( rBox );
+                pUndo->SetNumFormat( nFormatIdx, fNumber );
             }
 
-            SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.GetFrmFmt());
+            SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.GetFrameFormat());
             SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
 
             bool bLockModify = true;
             bool bSetNumberFormat = false;
-            const bool bForceNumberFormat = IsInsTblFormatNum() && IsInsTblChangeNumFormat();
+            const bool bForceNumberFormat = IsInsTableFormatNum() && IsInsTableChangeNumFormat();
 
             // if the user forced a number format in this cell previously,
             // keep it, unless the user set that she wants the full number
             // format recognition
-            if( pNumFmtItem && !bForceNumberFormat )
+            if( pNumFormatItem && !bForceNumberFormat )
             {
-                sal_uLong nOldNumFmt = static_cast<const SwTblBoxNumFormat*>(pNumFmtItem)->GetValue();
-                SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+                sal_uLong nOldNumFormat = static_cast<const SwTableBoxNumFormat*>(pNumFormatItem)->GetValue();
+                SvNumberFormatter* pNumFormatr = GetNumberFormatter();
 
-                short nFmtType = pNumFmtr->GetType( nFmtIdx );
-                if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) || css::util::NumberFormat::NUMBER == nFmtType )
+                short nFormatType = pNumFormatr->GetType( nFormatIdx );
+                if( nFormatType == pNumFormatr->GetType( nOldNumFormat ) || css::util::NumberFormat::NUMBER == nFormatType )
                 {
                     // Current and specified NumFormat match
                     // -> keep old Format
-                    nFmtIdx = nOldNumFmt;
+                    nFormatIdx = nOldNumFormat;
                     bSetNumberFormat = true;
                 }
                 else
@@ -4072,58 +4072,58 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
 
             if( bSetNumberFormat || bForceNumberFormat )
             {
-                pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.ClaimFrmFmt());
+                pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.ClaimFrameFormat());
 
-                aBoxSet.Put( SwTblBoxValue( fNumber ));
-                aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
+                aBoxSet.Put( SwTableBoxValue( fNumber ));
+                aBoxSet.Put( SwTableBoxNumFormat( nFormatIdx ));
             }
 
             // It's not enough to only reset the Formula.
             // Make sure that the Text is formatted accordingly
-            if( !bSetNumberFormat && !bIsEmptyTxtNd && pNumFmtItem )
+            if( !bSetNumberFormat && !bIsEmptyTextNd && pNumFormatItem )
             {
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
             }
 
-            if( bLockModify ) pBoxFmt->LockModify();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-            if( bLockModify ) pBoxFmt->UnlockModify();
+            if( bLockModify ) pBoxFormat->LockModify();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+            if( bLockModify ) pBoxFormat->UnlockModify();
 
             if( bSetNumberFormat )
-                pBoxFmt->SetFmtAttr( aBoxSet );
+                pBoxFormat->SetFormatAttr( aBoxSet );
         }
     }
     else
     {
         // It's not a number
-        const SfxPoolItem* pValueItem = 0, *pFmtItem = 0;
-        SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.GetFrmFmt());
-        if( SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_FORMAT,
-                false, &pFmtItem ) ||
-            SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_VALUE,
+        const SfxPoolItem* pValueItem = 0, *pFormatItem = 0;
+        SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.GetFrameFormat());
+        if( SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_FORMAT,
+                false, &pFormatItem ) ||
+            SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_VALUE,
                 false, &pValueItem ))
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_AUTOFMT, NULL );
-                pUndo = new SwUndoTblNumFmt( rBox );
+                pUndo = new SwUndoTableNumFormat( rBox );
             }
 
-            pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.ClaimFrmFmt());
+            pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.ClaimFrameFormat());
 
             // Remove all number formats
             sal_uInt16 nWhich1 = RES_BOXATR_FORMULA;
-            if( !bIsEmptyTxtNd )
+            if( !bIsEmptyTextNd )
             {
                 nWhich1 = RES_BOXATR_FORMAT;
 
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( nWhich1 ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( nWhich1 ));
             }
-            pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( nWhich1, RES_BOXATR_VALUE );
         }
         else
             bChgd = false;
@@ -4138,42 +4138,42 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
             GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
         }
 
-        const SwTableNode* pTblNd = rBox.GetSttNd()->FindTableNode();
+        const SwTableNode* pTableNd = rBox.GetSttNd()->FindTableNode();
         if( bCallUpdate )
         {
-            SwTableFmlUpdate aTblUpdate( &pTblNd->GetTable() );
-            getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+            SwTableFormulaUpdate aTableUpdate( &pTableNd->GetTable() );
+            getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 
             // TL_CHART2: update charts (when cursor leaves cell and
             // automatic update is enabled)
             if (AUTOUPD_FIELD_AND_CHARTS == GetDocumentSettingManager().getFieldUpdateFlags(true))
-                pTblNd->GetTable().UpdateCharts();
+                pTableNd->GetTable().UpdateCharts();
         }
         getIDocumentState().SetModified();
     }
 }
 
-void SwDoc::SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet )
+void SwDoc::SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet )
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoTblNumFmt(rBox, &rSet) );
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoTableNumFormat(rBox, &rSet) );
     }
 
-    SwFrmFmt* pBoxFmt = rBox.ClaimFrmFmt();
+    SwFrameFormat* pBoxFormat = rBox.ClaimFrameFormat();
     if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA ))
     {
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-        pBoxFmt->UnlockModify();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+        pBoxFormat->UnlockModify();
     }
     else if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_VALUE ))
     {
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
-        pBoxFmt->UnlockModify();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMULA );
+        pBoxFormat->UnlockModify();
     }
-    pBoxFmt->SetFmtAttr( rSet );
+    pBoxFormat->SetFormatAttr( rSet );
     getIDocumentState().SetModified();
 }
 
@@ -4181,21 +4181,21 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
 {
     SwPaM aPam(rPos);
     aPam.Move(fnMoveBackward);
-    SwCntntNode *pNode = aPam.GetCntntNode();
+    SwContentNode *pNode = aPam.GetContentNode();
     if ( 0 == pNode )
         return ;
-    if( pNode->IsTxtNode() )
+    if( pNode->IsTextNode() )
     {
-        SwTxtNode * pTxtNode = pNode->GetTxtNode();
-        if (pTxtNode && pTxtNode->IsNumbered()
-            && pTxtNode->GetTxt().isEmpty())
+        SwTextNode * pTextNode = pNode->GetTextNode();
+        if (pTextNode && pTextNode->IsNumbered()
+            && pTextNode->GetText().isEmpty())
         {
-            const SfxPoolItem* pFmtItem = 0;
-            SfxItemSet rSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+            const SfxPoolItem* pFormatItem = 0;
+            SfxItemSet rSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                         RES_PARATR_BEGIN, RES_PARATR_END - 1,
                         0);
-            pTxtNode->SwCntntNode::GetAttr( rSet );
-            if ( SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFmtItem ) )
+            pTextNode->SwContentNode::GetAttr( rSet );
+            if ( SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFormatItem ) )
             {
                 SwUndoDelNum * pUndo;
                 if( GetIDocumentUndoRedo().DoesUndo() )
@@ -4206,13 +4206,13 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
                 else
                     pUndo = 0;
                 SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
-                aRegH.RegisterInModify( pTxtNode , *pTxtNode );
+                aRegH.RegisterInModify( pTextNode , *pTextNode );
                 if ( pUndo )
-                    pUndo->AddNode( *pTxtNode , false );
-                SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFmtItem->Clone());
+                    pUndo->AddNode( *pTextNode , false );
+                SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFormatItem->Clone());
                 pNewItem->SetValue(OUString());
                 rSet.Put( *pNewItem );
-                pTxtNode->SetAttr( rSet );
+                pTextNode->SetAttr( rSet );
                 delete pNewItem;
             }
         }
@@ -4227,32 +4227,32 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
         2 == pSttNd->EndOfSectionIndex() - pSttNd->GetIndex() )
     {
         SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().
-                            GetTblBox( pSttNd->GetIndex() );
+                            GetTableBox( pSttNd->GetIndex() );
 
-        const SfxPoolItem* pFmtItem = 0;
-        const SfxItemSet& rSet = pBox->GetFrmFmt()->GetAttrSet();
-        if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, &pFmtItem ) ||
+        const SfxPoolItem* pFormatItem = 0;
+        const SfxItemSet& rSet = pBox->GetFrameFormat()->GetAttrSet();
+        if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, &pFormatItem ) ||
             SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA, false ) ||
             SfxItemState::SET == rSet.GetItemState( RES_BOXATR_VALUE, false ))
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoTblNumFmt(*pBox));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoTableNumFormat(*pBox));
             }
 
-            SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
+            SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
 
             // Keep TextFormats!
             sal_uInt16 nWhich1 = RES_BOXATR_FORMAT;
-            if( pFmtItem && GetNumberFormatter()->IsTextFormat(
-                    static_cast<const SwTblBoxNumFormat*>(pFmtItem)->GetValue() ))
+            if( pFormatItem && GetNumberFormatter()->IsTextFormat(
+                    static_cast<const SwTableBoxNumFormat*>(pFormatItem)->GetValue() ))
                 nWhich1 = RES_BOXATR_FORMULA;
             else
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
 
-            pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( nWhich1, RES_BOXATR_VALUE );
             getIDocumentState().SetModified();
         }
     }
@@ -4261,34 +4261,34 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
 /**
  * Copies a Table from the same or another Doc into itself
  * We create a new Table or an existing one is filled with the Content.
- * We either fill in the Content from a certain Box or a certain TblSelection
+ * We either fill in the Content from a certain Box or a certain TableSelection
  *
  * This method is called by edglss.cxx/fecopy.cxx
  */
-bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
-                        const SwTable* pCpyTbl, bool bCpyName, bool bCorrPos )
+bool SwDoc::InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+                        const SwTable* pCpyTable, bool bCpyName, bool bCorrPos )
 {
     bool bRet;
 
-    const SwTableNode* pSrcTblNd = pCpyTbl
-            ? pCpyTbl->GetTableNode()
+    const SwTableNode* pSrcTableNd = pCpyTable
+            ? pCpyTable->GetTableNode()
             : rBoxes[ 0 ]->GetSttNd()->FindTableNode();
 
-    SwTableNode * pInsTblNd = rInsPos.nNode.GetNode().FindTableNode();
+    SwTableNode * pInsTableNd = rInsPos.nNode.GetNode().FindTableNode();
 
     bool const bUndo( GetIDocumentUndoRedo().DoesUndo() );
-    if( !pCpyTbl && !pInsTblNd )
+    if( !pCpyTable && !pInsTableNd )
     {
-        SwUndoCpyTbl* pUndo = 0;
+        SwUndoCpyTable* pUndo = 0;
         if (bUndo)
         {
             GetIDocumentUndoRedo().ClearRedo();
-            pUndo = new SwUndoCpyTbl;
+            pUndo = new SwUndoCpyTable;
         }
 
         {
             ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
-            bRet = pSrcTblNd->GetTable().MakeCopy( this, rInsPos, rBoxes,
+            bRet = pSrcTableNd->GetTable().MakeCopy( this, rInsPos, rBoxes,
                                                 true, bCpyName );
         }
 
@@ -4301,9 +4301,9 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
             }
             else
             {
-                pInsTblNd = GetNodes()[ rInsPos.nNode.GetIndex() - 1 ]->FindTableNode();
+                pInsTableNd = GetNodes()[ rInsPos.nNode.GetIndex() - 1 ]->FindTableNode();
 
-                pUndo->SetTableSttIdx( pInsTblNd->GetIndex() );
+                pUndo->SetTableSttIdx( pInsTableNd->GetIndex() );
                 GetIDocumentUndoRedo().AppendUndo( pUndo );
             }
         }
@@ -4316,15 +4316,15 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                                   nsRedlineMode_t::REDLINE_SHOW_INSERT |
                                   nsRedlineMode_t::REDLINE_SHOW_DELETE));
 
-        SwUndoTblCpyTbl* pUndo = 0;
+        SwUndoTableCpyTable* pUndo = 0;
         if (bUndo)
         {
             GetIDocumentUndoRedo().ClearRedo();
-            pUndo = new SwUndoTblCpyTbl;
+            pUndo = new SwUndoTableCpyTable;
             GetIDocumentUndoRedo().DoUndo(false);
         }
 
-        SwDoc* pCpyDoc = const_cast<SwDoc*>(pSrcTblNd->GetDoc());
+        SwDoc* pCpyDoc = const_cast<SwDoc*>(pSrcTableNd->GetDoc());
         bool bDelCpyDoc = pCpyDoc == this;
 
         if( bDelCpyDoc )
@@ -4334,7 +4334,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
             pCpyDoc->acquire();
 
             SwPosition aPos( SwNodeIndex( pCpyDoc->GetNodes().GetEndOfContent() ));
-            if( !pSrcTblNd->GetTable().MakeCopy( pCpyDoc, aPos, rBoxes, true, true ))
+            if( !pSrcTableNd->GetTable().MakeCopy( pCpyDoc, aPos, rBoxes, true, true ))
             {
                 if( pCpyDoc->release() == 0 )
                     delete pCpyDoc;
@@ -4348,7 +4348,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                 return false;
             }
             aPos.nNode -= 1; // Set to the Table's EndNode
-            pSrcTblNd = aPos.nNode.GetNode().FindTableNode();
+            pSrcTableNd = aPos.nNode.GetNode().FindTableNode();
         }
 
         const SwStartNode* pSttNd = rInsPos.nNode.GetNode().FindTableBoxStartNode();
@@ -4356,7 +4356,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
         rInsPos.nContent.Assign( 0, 0 );
 
         // no complex into complex, but copy into or from new model is welcome
-        if( ( !pSrcTblNd->GetTable().IsTblComplex() || pInsTblNd->GetTable().IsNewModel() )
+        if( ( !pSrcTableNd->GetTable().IsTableComplex() || pInsTableNd->GetTable().IsNewModel() )
             && ( bDelCpyDoc || !rBoxes.empty() ) )
         {
             // Copy the Table "relatively"
@@ -4365,7 +4365,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
 
             if( bDelCpyDoc )
             {
-                SwTableBox* pBox = pInsTblNd->GetTable().GetTblBox(
+                SwTableBox* pBox = pInsTableNd->GetTable().GetTableBox(
                                         pSttNd->GetIndex() );
                 OSL_ENSURE( pBox, "Box is not in this Table" );
                 aBoxes.insert( pBox );
@@ -4375,13 +4375,13 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                 pBoxes = &rBoxes;
 
             // Copy Table to the selected Lines
-            bRet = pInsTblNd->GetTable().InsTable( pSrcTblNd->GetTable(),
+            bRet = pInsTableNd->GetTable().InsTable( pSrcTableNd->GetTable(),
                                                         *pBoxes, pUndo );
         }
         else
         {
             SwNodeIndex aNdIdx( *pSttNd, 1 );
-            bRet = pInsTblNd->GetTable().InsTable( pSrcTblNd->GetTable(),
+            bRet = pInsTableNd->GetTable().InsTable( pSrcTableNd->GetTable(),
                                                     aNdIdx, pUndo );
         }
 
@@ -4419,20 +4419,20 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
     return bRet;
 }
 
-bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
+bool SwDoc::_UnProtectTableCells( SwTable& rTable )
 {
     bool bChgd = false;
-    SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoAttrTbl( *rTbl.GetTableNode() )
+    SwUndoAttrTable *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
+        ?   new SwUndoAttrTable( *rTable.GetTableNode() )
         :   0;
 
-    SwTableSortBoxes& rSrtBox = rTbl.GetTabSortBoxes();
+    SwTableSortBoxes& rSrtBox = rTable.GetTabSortBoxes();
     for (size_t i = rSrtBox.size(); i; )
     {
-        SwFrmFmt *pBoxFmt = rSrtBox[ --i ]->GetFrmFmt();
-        if( pBoxFmt->GetProtect().IsCntntProtected() )
+        SwFrameFormat *pBoxFormat = rSrtBox[ --i ]->GetFrameFormat();
+        if( pBoxFormat->GetProtect().IsContentProtected() )
         {
-            pBoxFmt->ResetFmtAttr( RES_PROTECT );
+            pBoxFormat->ResetFormatAttr( RES_PROTECT );
             bChgd = true;
         }
     }
@@ -4452,10 +4452,10 @@ bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
 bool SwDoc::UnProtectCells( const OUString& rName )
 {
     bool bChgd = false;
-    SwTableFmt* pFmt = FindTblFmtByName( rName );
-    if( pFmt )
+    SwTableFormat* pFormat = FindTableFormatByName( rName );
+    if( pFormat )
     {
-        bChgd = _UnProtectTblCells( *SwTable::FindTable( pFmt ) );
+        bChgd = _UnProtectTableCells( *SwTable::FindTable( pFormat ) );
         if( bChgd )
             getIDocumentState().SetModified();
     }
@@ -4468,27 +4468,27 @@ bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
     bool bChgd = false;
     if( !rBoxes.empty() )
     {
-        SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-                ? new SwUndoAttrTbl( *rBoxes[0]->GetSttNd()->FindTableNode() )
+        SwUndoAttrTable *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
+                ? new SwUndoAttrTable( *rBoxes[0]->GetSttNd()->FindTableNode() )
                 : 0;
 
-        std::map<SwFrmFmt*, SwTableBoxFmt*> aFmtsMap;
+        std::map<SwFrameFormat*, SwTableBoxFormat*> aFormatsMap;
         for (size_t i = rBoxes.size(); i; )
         {
             SwTableBox* pBox = rBoxes[ --i ];
-            SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-            if( pBoxFmt->GetProtect().IsCntntProtected() )
+            SwFrameFormat* pBoxFormat = pBox->GetFrameFormat();
+            if( pBoxFormat->GetProtect().IsContentProtected() )
             {
-                std::map<SwFrmFmt*, SwTableBoxFmt*>::const_iterator const it =
-                    aFmtsMap.find(pBoxFmt);
-                if (aFmtsMap.end() != it)
-                    pBox->ChgFrmFmt(it->second);
+                std::map<SwFrameFormat*, SwTableBoxFormat*>::const_iterator const it =
+                    aFormatsMap.find(pBoxFormat);
+                if (aFormatsMap.end() != it)
+                    pBox->ChgFrameFormat(it->second);
                 else
                 {
-                    SwTableBoxFmt *const pNewBoxFmt(
-                        static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt()));
-                    pNewBoxFmt->ResetFmtAttr( RES_PROTECT );
-                    aFmtsMap.insert(std::make_pair(pBoxFmt, pNewBoxFmt));
+                    SwTableBoxFormat *const pNewBoxFormat(
+                        static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat()));
+                    pNewBoxFormat->ResetFormatAttr( RES_PROTECT );
+                    aFormatsMap.insert(std::make_pair(pBoxFormat, pNewBoxFormat));
                 }
                 bChgd = true;
             }
@@ -4507,21 +4507,21 @@ bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
     return bChgd;
 }
 
-bool SwDoc::UnProtectTbls( const SwPaM& rPam )
+bool SwDoc::UnProtectTables( const SwPaM& rPam )
 {
     GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
     bool bChgd = false, bHasSel = rPam.HasMark() ||
                                     rPam.GetNext() != &rPam;
-    SwFrmFmts& rFmts = *GetTblFrmFmts();
-    SwTable* pTbl;
-    const SwTableNode* pTblNd;
-    for( auto n = rFmts.size(); n ; )
-        if( 0 != (pTbl = SwTable::FindTable( rFmts[ --n ] )) &&
-            0 != (pTblNd = pTbl->GetTableNode() ) &&
-            pTblNd->GetNodes().IsDocNodes() )
+    SwFrameFormats& rFormats = *GetTableFrameFormats();
+    SwTable* pTable;
+    const SwTableNode* pTableNd;
+    for( auto n = rFormats.size(); n ; )
+        if( 0 != (pTable = SwTable::FindTable( rFormats[ --n ] )) &&
+            0 != (pTableNd = pTable->GetTableNode() ) &&
+            pTableNd->GetNodes().IsDocNodes() )
         {
-            sal_uLong nTblIdx = pTblNd->GetIndex();
+            sal_uLong nTableIdx = pTableNd->GetIndex();
 
             // Check whether the Table is within the Selection
             if( bHasSel )
@@ -4531,8 +4531,8 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
                 do {
                     const SwPosition *pStt = pTmp->Start(),
                                     *pEnd = pTmp->End();
-                    bFound = pStt->nNode.GetIndex() < nTblIdx &&
-                            nTblIdx < pEnd->nNode.GetIndex();
+                    bFound = pStt->nNode.GetIndex() < nTableIdx &&
+                            nTableIdx < pEnd->nNode.GetIndex();
 
                 } while( !bFound && &rPam != ( pTmp = static_cast<SwPaM*>(pTmp->GetNext()) ) );
                 if( !bFound )
@@ -4540,7 +4540,7 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
             }
 
             // Lift the protection
-            bChgd |= _UnProtectTblCells( *pTbl );
+            bChgd |= _UnProtectTableCells( *pTable );
         }
 
     GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
@@ -4550,40 +4550,40 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
     return bChgd;
 }
 
-bool SwDoc::HasTblAnyProtection( const SwPosition* pPos,
-                                 const OUString* pTblName,
-                                 bool* pFullTblProtection )
+bool SwDoc::HasTableAnyProtection( const SwPosition* pPos,
+                                 const OUString* pTableName,
+                                 bool* pFullTableProtection )
 {
     bool bHasProtection = false;
-    SwTable* pTbl = 0;
-    if( pTblName )
-        pTbl = SwTable::FindTable( FindTblFmtByName( *pTblName ) );
+    SwTable* pTable = 0;
+    if( pTableName )
+        pTable = SwTable::FindTable( FindTableFormatByName( *pTableName ) );
     else if( pPos )
     {
-        SwTableNode* pTblNd = pPos->nNode.GetNode().FindTableNode();
-        if( pTblNd )
-            pTbl = &pTblNd->GetTable();
+        SwTableNode* pTableNd = pPos->nNode.GetNode().FindTableNode();
+        if( pTableNd )
+            pTable = &pTableNd->GetTable();
     }
 
-    if( pTbl )
+    if( pTable )
     {
-        SwTableSortBoxes& rSrtBox = pTbl->GetTabSortBoxes();
+        SwTableSortBoxes& rSrtBox = pTable->GetTabSortBoxes();
         for (size_t i = rSrtBox.size(); i; )
         {
-            SwFrmFmt *pBoxFmt = rSrtBox[ --i ]->GetFrmFmt();
-            if( pBoxFmt->GetProtect().IsCntntProtected() )
+            SwFrameFormat *pBoxFormat = rSrtBox[ --i ]->GetFrameFormat();
+            if( pBoxFormat->GetProtect().IsContentProtected() )
             {
                 if( !bHasProtection )
                 {
                     bHasProtection = true;
-                    if( !pFullTblProtection )
+                    if( !pFullTableProtection )
                         break;
-                    *pFullTblProtection = true;
+                    *pFullTableProtection = true;
                 }
             }
-            else if( bHasProtection && pFullTblProtection )
+            else if( bHasProtection && pFullTableProtection )
             {
-                *pFullTblProtection = false;
+                *pFullTableProtection = false;
                 break;
             }
         }
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 341132376990..e405c5f2a2fa 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -60,25 +60,25 @@ using namespace ::com::sun::star;
 
 inline bool IsSame( long nA, long nB ) { return  std::abs(nA-nB) <= COLFUZZY; }
 
-class SwTblFmtCmp
+class SwTableFormatCmp
 {
 public:
-    SwFrmFmt *pOld,
+    SwFrameFormat *pOld,
              *pNew;
     sal_Int16     nType;
 
-    SwTblFmtCmp( SwFrmFmt *pOld, SwFrmFmt *pNew, sal_Int16 nType );
+    SwTableFormatCmp( SwFrameFormat *pOld, SwFrameFormat *pNew, sal_Int16 nType );
 
-    static SwFrmFmt *FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt*pOld, sal_Int16 nType );
-    static void Delete( std::vector<SwTblFmtCmp*> &rArr );
+    static SwFrameFormat *FindNewFormat( std::vector<SwTableFormatCmp*> &rArr, SwFrameFormat*pOld, sal_Int16 nType );
+    static void Delete( std::vector<SwTableFormatCmp*> &rArr );
 };
 
-SwTblFmtCmp::SwTblFmtCmp( SwFrmFmt *pO, SwFrmFmt *pN, sal_Int16 nT )
+SwTableFormatCmp::SwTableFormatCmp( SwFrameFormat *pO, SwFrameFormat *pN, sal_Int16 nT )
     : pOld ( pO ), pNew ( pN ), nType( nT )
 {
 }
 
-SwFrmFmt *SwTblFmtCmp::FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt *pOld, sal_Int16 nType )
+SwFrameFormat *SwTableFormatCmp::FindNewFormat( std::vector<SwTableFormatCmp*> &rArr, SwFrameFormat *pOld, sal_Int16 nType )
 {
     for ( auto pCmp : rArr )
     {
@@ -88,7 +88,7 @@ SwFrmFmt *SwTblFmtCmp::FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt *pO
     return 0;
 }
 
-void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr )
+void SwTableFormatCmp::Delete( std::vector<SwTableFormatCmp*> &rArr )
 {
     for ( auto pCmp : rArr )
         delete pCmp;
@@ -97,7 +97,7 @@ void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr )
 static void lcl_GetStartEndCell( const SwCursor& rCrsr,
                         SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd )
 {
-    OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( false ),
+    OSL_ENSURE( rCrsr.GetContentNode() && rCrsr.GetContentNode( false ),
             "Tab selection not at ContentNode" );
 
     Point aPtPos, aMkPos;
@@ -109,8 +109,8 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr,
     }
 
     // Robust:
-    SwCntntNode* pPointNd = rCrsr.GetCntntNode();
-    SwCntntNode* pMarkNd  = rCrsr.GetCntntNode(false);
+    SwContentNode* pPointNd = rCrsr.GetContentNode();
+    SwContentNode* pMarkNd  = rCrsr.GetContentNode(false);
 
     SwFrm* pPointFrm = pPointNd ? pPointNd->getLayoutFrm( pPointNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPtPos ) : 0;
     SwFrm* pMarkFrm  = pMarkNd  ? pMarkNd->getLayoutFrm( pMarkNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aMkPos )  : 0;
@@ -122,10 +122,10 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr,
 static bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
                     bool bAllCrsr = false )
 {
-    const SwTableCursor* pTblCrsr =
+    const SwTableCursor* pTableCrsr =
         dynamic_cast<const SwTableCursor*>(&rCursor);
-    if( pTblCrsr )
-        ::GetTblSelCrs( *pTblCrsr, rBoxes );
+    if( pTableCrsr )
+        ::GetTableSelCrs( *pTableCrsr, rBoxes );
     else
     {
         const SwPaM *pCurPam = &rCursor, *pSttPam = pCurPam;
@@ -134,7 +134,7 @@ static bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
             if( pNd )
             {
                 SwTableBox* pBox = const_cast<SwTableBox*>(pNd->FindTableNode()->GetTable().
-                                            GetTblBox( pNd->GetIndex() ));
+                                            GetTableBox( pNd->GetIndex() ));
                 rBoxes.insert( pBox );
             }
         } while( bAllCrsr &&
@@ -168,8 +168,8 @@ struct LinesAndTable
     const SwTable             &m_rTable;
     bool                      m_bInsertLines;
 
-    LinesAndTable(std::vector<SwTableLine*> &rL, const SwTable &rTbl) :
-          m_rLines(rL), m_rTable(rTbl), m_bInsertLines(true) {}
+    LinesAndTable(std::vector<SwTableLine*> &rL, const SwTable &rTable) :
+          m_rLines(rL), m_rTable(rTable), m_bInsertLines(true) {}
 };
 
 bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
@@ -253,46 +253,46 @@ static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& r
     }
 }
 
-static void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
+static void lcl_ProcessRowAttr( std::vector<SwTableFormatCmp*>& rFormatCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
 {
-    SwFrmFmt *pNewFmt;
-    if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( rFmtCmp, pLine->GetFrmFmt(), 0 )))
-        pLine->ChgFrmFmt( static_cast<SwTableLineFmt*>(pNewFmt) );
+    SwFrameFormat *pNewFormat;
+    if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( rFormatCmp, pLine->GetFrameFormat(), 0 )))
+        pLine->ChgFrameFormat( static_cast<SwTableLineFormat*>(pNewFormat) );
     else
     {
-        SwFrmFmt *pOld = pLine->GetFrmFmt();
-        SwFrmFmt *pNew = pLine->ClaimFrmFmt();
-        pNew->SetFmtAttr( rNew );
-        rFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, 0 ) );
+        SwFrameFormat *pOld = pLine->GetFrameFormat();
+        SwFrameFormat *pNew = pLine->ClaimFrameFormat();
+        pNew->SetFormatAttr( rNew );
+        rFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, 0 ) );
     }
 }
 
-static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew );
+static void lcl_ProcessBoxSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableBox *pBox, const SwFormatFrmSize &rNew );
 
-static void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine, const SwFmtFrmSize &rNew )
+static void lcl_ProcessRowSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableLine *pLine, const SwFormatFrmSize &rNew )
 {
-    lcl_ProcessRowAttr( rFmtCmp, pLine, rNew );
+    lcl_ProcessRowAttr( rFormatCmp, pLine, rNew );
     SwTableBoxes &rBoxes = pLine->GetTabBoxes();
     for ( auto pBox : rBoxes )
-        ::lcl_ProcessBoxSize( rFmtCmp, pBox, rNew );
+        ::lcl_ProcessBoxSize( rFormatCmp, pBox, rNew );
 }
 
-static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew )
+static void lcl_ProcessBoxSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableBox *pBox, const SwFormatFrmSize &rNew )
 {
     SwTableLines &rLines = pBox->GetTabLines();
     if ( !rLines.empty() )
     {
-        SwFmtFrmSize aSz( rNew );
+        SwFormatFrmSize aSz( rNew );
         aSz.SetHeight( rNew.GetHeight() ? rNew.GetHeight() / rLines.size() : 0 );
         for ( auto pLine : rLines )
-            ::lcl_ProcessRowSize( rFmtCmp, pLine, aSz );
+            ::lcl_ProcessRowSize( rFormatCmp, pLine, aSz );
     }
 }
 
-void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew )
+void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, false );
@@ -301,40 +301,40 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
 
             for( auto pLn : aRowArr )
-                ::lcl_ProcessRowAttr( aFmtCmp, pLn, rNew );
+                ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew );
 
-            SwTblFmtCmp::Delete( aFmtCmp );
+            SwTableFormatCmp::Delete( aFormatCmp );
             getIDocumentState().SetModified();
         }
     }
 }
 
-void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
+void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz )
 {
     rpSz = 0;
 
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, false );
 
         if( !aRowArr.empty() )
         {
-            rpSz = &(SwFmtRowSplit&)aRowArr[0]->GetFrmFmt()->GetRowSplit();
+            rpSz = &(SwFormatRowSplit&)aRowArr[0]->GetFrameFormat()->GetRowSplit();
 
             if (rpSz)
             {
                 for ( auto pLn : aRowArr )
                 {
-                    if ( (*rpSz).GetValue() != pLn->GetFrmFmt()->GetRowSplit().GetValue() )
+                    if ( (*rpSz).GetValue() != pLn->GetFrameFormat()->GetRowSplit().GetValue() )
                     {
                         rpSz = 0;
                         break;
@@ -342,7 +342,7 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
                 }
             }
             if ( rpSz )
-                rpSz = new SwFmtRowSplit( *rpSz );
+                rpSz = new SwFormatRowSplit( *rpSz );
         }
     }
 }
@@ -358,14 +358,14 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
  * a respective value that is calculated from the relation of the old and
  * new size of the topmost Line in the lower line's own size.
  *
- * All changed Lines may get an own FrmFmt.
+ * All changed Lines may get an own FrameFormat.
  * Of course we can only touch every Line once.
  */
 
-void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
+void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -374,39 +374,39 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
             for ( auto pLn : aRowArr )
-                ::lcl_ProcessRowSize( aFmtCmp, pLn, rNew );
-            SwTblFmtCmp::Delete( aFmtCmp );
+                ::lcl_ProcessRowSize( aFormatCmp, pLn, rNew );
+            SwTableFormatCmp::Delete( aFormatCmp );
 
             getIDocumentState().SetModified();
         }
     }
 }
 
-void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
+void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz )
 {
     rpSz = 0;
 
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
 
         if( !aRowArr.empty() )
         {
-            rpSz = &(SwFmtFrmSize&)aRowArr[0]->GetFrmFmt()->GetFrmSize();
+            rpSz = &(SwFormatFrmSize&)aRowArr[0]->GetFrameFormat()->GetFrmSize();
 
             if (rpSz)
             {
                 for ( auto pLn : aRowArr )
                 {
-                    if ( *rpSz != pLn->GetFrmFmt()->GetFrmSize() )
+                    if ( *rpSz != pLn->GetFrameFormat()->GetFrmSize() )
                     {
                         rpSz = 0;
                         break;
@@ -414,7 +414,7 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
                 }
             }
             if ( rpSz )
-                rpSz = new SwFmtFrmSize( *rpSz );
+                rpSz = new SwFormatFrmSize( *rpSz );
         }
     }
 }
@@ -422,8 +422,8 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
 bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -436,7 +436,7 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 
                 for ( auto pLn : aRowArr )
                 {
-                    SwIterator<SwFrm,SwFmt> aIter( *pLn->GetFrmFmt() );
+                    SwIterator<SwFrm,SwFormat> aIter( *pLn->GetFrameFormat() );
                     SwFrm* pFrm = aIter.First();
                     while ( pFrm )
                     {
@@ -444,19 +444,19 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
                         pFrm = aIter.Next();
                     }
                 }
-                SwFmtFrmSize aNew( ATT_MIN_SIZE, 0, nHeight );
+                SwFormatFrmSize aNew( ATT_MIN_SIZE, 0, nHeight );
 
                 if (GetIDocumentUndoRedo().DoesUndo())
                 {
                     GetIDocumentUndoRedo().AppendUndo(
-                            new SwUndoAttrTbl(*pTblNd));
+                            new SwUndoAttrTable(*pTableNd));
                 }
 
-                std::vector<SwTblFmtCmp*> aFmtCmp;
-                aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+                std::vector<SwTableFormatCmp*> aFormatCmp;
+                aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
                 for( auto pLn : aRowArr )
-                    ::lcl_ProcessRowSize( aFmtCmp, pLn, aNew );
-                SwTblFmtCmp::Delete( aFmtCmp );
+                    ::lcl_ProcessRowSize( aFormatCmp, pLn, aNew );
+                SwTableFormatCmp::Delete( aFormatCmp );
 
                 getIDocumentState().SetModified();
             }
@@ -468,8 +468,8 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 
 void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -478,16 +478,16 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
 
             for( auto pLn : aRowArr )
-                ::lcl_ProcessRowAttr( aFmtCmp, pLn, rNew );
+                ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew );
 
-            SwTblFmtCmp::Delete( aFmtCmp );
+            SwTableFormatCmp::Delete( aFormatCmp );
             getIDocumentState().SetModified();
         }
     }
@@ -496,19 +496,19 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
 bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
 
         if( !aRowArr.empty() )
         {
-            rToFill = aRowArr[0]->GetFrmFmt()->makeBackgroundBrushItem();
+            rToFill = aRowArr[0]->GetFrameFormat()->makeBackgroundBrushItem();
 
             bRet = true;
             for ( std::vector<SwTableLine*>::size_type i = 1; i < aRowArr.size(); ++i )
-                if ( rToFill != aRowArr[i]->GetFrmFmt()->makeBackgroundBrushItem() )
+                if ( rToFill != aRowArr[i]->GetFrameFormat()->makeBackgroundBrushItem() )
                 {
                     bRet = false;
                     break;
@@ -549,9 +549,9 @@ static void lcl_CollectCells( std::vector<SwCellFrm*> &rArr, const SwRect &rUnio
 
 void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -562,14 +562,14 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
 
     if( !aUnions.empty() )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTable(*pTableNd) );
         }
 
-        std::vector<SwTblFmtCmp*> aFmtCmp;
-        aFmtCmp.reserve( 255 );
+        std::vector<SwTableFormatCmp*> aFormatCmp;
+        aFormatCmp.reserve( 255 );
         const SvxBoxItem* pSetBox;
         const SvxBoxInfoItem *pSetBoxInfo;
 
@@ -669,7 +669,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
                        pCell->IsInFollowFlowRow() ) )
                     continue;
 
-                SvxBoxItem aBox( pCell->GetFmt()->GetBox() );
+                SvxBoxItem aBox( pCell->GetFormat()->GetBox() );
 
                 sal_Int16 nType = 0;
 
@@ -781,15 +781,15 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
                 }
 
                 SwTableBox *pBox = const_cast<SwTableBox*>(pCell->GetTabBox());
-                SwFrmFmt *pNewFmt;
-                if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( aFmtCmp, pBox->GetFrmFmt(), nType )))
-                    pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) );
+                SwFrameFormat *pNewFormat;
+                if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( aFormatCmp, pBox->GetFrameFormat(), nType )))
+                    pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pNewFormat) );
                 else
                 {
-                    SwFrmFmt *pOld = pBox->GetFrmFmt();
-                    SwFrmFmt *pNew = pBox->ClaimFrmFmt();
-                    pNew->SetFmtAttr( aBox );
-                    aFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, nType ) );
+                    SwFrameFormat *pOld = pBox->GetFrameFormat();
+                    SwFrameFormat *pNew = pBox->ClaimFrameFormat();
+                    pNew->SetFormatAttr( aBox );
+                    aFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, nType ) );
                 }
             }
 
@@ -799,13 +799,13 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
                 pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
-        SwTblFmtCmp::Delete( aFmtCmp );
+        SwTableFormatCmp::Delete( aFormatCmp );
         ::ClearFEShellTabCols();
         getIDocumentState().SetModified();
     }
@@ -833,9 +833,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                              const Color* pColor, bool bSetLine,
                              const SvxBorderLine* pBorderLine )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -846,10 +846,10 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
 
     if( !aUnions.empty() )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+            GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
         }
 
         for( auto &rU : aUnions )
@@ -866,9 +866,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                 if ( pTab->IsFollow() && pTab->IsInHeadline( *pCell ) )
                     continue;
 
-                const_cast<SwTableBox*>(pCell->GetTabBox())->ClaimFrmFmt();
-                SwFrmFmt *pFmt = pCell->GetFmt();
-                SvxBoxItem aBox( pFmt->GetBox() );
+                const_cast<SwTableBox*>(pCell->GetTabBox())->ClaimFrameFormat();
+                SwFrameFormat *pFormat = pCell->GetFormat();
+                SvxBoxItem aBox( pFormat->GetBox() );
 
                 if ( !pBorderLine && bSetLine )
                     aBox = *static_cast<const SvxBoxItem*>(::GetDfltAttr( RES_BOX ));
@@ -887,14 +887,14 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                         ::lcl_SetLineStyle( const_cast<SvxBorderLine*>(aBox.GetRight()),
                                         pColor, pBorderLine );
                 }
-                pFmt->SetFmtAttr( aBox );
+                pFormat->SetFormatAttr( aBox );
             }
         }
 
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
@@ -907,9 +907,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
 
 void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -973,8 +973,8 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                     bLeftOver = bTmp;
                 }
 
-                const SwFrmFmt  *pFmt  = pCell->GetFmt();
-                const SvxBoxItem  &rBox  = pFmt->GetBox();
+                const SwFrameFormat  *pFormat  = pCell->GetFormat();
+                const SvxBoxItem  &rBox  = pFormat->GetBox();
 
                 // Top Border
                 if ( bFirst && bTopOver )
@@ -1128,44 +1128,44 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
 
 void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes, true ) )
+    if( pTableNd && ::lcl_GetBoxSel( rCursor, aBoxes, true ) )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTable(*pTableNd) );
         }
 
-        std::vector<SwTblFmtCmp*> aFmtCmp;
-        aFmtCmp.reserve(std::max<size_t>(255, aBoxes.size()));
+        std::vector<SwTableFormatCmp*> aFormatCmp;
+        aFormatCmp.reserve(std::max<size_t>(255, aBoxes.size()));
         for (size_t i = 0; i < aBoxes.size(); ++i)
         {
             SwTableBox *pBox = aBoxes[i];
 
-            SwFrmFmt *pNewFmt;
-            if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( aFmtCmp, pBox->GetFrmFmt(), 0 )))
-                pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) );
+            SwFrameFormat *pNewFormat;
+            if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( aFormatCmp, pBox->GetFrameFormat(), 0 )))
+                pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pNewFormat) );
             else
             {
-                SwFrmFmt *pOld = pBox->GetFrmFmt();
-                SwFrmFmt *pNew = pBox->ClaimFrmFmt();
-                pNew->SetFmtAttr( rNew );
-                aFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, 0 ) );
+                SwFrameFormat *pOld = pBox->GetFrameFormat();
+                SwFrameFormat *pNew = pBox->ClaimFrameFormat();
+                pNew->SetFormatAttr( rNew );
+                aFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, 0 ) );
             }
         }
 
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->Resize(
                 pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
-        SwTblFmtCmp::Delete( aFmtCmp );
+        SwTableFormatCmp::Delete( aFormatCmp );
         getIDocumentState().SetModified();
     }
 }
@@ -1173,9 +1173,9 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
 bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && lcl_GetBoxSel( rCursor, aBoxes ))
+    if( pTableNd && lcl_GetBoxSel( rCursor, aBoxes ))
     {
         bRet = true;
         bool bOneFound = false;
@@ -1187,7 +1187,7 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
                 case RES_BACKGROUND:
                 {
                     SvxBrushItem aBack =
-                        aBoxes[i]->GetFrmFmt()->makeBackgroundBrushItem();
+                        aBoxes[i]->GetFrameFormat()->makeBackgroundBrushItem();
                     if( !bOneFound )
                     {
                         static_cast<SvxBrushItem&>(rToFill) = aBack;
@@ -1201,7 +1201,7 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
                 case RES_FRAMEDIR:
                 {
                     const SvxFrameDirectionItem& rDir =
-                                    aBoxes[i]->GetFrmFmt()->GetFrmDir();
+                                    aBoxes[i]->GetFrameFormat()->GetFrmDir();
                     if( !bOneFound )
                     {
                         static_cast<SvxFrameDirectionItem&>(rToFill) = rDir;
@@ -1224,21 +1224,21 @@ void SwDoc::SetBoxAlign( const SwCursor& rCursor, sal_uInt16 nAlign )
     OSL_ENSURE( nAlign == text::VertOrientation::NONE   ||
             nAlign == text::VertOrientation::CENTER ||
             nAlign == text::VertOrientation::BOTTOM, "Wrong alignment" );
-    SwFmtVertOrient aVertOri( 0, nAlign );
+    SwFormatVertOrient aVertOri( 0, nAlign );
     SetBoxAttr( rCursor, aVertOri );
 }
 
 sal_uInt16 SwDoc::GetBoxAlign( const SwCursor& rCursor )
 {
     sal_uInt16 nAlign = USHRT_MAX;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes ))
+    if( pTableNd && ::lcl_GetBoxSel( rCursor, aBoxes ))
     {
         for (size_t i = 0; i < aBoxes.size(); ++i)
         {
-            const SwFmtVertOrient &rOri =
-                            aBoxes[i]->GetFrmFmt()->GetVertOrient();
+            const SwFormatVertOrient &rOri =
+                            aBoxes[i]->GetFrameFormat()->GetVertOrient();
             if( USHRT_MAX == nAlign )
                 nAlign = static_cast<sal_uInt16>(rOri.GetVertOrient());
             else if( rOri.GetVertOrient() != nAlign )
@@ -1261,9 +1261,9 @@ static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
         const SwTwips nAdd = (pFrm->Frm().*fnRect->fnGetWidth)() -
                              (pFrm->Prt().*fnRect->fnGetWidth)();
 
-        // pFrm does not necessarily have to be a SwTxtFrm!
-        const SwTwips nCalcFitToContent = pFrm->IsTxtFrm() ?
-                                          const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->CalcFitToContent() :
+        // pFrm does not necessarily have to be a SwTextFrm!
+        const SwTwips nCalcFitToContent = pFrm->IsTextFrm() ?
+                                          const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->CalcFitToContent() :
                                           (pFrm->Prt().*fnRect->fnGetWidth)();
 
         nRet = std::max( nRet, nCalcFitToContent + nAdd );
@@ -1359,7 +1359,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
 {
     SwSelUnions aUnions;
     ::MakeSelUnions( aUnions, pStart, pEnd,
-                    bWishValues ? nsSwTblSearchType::TBLSEARCH_NONE : nsSwTblSearchType::TBLSEARCH_COL );
+                    bWishValues ? nsSwTableSearchType::TBLSEARCH_NONE : nsSwTableSearchType::TBLSEARCH_COL );
 
     for ( auto &rU : aUnions )
     {
@@ -1375,7 +1375,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
             continue;
         do
         {
-            if ( pCell->IsCellFrm() && pCell->FindTabFrm() == pTab && ::IsFrmInTblSel( rUnion, pCell ) )
+            if ( pCell->IsCellFrm() && pCell->FindTabFrm() == pTab && ::IsFrmInTableSel( rUnion, pCell ) )
             {
                 const long nCLeft  = (pCell->Frm().*fnRect->fnGetLeft)();
                 const long nCRight = (pCell->Frm().*fnRect->fnGetRight)();
@@ -1441,9 +1441,9 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
 void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
 {
     // Check whether the current Crsr has it's Point/Mark in a Table
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -1471,7 +1471,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
     // It's more robust if we calculate the minimum values for the whole Table
     const SwTabFrm *pTab = pStart->ImplFindTabFrm();
     pStart = (SwLayoutFrm*)pTab->FirstCell();
-    pEnd   = const_cast<SwLayoutFrm*>(pTab->FindLastCntnt()->GetUpper());
+    pEnd   = const_cast<SwLayoutFrm*>(pTab->FindLastContent()->GetUpper());
     while( !pEnd->IsCellFrm() )
         pEnd = pEnd->GetUpper();
     ::lcl_CalcColValues( aMins, aTabCols, pStart, pEnd, false );
@@ -1553,19 +1553,19 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
 
     const long nNewRight = aTabCols.GetRight();
 
-    SwFrmFmt *pFmt = pTblNd->GetTable().GetFrmFmt();
-    const sal_Int16 nOriHori = pFmt->GetHoriOrient().GetHoriOrient();
+    SwFrameFormat *pFormat = pTableNd->GetTable().GetFrameFormat();
+    const sal_Int16 nOriHori = pFormat->GetHoriOrient().GetHoriOrient();
 
     // We can leave the "real" work to the SwTable now
     SetTabCols( aTabCols, false, 0, static_cast<SwCellFrm*>(pBoxFrm) );
 
     // Alignment might have been changed in SetTabCols; restore old value
-    const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
-    SwFmtHoriOrient aHori( rHori );
+    const SwFormatHoriOrient &rHori = pFormat->GetHoriOrient();
+    SwFormatHoriOrient aHori( rHori );
     if ( aHori.GetHoriOrient() != nOriHori )
     {
         aHori.SetHoriOrient( nOriHori );
-        pFmt->SetFmtAttr( aHori );
+        pFormat->SetFormatAttr( aHori );
     }
 
     // We switch to left-adjusted for automatic width
@@ -1575,7 +1575,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
         if( aHori.GetHoriOrient() == text::HoriOrientation::FULL )
         {
             aHori.SetHoriOrient( text::HoriOrientation::LEFT );
-            pFmt->SetFmtAttr( aHori );
+            pFormat->SetFormatAttr( aHori );
         }
     }
 
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 0f01281fb979..6cacd008e309 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -69,7 +69,7 @@
 
 using namespace ::com::sun::star::i18n;
 
-TYPEINIT2( SwCntntNode, SwModify, SwIndexReg )
+TYPEINIT2( SwContentNode, SwModify, SwIndexReg )
 
 /*
  * Some local helper functions for the attribute set handle of a content node.
@@ -82,14 +82,14 @@ namespace AttrSetHandleHelper
 {
 
 void GetNewAutoStyle( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                      const SwCntntNode& rNode,
+                      const SwContentNode& rNode,
                       SwAttrSet& rNewAttrSet )
 {
     const SwAttrSet* pAttrSet = static_cast<const SwAttrSet*>(rpAttrSet.get());
     if( rNode.GetModifyAtAttr() )
         const_cast<SwAttrSet*>(pAttrSet)->SetModifyAtAttr( 0 );
     IStyleAccess& rSA = pAttrSet->GetPool()->GetDoc()->GetIStyleAccess();
-    rpAttrSet = rSA.getAutomaticStyle( rNewAttrSet, rNode.IsTxtNode() ?
+    rpAttrSet = rSA.getAutomaticStyle( rNewAttrSet, rNode.IsTextNode() ?
                                                      IStyleAccess::AUTO_STYLE_PARA :
                                                      IStyleAccess::AUTO_STYLE_NOTXT );
     const bool bSetModifyAtAttr = const_cast<SwAttrSet*>(static_cast<const SwAttrSet*>(rpAttrSet.get()))->SetModifyAtAttr( &rNode );
@@ -97,15 +97,15 @@ void GetNewAutoStyle( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                const SwCntntNode& rNode,
-                const SwFmt* pParentFmt,
-                const SwFmt* pConditionalFmt )
+                const SwContentNode& rNode,
+                const SwFormat* pParentFormat,
+                const SwFormat* pConditionalFormat )
 {
     const SwAttrSet* pAttrSet = static_cast<const SwAttrSet*>(rpAttrSet.get());
     OSL_ENSURE( pAttrSet, "no SwAttrSet" );
-    OSL_ENSURE( pParentFmt || !pConditionalFmt, "ConditionalFmt without ParentFmt?" );
+    OSL_ENSURE( pParentFormat || !pConditionalFormat, "ConditionalFormat without ParentFormat?" );
 
-    const SwAttrSet* pParentSet = pParentFmt ? &pParentFmt->GetAttrSet() : 0;
+    const SwAttrSet* pParentSet = pParentFormat ? &pParentFormat->GetAttrSet() : 0;
 
     if ( pParentSet != pAttrSet->GetParent() )
     {
@@ -115,17 +115,17 @@ void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
         aNewSet.ClearItem( RES_FRMATR_CONDITIONAL_STYLE_NAME );
         OUString sVal;
 
-        if ( pParentFmt )
+        if ( pParentFormat )
         {
-            SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-            const SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal );
-            aNewSet.Put( aAnyFmtColl );
+            SwStyleNameMapper::FillProgName( pParentFormat->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+            const SfxStringItem aAnyFormatColl( RES_FRMATR_STYLE_NAME, sVal );
+            aNewSet.Put( aAnyFormatColl );
 
-            if ( pConditionalFmt != pParentFmt )
-                SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+            if ( pConditionalFormat != pParentFormat )
+                SwStyleNameMapper::FillProgName( pConditionalFormat->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
 
-            const SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
-            aNewSet.Put( aFmtColl );
+            const SfxStringItem aFormatColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
+            aNewSet.Put( aFormatColl );
         }
 
         GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
@@ -133,7 +133,7 @@ void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 const SfxPoolItem* Put( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                        const SwCntntNode& rNode,
+                        const SwContentNode& rNode,
                         const SfxPoolItem& rAttr )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -143,7 +143,7 @@ const SfxPoolItem* Put( std::shared_ptr<const SfxItemSet>& rpAttrSet,
     return pRet;
 }
 
-bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode& rNode,
+bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNode,
          const SfxItemSet& rSet )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -172,7 +172,7 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode& rNode
 }
 
 bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-            const SwCntntNode& rNode, const SfxPoolItem& rAttr,
+            const SwContentNode& rNode, const SfxPoolItem& rAttr,
             SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -191,7 +191,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-            const SwCntntNode& rNode, const SfxItemSet& rSet,
+            const SwContentNode& rNode, const SfxItemSet& rSet,
             SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -225,7 +225,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                     const SwCntntNode& rNode, sal_uInt16 nWhich,
+                     const SwContentNode& rNode, sal_uInt16 nWhich,
                      SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -238,7 +238,7 @@ sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                     const SwCntntNode& rNode,
+                     const SwContentNode& rNode,
                      sal_uInt16 nWhich1, sal_uInt16 nWhich2,
                      SwAttrSet* pOld, SwAttrSet* pNew )
 {
@@ -256,7 +256,7 @@ sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 /** Returns the section level at the position given by aIndex.
  *
  * We use the following logic:
- * S = Start, E = End, C = CntntNode
+ * S = Start, E = End, C = ContentNode
  * Level   0 = E
  *         1 = S E
  *         2 = SC
@@ -283,7 +283,7 @@ long SwNode::s_nSerial = 0;
 
 SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
     : nNodeType( nNdType )
-    , nAFmtNumLvl( 0 )
+    , nAFormatNumLvl( 0 )
     , bSetNumLSpace( false )
     , bIgnoreDontExpand( false)
 #ifdef DBG_UTIL
@@ -316,7 +316,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
  */
 SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType )
     : nNodeType( nNdType )
-    , nAFmtNumLvl( 0 )
+    , nAFormatNumLvl( 0 )
     , bSetNumLSpace( false )
     , bIgnoreDontExpand( false)
 #ifdef DBG_UTIL
@@ -361,7 +361,7 @@ SwTableNode* SwNode::FindTableNode()
 bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const
 {
     bool bRet = false;
-    const SwCntntNode* pNd;
+    const SwContentNode* pNd;
 
     if( ND_STARTNODE & nNodeType )
     {
@@ -374,7 +374,7 @@ bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const
         pNd = SwNodes::GoPrevious( &aIdx );
     }
     else
-        pNd = GetCntntNode();
+        pNd = GetContentNode();
 
     if( !pSh )
         // Get the Shell from the Doc
@@ -421,32 +421,32 @@ bool SwNode::IsProtect() const
 
     if( 0 != ( pSttNd = FindTableBoxStartNode() ) )
     {
-        SwCntntFrm* pCFrm;
-        if( IsCntntNode() && 0 != (pCFrm = static_cast<const SwCntntNode*>(this)->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ))
+        SwContentFrm* pCFrm;
+        if( IsContentNode() && 0 != (pCFrm = static_cast<const SwContentNode*>(this)->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ))
             return pCFrm->IsProtected();
 
         const SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().
-                                        GetTblBox( pSttNd->GetIndex() );
+                                        GetTableBox( pSttNd->GetIndex() );
         //Robust #149568
-        if( pBox && pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+        if( pBox && pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
             return true;
     }
 
-    SwFrmFmt* pFlyFmt = GetFlyFmt();
-    if( pFlyFmt )
+    SwFrameFormat* pFlyFormat = GetFlyFormat();
+    if( pFlyFormat )
     {
-        if( pFlyFmt->GetProtect().IsCntntProtected() )
+        if( pFlyFormat->GetProtect().IsContentProtected() )
             return true;
-        const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
-        return rAnchor.GetCntntAnchor() && rAnchor.GetCntntAnchor()->nNode.GetNode().IsProtect();
+        const SwFormatAnchor& rAnchor = pFlyFormat->GetAnchor();
+        return rAnchor.GetContentAnchor() && rAnchor.GetContentAnchor()->nNode.GetNode().IsProtect();
     }
 
     if( 0 != ( pSttNd = FindFootnoteStartNode() ) )
     {
-        const SwTxtFtn* pTFtn = GetDoc()->GetFtnIdxs().SeekEntry(
+        const SwTextFootnote* pTFootnote = GetDoc()->GetFootnoteIdxs().SeekEntry(
                                 SwNodeIndex( *pSttNd ) );
-        if( pTFtn )
-            return pTFtn->GetTxtNode().IsProtect();
+        if( pTFootnote )
+            return pTFootnote->GetTextNode().IsProtect();
     }
 
     return false;
@@ -464,7 +464,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
 
     const SwPageDesc* pPgDesc = 0;
 
-    const SwCntntNode* pNode;
+    const SwContentNode* pNode;
     if( ND_STARTNODE & nNodeType )
     {
         SwNodeIndex aIdx( *this );
@@ -477,9 +477,9 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
     }
     else
     {
-        pNode = GetCntntNode();
+        pNode = GetContentNode();
         if( pNode )
-            pPgDesc = static_cast<const SwFmtPageDesc&>(pNode->GetAttr( RES_PAGEDESC )).GetPageDesc();
+            pPgDesc = static_cast<const SwFormatPageDesc&>(pNode->GetAttr( RES_PAGEDESC )).GetPageDesc();
     }
 
     // Are we going through the layout?
@@ -508,60 +508,60 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
             0 != ( pSttNd = pNd->FindFlyStartNode() ) )
         {
             // Find the right Anchor first
-            const SwFrmFmt* pFmt = 0;
-            const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+            const SwFrameFormat* pFormat = 0;
+            const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
 
-            for( size_t n = 0; n < rFmts.size(); ++n )
+            for( size_t n = 0; n < rFormats.size(); ++n )
             {
-                const SwFrmFmt* pFrmFmt = rFmts[ n ];
-                const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() &&
-                    &rCntnt.GetCntntIdx()->GetNode() == (SwNode*)pSttNd )
+                const SwFrameFormat* pFrameFormat = rFormats[ n ];
+                const SwFormatContent& rContent = pFrameFormat->GetContent();
+                if( rContent.GetContentIdx() &&
+                    &rContent.GetContentIdx()->GetNode() == (SwNode*)pSttNd )
                 {
-                    pFmt = pFrmFmt;
+                    pFormat = pFrameFormat;
                     break;
                 }
             }
 
-            if( pFmt )
+            if( pFormat )
             {
-                const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
+                const SwFormatAnchor* pAnchor = &pFormat->GetAnchor();
                 if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                    pAnchor->GetCntntAnchor() )
+                    pAnchor->GetContentAnchor() )
                 {
-                    pNd = &pAnchor->GetCntntAnchor()->nNode.GetNode();
+                    pNd = &pAnchor->GetContentAnchor()->nNode.GetNode();
                     const SwNode* pFlyNd = pNd->FindFlyStartNode();
                     while( pFlyNd )
                     {
                         // Get up through the Anchor
                         size_t n;
-                        for( n = 0; n < rFmts.size(); ++n )
+                        for( n = 0; n < rFormats.size(); ++n )
                         {
-                            const SwFrmFmt* pFrmFmt = rFmts[ n ];
-                            const SwNodeIndex* pIdx = pFrmFmt->GetCntnt().
-                                                        GetCntntIdx();
+                            const SwFrameFormat* pFrameFormat = rFormats[ n ];
+                            const SwNodeIndex* pIdx = pFrameFormat->GetContent().
+                                                        GetContentIdx();
                             if( pIdx && pFlyNd == &pIdx->GetNode() )
                             {
-                                if( pFmt == pFrmFmt )
+                                if( pFormat == pFrameFormat )
                                 {
                                     pNd = pFlyNd;
                                     pFlyNd = 0;
                                     break;
                                 }
-                                pAnchor = &pFrmFmt->GetAnchor();
+                                pAnchor = &pFrameFormat->GetAnchor();
                                 if ((FLY_AT_PAGE == pAnchor->GetAnchorId()) ||
-                                    !pAnchor->GetCntntAnchor() )
+                                    !pAnchor->GetContentAnchor() )
                                 {
                                     pFlyNd = 0;
                                     break;
                                 }
 
-                                pFlyNd = pAnchor->GetCntntAnchor()->nNode.
+                                pFlyNd = pAnchor->GetContentAnchor()->nNode.
                                         GetNode().FindFlyStartNode();
                                 break;
                             }
                         }
-                        if( n >= rFmts.size() )
+                        if( n >= rFormats.size() )
                         {
                             OSL_ENSURE( false, "FlySection, but no Format found" );
                             return 0;
@@ -602,22 +602,22 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
                     for( size_t n = pDoc->GetPageDescCnt(); n && !pPgDesc; )
                     {
                         const SwPageDesc& rPgDsc = pDoc->GetPageDesc( --n );
-                        const SwFrmFmt* pFmt = &rPgDsc.GetMaster();
+                        const SwFrameFormat* pFormat = &rPgDsc.GetMaster();
                         int nStt = 0, nLast = 1;
                         if( !( eAskUse & rPgDsc.ReadUseOn() )) ++nLast;
 
-                        for( ; nStt < nLast; ++nStt, pFmt = &rPgDsc.GetLeft() )
+                        for( ; nStt < nLast; ++nStt, pFormat = &rPgDsc.GetLeft() )
                         {
-                            const SwFrmFmt * pHdFtFmt = nId == RES_HEADER
-                                ? static_cast<SwFmtHeader const &>(
-                                    pFmt->GetFmtAttr(nId)).GetHeaderFmt()
-                                : static_cast<SwFmtFooter const &>(
-                                    pFmt->GetFmtAttr(nId)).GetFooterFmt();
-                            if( pHdFtFmt )
+                            const SwFrameFormat * pHdFtFormat = nId == RES_HEADER
+                                ? static_cast<SwFormatHeader const &>(
+                                    pFormat->GetFormatAttr(nId)).GetHeaderFormat()
+                                : static_cast<SwFormatFooter const &>(
+                                    pFormat->GetFormatAttr(nId)).GetFooterFormat();
+                            if( pHdFtFormat )
                             {
-                                const SwFmtCntnt& rCntnt = pHdFtFmt->GetCntnt();
-                                if( rCntnt.GetCntntIdx() &&
-                                    &rCntnt.GetCntntIdx()->GetNode() ==
+                                const SwFormatContent& rContent = pHdFtFormat->GetContent();
+                                if( rContent.GetContentIdx() &&
+                                    &rContent.GetContentIdx()->GetNode() ==
                                     (SwNode*)pSttNd )
                                 {
                                     pPgDesc = &rPgDsc;
@@ -634,14 +634,14 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
                 else if( 0 != ( pSttNd = pNd->FindFootnoteStartNode() ))
                 {
                     // the Anchor can only be in the Body text
-                    const SwTxtFtn* pTxtFtn;
-                    const SwFtnIdxs& rFtnArr = pDoc->GetFtnIdxs();
-                    for( size_t n = 0; n < rFtnArr.size(); ++n )
-                        if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
+                    const SwTextFootnote* pTextFootnote;
+                    const SwFootnoteIdxs& rFootnoteArr = pDoc->GetFootnoteIdxs();
+                    for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+                        if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
                             (SwNode*)pSttNd ==
-                            &pTxtFtn->GetStartNode()->GetNode() )
+                            &pTextFootnote->GetStartNode()->GetNode() )
                         {
-                            pNd = &pTxtFtn->GetTxtNode();
+                            pNd = &pTextFootnote->GetTextNode();
                             break;
                         }
                 }
@@ -667,27 +667,27 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
             {
                 const SfxPoolItem* pItem;
                 if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_PAGEDESC, i ) ) &&
-                    static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn() )
+                    static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn() )
                 {
-                    const SwModify* pMod = static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn();
-                    if( pMod->ISA( SwCntntNode ) )
-                        aInfo.CheckNode( *static_cast<const SwCntntNode*>(pMod) );
-                    else if( pMod->ISA( SwFmt ))
-                        static_cast<const SwFmt*>(pMod)->GetInfo( aInfo );
+                    const SwModify* pMod = static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn();
+                    if( pMod->ISA( SwContentNode ) )
+                        aInfo.CheckNode( *static_cast<const SwContentNode*>(pMod) );
+                    else if( pMod->ISA( SwFormat ))
+                        static_cast<const SwFormat*>(pMod)->GetInfo( aInfo );
                 }
             }
 
             if( 0 != ( pNd = aInfo.GetFoundNode() ))
             {
-                if( pNd->IsCntntNode() )
-                    pPgDesc = static_cast<const SwFmtPageDesc&>(pNd->GetCntntNode()->
+                if( pNd->IsContentNode() )
+                    pPgDesc = static_cast<const SwFormatPageDesc&>(pNd->GetContentNode()->
                                 GetAttr( RES_PAGEDESC )).GetPageDesc();
                 else if( pNd->IsTableNode() )
                     pPgDesc = pNd->GetTableNode()->GetTable().
-                            GetFrmFmt()->GetPageDesc().GetPageDesc();
+                            GetFrameFormat()->GetPageDesc().GetPageDesc();
                 else if( pNd->IsSectionNode() )
                     pPgDesc = pNd->GetSectionNode()->GetSection().
-                            GetFmt()->GetPageDesc().GetPageDesc();
+                            GetFormat()->GetPageDesc().GetPageDesc();
                 if ( pPgDescNdIdx )
                 {
                     *pPgDescNdIdx = pNd->GetIndex();
@@ -701,33 +701,33 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
 }
 
 /// If the node is located in a Fly, we return it formatted accordingly
-SwFrmFmt* SwNode::GetFlyFmt() const
+SwFrameFormat* SwNode::GetFlyFormat() const
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
     const SwNode* pSttNd = FindFlyStartNode();
     if( pSttNd )
     {
-        if( IsCntntNode() )
+        if( IsContentNode() )
         {
-            SwCntntFrm* pFrm = SwIterator<SwCntntFrm,SwCntntNode>( *static_cast<const SwCntntNode*>(this) ).First();
+            SwContentFrm* pFrm = SwIterator<SwContentFrm,SwContentNode>( *static_cast<const SwContentNode*>(this) ).First();
             if( pFrm )
-                pRet = pFrm->FindFlyFrm()->GetFmt();
+                pRet = pFrm->FindFlyFrm()->GetFormat();
         }
         if( !pRet )
         {
             // The hard way through the Doc is our last way out
-            const SwFrmFmts& rFrmFmtTbl = *GetDoc()->GetSpzFrmFmts();
-            for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+            const SwFrameFormats& rFrameFormatTable = *GetDoc()->GetSpzFrameFormats();
+            for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
             {
-                SwFrmFmt* pFmt = rFrmFmtTbl[n];
+                SwFrameFormat* pFormat = rFrameFormatTable[n];
                 // Only Writer fly frames can contain Writer nodes.
-                if (pFmt->Which() != RES_FLYFRMFMT)
+                if (pFormat->Which() != RES_FLYFRMFMT)
                     continue;
-                const SwFmtCntnt& rCntnt = pFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() &&
-                    &rCntnt.GetCntntIdx()->GetNode() == pSttNd )
+                const SwFormatContent& rContent = pFormat->GetContent();
+                if( rContent.GetContentIdx() &&
+                    &rContent.GetContentIdx()->GetNode() == pSttNd )
                 {
-                    pRet = pFmt;
+                    pRet = pFormat;
                     break;
                 }
             }
@@ -736,12 +736,12 @@ SwFrmFmt* SwNode::GetFlyFmt() const
     return pRet;
 }
 
-SwTableBox* SwNode::GetTblBox() const
+SwTableBox* SwNode::GetTableBox() const
 {
     SwTableBox* pBox = 0;
     const SwNode* pSttNd = FindTableBoxStartNode();
     if( pSttNd )
-        pBox = const_cast<SwTableBox*>(pSttNd->FindTableNode()->GetTable().GetTblBox(
+        pBox = const_cast<SwTableBox*>(pSttNd->FindTableNode()->GetTable().GetTableBox(
                                                     pSttNd->GetIndex() ));
     return pBox;
 }
@@ -755,9 +755,9 @@ SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp )
     return eTyp == pTmp->GetStartNodeType() ? pTmp : 0;
 }
 
-const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
+const SwTextNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
 {
-    const SwTxtNode* pRet = 0;
+    const SwTextNode* pRet = 0;
     const SwOutlineNodes& rONds = GetNodes().GetOutLineNds();
     if( MAXLEVEL > nLvl && !rONds.empty() )
     {
@@ -776,9 +776,9 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
         {
             // The first OutlineNode comes after the one asking. Test if it points to the same node.
             // If not it's invalid.
-            pRet = rONds[0]->GetTxtNode();
+            pRet = rONds[0]->GetTextNode();
 
-            const SwCntntNode* pCNd = GetCntntNode();
+            const SwContentNode* pCNd = GetContentNode();
 
             Point aPt( 0, 0 );
             const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false ),
@@ -795,12 +795,12 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
         {
             // Or at the Field and get it from there!
             while( nPos &&
-                   nLvl < ( pRet = rONds[nPos]->GetTxtNode() )
+                   nLvl < ( pRet = rONds[nPos]->GetTextNode() )
                     ->GetAttrOutlineLevel() - 1 )
                 --nPos;
 
             if( !nPos )     // Get separately when 0
-                pRet = rONds[0]->GetTxtNode();
+                pRet = rONds[0]->GetTextNode();
         }
     }
     return pRet;
@@ -909,7 +909,7 @@ void SwStartNode::CheckSectionCondColl() const
     SwNodeIndex aIdx( *this );
     sal_uLong nEndIdx = EndOfSectionIndex();
     const SwNodes& rNds = GetNodes();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     while( 0 != ( pCNd = rNds.GoNext( &aIdx )) && pCNd->GetIndex() < nEndIdx )
         pCNd->ChkCondColl();
 //FEATURE::CONDCOLL
@@ -959,7 +959,7 @@ void SwStartNode::dumpAsXml(xmlTextWriterPtr pWriter) const
     if (IsTableNode())
     {
         xmlTextWriterStartElement(pWriter, BAD_CAST("attrset"));
-        GetTableNode()->GetTable().GetFrmFmt()->GetAttrSet().dumpAsXml(pWriter);
+        GetTableNode()->GetTable().GetFrameFormat()->GetAttrSet().dumpAsXml(pWriter);
         xmlTextWriterEndElement(pWriter);
     }
 
@@ -991,16 +991,16 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
     pStartOfSection->pEndOfSection = this;
 }
 
-SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
-                            SwFmtColl *pColl )
-    : SwModify( pColl ),     // CrsrsShell, FrameFmt,
+SwContentNode::SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
+                            SwFormatColl *pColl )
+    : SwModify( pColl ),     // CrsrsShell, FrameFormat,
     SwNode( rWhere, nNdType ),
     pCondColl( 0 ),
     mbSetModifyAtAttr( false )
 {
 }
 
-SwCntntNode::~SwCntntNode()
+SwContentNode::~SwContentNode()
 {
     // The base class SwClient of SwFrm excludes itself from the dependency list!
     // Thus, we need to delete all Frames in the dependency list.
@@ -1012,7 +1012,7 @@ SwCntntNode::~SwCntntNode()
         const_cast<SwAttrSet*>(static_cast<const SwAttrSet*>(mpAttrSet.get()))->SetModifyAtAttr( 0 );
 }
 
-void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwContentNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
     sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
                     pNewValue ? pNewValue->Which() : 0 ;
@@ -1022,17 +1022,17 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
     case RES_OBJECTDYING :
         if (pNewValue)
         {
-            SwFmt * pFmt = static_cast<SwFmt *>( static_cast<const SwPtrMsgPoolItem *>(pNewValue)->pObject );
+            SwFormat * pFormat = static_cast<SwFormat *>( static_cast<const SwPtrMsgPoolItem *>(pNewValue)->pObject );
 
             // Do not mangle pointers if it is the upper-most format!
-            if( GetRegisteredIn() == pFmt )
+            if( GetRegisteredIn() == pFormat )
             {
-                if( pFmt->GetRegisteredIn() )
+                if( pFormat->GetRegisteredIn() )
                 {
                     // If Parent, register anew in the new Parent
-                    static_cast<SwModify*>(pFmt->GetRegisteredIn())->Add( this );
+                    static_cast<SwModify*>(pFormat->GetRegisteredIn())->Add( this );
                     if ( GetpSwAttrSet() )
-                        AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFmtColl(), GetFmtColl() );
+                        AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFormatColl(), GetFormatColl() );
                 }
                 else
                 {
@@ -1049,16 +1049,16 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
         // If the Format parent was switched, register the Attrset at the new one
         // Skip own Modify!
         if( GetpSwAttrSet() && pNewValue &&
-            static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
+            static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
         {
             // Attach Set to the new parent
-            AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFmtColl(), GetFmtColl() );
+            AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFormatColl(), GetFormatColl() );
         }
         break;
 
 //FEATURE::CONDCOLL
     case RES_CONDCOLL_CONDCHG:
-        if( pNewValue && static_cast<const SwCondCollCondChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() &&
+        if( pNewValue && static_cast<const SwCondCollCondChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() &&
             &GetNodes() == &GetDoc()->GetNodes() )
         {
             ChkCondColl();
@@ -1067,24 +1067,24 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
 //FEATURE::CONDCOLL
 
     case RES_ATTRSET_CHG:
-        if (GetNodes().IsDocNodes() && IsTxtNode() && pOldValue)
+        if (GetNodes().IsDocNodes() && IsTextNode() && pOldValue)
         {
             if( SfxItemState::SET == static_cast<const SwAttrSetChg*>(pOldValue)->GetChgSet()->GetItemState(
                 RES_CHRATR_HIDDEN, false ) )
             {
-                static_cast<SwTxtNode*>(this)->SetCalcHiddenCharFlags();
+                static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
             }
         }
         break;
 
     case RES_UPDATE_ATTR:
-        if (GetNodes().IsDocNodes() && IsTxtNode() && pNewValue)
+        if (GetNodes().IsDocNodes() && IsTextNode() && pNewValue)
         {
             const sal_uInt16 nTmp = static_cast<const SwUpdateAttr*>(pNewValue)->getWhichAttr();
             if ( RES_ATTRSET_CHG == nTmp )
             {
                 // TODO: anybody wants to do some optimization here?
-                static_cast<SwTxtNode*>(this)->SetCalcHiddenCharFlags();
+                static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
             }
         }
         break;
@@ -1093,7 +1093,7 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
     NotifyClients( pOldValue, pNewValue );
 }
 
-bool SwCntntNode::InvalidateNumRule()
+bool SwContentNode::InvalidateNumRule()
 {
     SwNumRule* pRule = 0;
     const SfxPoolItem* pItem;
@@ -1108,25 +1108,25 @@ bool SwCntntNode::InvalidateNumRule()
     return 0 != pRule;
 }
 
-SwCntntFrm *SwCntntNode::getLayoutFrm( const SwRootFrm* _pRoot,
+SwContentFrm *SwContentNode::getLayoutFrm( const SwRootFrm* _pRoot,
     const Point* pPoint, const SwPosition *pPos, const bool bCalcFrm ) const
 {
-    return static_cast<SwCntntFrm*>( ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT,
+    return static_cast<SwContentFrm*>( ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT,
                                             pPoint, pPos, bCalcFrm ));
 }
 
-SwRect SwCntntNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
+SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
                                     const bool bCalcFrm ) const
 {
     SwRect aRet;
-    SwCntntFrm* pFrm = static_cast<SwCntntFrm*>( ::GetFrmOfModify( 0, *(SwModify*)this,
+    SwContentFrm* pFrm = static_cast<SwContentFrm*>( ::GetFrmOfModify( 0, *(SwModify*)this,
                                             FRM_CNTNT, pPoint, 0, bCalcFrm ) );
     if( pFrm )
         aRet = bPrtArea ? pFrm->Prt() : pFrm->Frm();
     return aRet;
 }
 
-SwRect SwCntntNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
+SwRect SwContentNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
                                     const bool bCalcFrm ) const
 {
     SwRect aRet;
@@ -1137,12 +1137,12 @@ SwRect SwCntntNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
     return aRet;
 }
 
-sal_Int32 SwCntntNode::Len() const { return 0; }
+sal_Int32 SwContentNode::Len() const { return 0; }
 
-SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
+SwFormatColl *SwContentNode::ChgFormatColl( SwFormatColl *pNewColl )
 {
     OSL_ENSURE( pNewColl, "Collectionpointer is 0." );
-    SwFmtColl *pOldColl = GetFmtColl();
+    SwFormatColl *pOldColl = GetFormatColl();
 
     if( pNewColl != pOldColl )
     {
@@ -1156,15 +1156,15 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
         // TODO: HACK: We need to recheck this condition according to the new template!
         if( true /*pNewColl */ )
         {
-            SetCondFmtColl( 0 );
+            SetCondFormatColl( 0 );
         }
 //FEATURE::CONDCOLL
 
         if( !IsModifyLocked() )
         {
-            SwFmtChg aTmp1( pOldColl );
-            SwFmtChg aTmp2( pNewColl );
-            SwCntntNode::Modify( &aTmp1, &aTmp2 );
+            SwFormatChg aTmp1( pOldColl );
+            SwFormatChg aTmp2( pNewColl );
+            SwContentNode::Modify( &aTmp1, &aTmp2 );
         }
     }
     if ( IsInCache() )
@@ -1175,16 +1175,16 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
     return pOldColl;
 }
 
-bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwContentNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
     bool bRet = true;
     if( pIdx->GetIndex() < Len() )
     {
-        if( !IsTxtNode() )
+        if( !IsTextNode() )
             ++(*pIdx);
         else
         {
-            const SwTxtNode& rTNd = *GetTxtNode();
+            const SwTextNode& rTNd = *GetTextNode();
             sal_Int32 nPos = pIdx->GetIndex();
             if( g_pBreakIt->GetBreakIter().is() )
             {
@@ -1192,7 +1192,7 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = g_pBreakIt->GetBreakIter()->nextCharacters( rTNd.GetTxt(), nPos,
+                nPos = g_pBreakIt->GetBreakIter()->nextCharacters( rTNd.GetText(), nPos,
                                    g_pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
@@ -1211,7 +1211,7 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
                 else
                     bRet = false;
             }
-            else if (nPos < rTNd.GetTxt().getLength())
+            else if (nPos < rTNd.GetText().getLength())
                 ++(*pIdx);
             else
                 bRet = false;
@@ -1222,16 +1222,16 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
     return bRet;
 }
 
-bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwContentNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
     bool bRet = true;
     if( pIdx->GetIndex() > 0 )
     {
-        if( !IsTxtNode() )
+        if( !IsTextNode() )
             --(*pIdx);
         else
         {
-            const SwTxtNode& rTNd = *GetTxtNode();
+            const SwTextNode& rTNd = *GetTextNode();
             sal_Int32 nPos = pIdx->GetIndex();
             if( g_pBreakIt->GetBreakIter().is() )
             {
@@ -1239,7 +1239,7 @@ bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = g_pBreakIt->GetBreakIter()->previousCharacters( rTNd.GetTxt(), nPos,
+                nPos = g_pBreakIt->GetBreakIter()->previousCharacters( rTNd.GetText(), nPos,
                                    g_pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
@@ -1273,7 +1273,7 @@ bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
  * Creates all Views for the Doc for this Node.
  * The created ContentFrames are attached to the corresponding Layout.
  */
-void SwCntntNode::MakeFrms( SwCntntNode& rNode )
+void SwContentNode::MakeFrms( SwContentNode& rNode )
 {
     OSL_ENSURE( &rNode != this,
             "No ContentNode or CopyNode and new Node identical." );
@@ -1297,15 +1297,15 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
         // CONTENT_FLOWS_FROM/_TO relation.
         // Relation CONTENT_FLOWS_FROM for next paragraph will change
         // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-        if ( pNew->IsTxtFrm() )
+        if ( pNew->IsTextFrm() )
         {
             SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
             if ( pViewShell && pViewShell->GetLayout() &&
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
             }
         }
     }
@@ -1317,34 +1317,34 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
  *
  * An input param to identify if the acc table should be disposed.
  */
-void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
+void SwContentNode::DelFrms( bool bIsDisposeAccTable )
 {
     if( !HasWriterListeners() )
         return;
 
-    SwIterator<SwCntntFrm,SwCntntNode> aIter( *this );
-    for( SwCntntFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+    SwIterator<SwContentFrm,SwContentNode> aIter( *this );
+    for( SwContentFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
     {
         // #i27138#
         // notify accessibility paragraphs objects about changed
         // CONTENT_FLOWS_FROM/_TO relation.
         // Relation CONTENT_FLOWS_FROM for current next paragraph will change
         // and relation CONTENT_FLOWS_TO for current previous paragraph will change.
-        if ( pFrm->IsTxtFrm() )
+        if ( pFrm->IsTextFrm() )
         {
             SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() );
             if ( pViewShell && pViewShell->GetLayout() &&
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
             }
         }
 
         if( pFrm->IsFollow() )
         {
-            SwCntntFrm* pMaster = pFrm->FindMaster();
+            SwContentFrm* pMaster = pFrm->FindMaster();
             pMaster->SetFollow( pFrm->GetFollow() );
         }
         pFrm->SetFollow( 0 );//So it doesn't get funny ideas.
@@ -1355,17 +1355,17 @@ void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
                                 //crushed here because we'll destroy all of it
                                 //anyway.
 
-        if( pFrm->GetUpper() && pFrm->IsInFtn() && !pFrm->GetIndNext() &&
+        if( pFrm->GetUpper() && pFrm->IsInFootnote() && !pFrm->GetIndNext() &&
             !pFrm->GetIndPrev() )
         {
-            SwFtnFrm *pFtn = pFrm->FindFtnFrm();
-            OSL_ENSURE( pFtn, "You promised a FtnFrm?" );
-            SwCntntFrm* pCFrm;
-            if( !pFtn->GetFollow() && !pFtn->GetMaster() &&
-                0 != ( pCFrm = pFtn->GetRefFromAttr()) && pCFrm->IsFollow() )
+            SwFootnoteFrm *pFootnote = pFrm->FindFootnoteFrm();
+            OSL_ENSURE( pFootnote, "You promised a FootnoteFrm?" );
+            SwContentFrm* pCFrm;
+            if( !pFootnote->GetFollow() && !pFootnote->GetMaster() &&
+                0 != ( pCFrm = pFootnote->GetRefFromAttr()) && pCFrm->IsFollow() )
             {
-                OSL_ENSURE( pCFrm->IsTxtFrm(), "NoTxtFrm has Footnote?" );
-                static_cast<SwTxtFrm*>(pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
+                OSL_ENSURE( pCFrm->IsTextFrm(), "NoTextFrm has Footnote?" );
+                static_cast<SwTextFrm*>(pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
             }
         }
         //Set acc table dispose state
@@ -1376,44 +1376,44 @@ void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
         SwFrm::DestroyFrm(pFrm);
     }
 
-    if( bIsDisposeAccTable && IsTxtNode() )
+    if( bIsDisposeAccTable && IsTextNode() )
     {
-        GetTxtNode()->DelFrms_TxtNodePart();
+        GetTextNode()->DelFrms_TextNodePart();
     }
 }
 
-SwCntntNode *SwCntntNode::JoinNext()
+SwContentNode *SwContentNode::JoinNext()
 {
     return this;
 }
 
-SwCntntNode *SwCntntNode::JoinPrev()
+SwContentNode *SwContentNode::JoinPrev()
 {
     return this;
 }
 
 /// Get info from Modify
-bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
+bool SwContentNode::GetInfo( SfxPoolItem& rInfo ) const
 {
     switch( rInfo.Which() )
     {
     case RES_AUTOFMT_DOCNODE:
-        if( &GetNodes() == static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+        if( &GetNodes() == static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
         {
-            static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = this;
+            static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = this;
             return false;
         }
         break;
 
     case RES_FINDNEARESTNODE:
-        if( static_cast<const SwFmtPageDesc&>(GetAttr( RES_PAGEDESC )).GetPageDesc() )
+        if( static_cast<const SwFormatPageDesc&>(GetAttr( RES_PAGEDESC )).GetPageDesc() )
             static_cast<SwFindNearestNode&>(rInfo).CheckNode( *this );
         return true;
 
     case RES_CONTENT_VISIBLE:
         {
             static_cast<SwPtrMsgPoolItem&>(rInfo).pObject =
-                SwIterator<SwFrm,SwCntntNode>(*this).First();
+                SwIterator<SwFrm,SwContentNode>(*this).First();
         }
         return false;
     }
@@ -1422,7 +1422,7 @@ bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
 }
 
 /// @param rAttr the attribute to set
-bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
+bool SwContentNode::SetAttr(const SfxPoolItem& rAttr )
 {
     if( !GetpSwAttrSet() ) // Have the Nodes created by the corresponding AttrSets
         NewAttrSet( GetDoc()->GetAttrPool() );
@@ -1458,7 +1458,7 @@ bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
 
 #include <svl/itemiter.hxx>
 
-bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
+bool SwContentNode::SetAttr( const SfxItemSet& rSet )
 {
     if ( IsInCache() )
     {
@@ -1470,7 +1470,7 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
     if( SfxItemState::SET == rSet.GetItemState( RES_AUTO_STYLE, false, &pFnd ) )
     {
         OSL_ENSURE( rSet.Count() == 1, "SetAutoStyle mixed with other attributes?!" );
-        const SwFmtAutoFmt* pTmp = static_cast<const SwFmtAutoFmt*>(pFnd);
+        const SwFormatAutoFormat* pTmp = static_cast<const SwFormatAutoFormat*>(pFnd);
 
         // If there already is an attribute set (usually containing a numbering
         // item), we have to merge the attribute of the new set into the old set:
@@ -1495,12 +1495,12 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
             // FME 2007-07-10 #i78124# If autostyle does not have a parent,
             // the string is empty.
             const SfxPoolItem* pNameItem = 0;
-            if ( 0 != GetCondFmtColl() ||
+            if ( 0 != GetCondFormatColl() ||
                  SfxItemState::SET != mpAttrSet->GetItemState( RES_FRMATR_STYLE_NAME, false, &pNameItem ) ||
                  static_cast<const SfxStringItem*>(pNameItem)->GetValue().isEmpty() )
-                AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFmtColl(), GetFmtColl() );
+                AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFormatColl(), GetFormatColl() );
             else
-                const_cast<SfxItemSet*>(mpAttrSet.get())->SetParent( &GetFmtColl()->GetAttrSet() );
+                const_cast<SfxItemSet*>(mpAttrSet.get())->SetParent( &GetFormatColl()->GetAttrSet() );
         }
 
         return true;
@@ -1534,7 +1534,7 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
 }
 
 // With nWhich it takes the Hint from the Delta array
-bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwContentNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !GetpSwAttrSet() )
         return false;
@@ -1583,7 +1583,7 @@ bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
     return bRet;
 }
 
-bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
+bool SwContentNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
 {
     if( !GetpSwAttrSet() )
         return false;
@@ -1623,7 +1623,7 @@ bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
     return 0 != nDel ;
 }
 
-sal_uInt16 SwCntntNode::ResetAllAttr()
+sal_uInt16 SwContentNode::ResetAllAttr()
 {
     if( !GetpSwAttrSet() )
         return 0;
@@ -1661,7 +1661,7 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
     return aNew.Count();
 }
 
-bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
+bool SwContentNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
 {
     if( rSet.Count() )
         rSet.ClearItem();
@@ -1674,7 +1674,7 @@ bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
     return rSet.Count() != 0;
 }
 
-sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds )
+sal_uInt16 SwContentNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds )
 {
     sal_uInt16 nRet = 0;
     if ( 0 == rWhichIds.size() )
@@ -1694,7 +1694,7 @@ sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rW
     return nRet;
 }
 
-const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich,
+const SfxPoolItem* SwContentNode::GetNoCondAttr( sal_uInt16 nWhich,
                                                bool bInParents ) const
 {
     const SfxPoolItem* pFnd = 0;
@@ -1703,7 +1703,7 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich,
         if( !GetpSwAttrSet() || ( SfxItemState::SET != GetpSwAttrSet()->GetItemState(
                     nWhich, false, &pFnd ) && bInParents ))
         {
-            (void)static_cast<const SwFmt*>(GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd );
+            (void)static_cast<const SwFormat*>(GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd );
         }
     }
     // undo change of issue #i51029#
@@ -1723,18 +1723,18 @@ static bool lcl_CheckMaxLength(SwNode const& rPrev, SwNode const& rNext)
     {
         return false;
     }
-    if (!rPrev.IsTxtNode())
+    if (!rPrev.IsTextNode())
     {
         return true;
     }
 
     // Check if a node can contain the other (order is not significant)
-    return rPrev.GetTxtNode()->GetSpaceLeft() > rNext.GetTxtNode()->Len();
+    return rPrev.GetTextNode()->GetSpaceLeft() > rNext.GetTextNode()->Len();
 }
 
 /// Can we join two Nodes?
 /// We can return the 2nd position in pIdx.
-bool SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
+bool SwContentNode::CanJoinNext( SwNodeIndex* pIdx ) const
 {
     const SwNodes& rNds = GetNodes();
     SwNodeIndex aIdx( *this, 1 );
@@ -1758,7 +1758,7 @@ bool SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
 
 /// Can we join two Nodes?
 /// We can return the 2nd position in pIdx.
-bool SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
+bool SwContentNode::CanJoinPrev( SwNodeIndex* pIdx ) const
 {
     SwNodeIndex aIdx( *this, -1 );
 
@@ -1780,12 +1780,12 @@ bool SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
 }
 
 //FEATURE::CONDCOLL
-void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
+void SwContentNode::SetCondFormatColl( SwFormatColl* pColl )
 {
     if( (!pColl && pCondColl) || ( pColl && !pCondColl ) ||
         ( pColl && pColl != pCondColl->GetRegisteredIn() ) )
     {
-        SwFmtColl* pOldColl = GetCondFmtColl();
+        SwFormatColl* pOldColl = GetCondFormatColl();
         delete pCondColl;
         if( pColl )
             pCondColl = new SwDepend( this, pColl );
@@ -1794,13 +1794,13 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
 
         if( GetpSwAttrSet() )
         {
-            AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFmtColl(), GetFmtColl() );
+            AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFormatColl(), GetFormatColl() );
         }
 
         if( !IsModifyLocked() )
         {
-            SwFmtChg aTmp1( pOldColl ? pOldColl : GetFmtColl() );
-            SwFmtChg aTmp2( pColl ? pColl : GetFmtColl() );
+            SwFormatChg aTmp1( pOldColl ? pOldColl : GetFormatColl() );
+            SwFormatChg aTmp2( pColl ? pColl : GetFormatColl() );
             NotifyClients( &aTmp1, &aTmp2 );
         }
         if( IsInCache() )
@@ -1811,7 +1811,7 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
     }
 }
 
-bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
+bool SwContentNode::IsAnyCondition( SwCollCondition& rTmp ) const
 {
     const SwNodes& rNds = GetNodes();
     {
@@ -1830,11 +1830,11 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 case SwTableBoxStartNode:
                     {
                         nCond = PARA_IN_TABLEBODY;
-                        const SwTableNode* pTblNd = pSttNd->FindTableNode();
+                        const SwTableNode* pTableNd = pSttNd->FindTableNode();
                         const SwTableBox* pBox;
-                        if( pTblNd && 0 != ( pBox = pTblNd->GetTable().
-                            GetTblBox( pSttNd->GetIndex() ) ) && pBox &&
-                            pBox->IsInHeadline( &pTblNd->GetTable() ) )
+                        if( pTableNd && 0 != ( pBox = pTableNd->GetTable().
+                            GetTableBox( pSttNd->GetIndex() ) ) && pBox &&
+                            pBox->IsInHeadline( &pTableNd->GetTable() ) )
                             nCond = PARA_IN_TABLEHEAD;
                     }
                     break;
@@ -1842,15 +1842,15 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 case SwFootnoteStartNode:
                     {
                         nCond = PARA_IN_FOOTENOTE;
-                        const SwFtnIdxs& rFtnArr = rNds.GetDoc()->GetFtnIdxs();
-                        const SwTxtFtn* pTxtFtn;
+                        const SwFootnoteIdxs& rFootnoteArr = rNds.GetDoc()->GetFootnoteIdxs();
+                        const SwTextFootnote* pTextFootnote;
                         const SwNode* pSrchNd = pSttNd;
 
-                        for( size_t n = 0; n < rFtnArr.size(); ++n )
-                            if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
-                                pSrchNd == &pTxtFtn->GetStartNode()->GetNode() )
+                        for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+                            if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
+                                pSrchNd == &pTextFootnote->GetStartNode()->GetNode() )
                             {
-                                if( pTxtFtn->GetFtn().IsEndNote() )
+                                if( pTextFootnote->GetFootnote().IsEndNote() )
                                     nCond = PARA_IN_ENDNOTE;
                                 break;
                             }
@@ -1878,12 +1878,12 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
         const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
         if( !rOutlNds.empty() )
         {
-            if( !rOutlNds.Seek_Entry( const_cast<SwCntntNode*>(this), &nPos ) && nPos )
+            if( !rOutlNds.Seek_Entry( const_cast<SwContentNode*>(this), &nPos ) && nPos )
                 --nPos;
             if( nPos < rOutlNds.size() &&
                 rOutlNds[ nPos ]->GetIndex() < GetIndex() )
             {
-                SwTxtNode* pOutlNd = rOutlNds[ nPos ]->GetTxtNode();
+                SwTextNode* pOutlNd = rOutlNds[ nPos ]->GetTextNode();
 
                 if( pOutlNd->IsOutline())
                 {
@@ -1897,10 +1897,10 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
     return false;
 }
 
-void SwCntntNode::ChkCondColl()
+void SwContentNode::ChkCondColl()
 {
     // Check, just to be sure
-    if( RES_CONDTXTFMTCOLL == GetFmtColl()->Which() )
+    if( RES_CONDTXTFMTCOLL == GetFormatColl()->Which() )
     {
         SwCollCondition aTmp( 0, 0, 0 );
         const SwCollCondition* pCColl;
@@ -1909,39 +1909,39 @@ void SwCntntNode::ChkCondColl()
 
         if( IsAnyCondition( aTmp ))
         {
-            pCColl = static_cast<SwConditionTxtFmtColl*>(GetFmtColl())
+            pCColl = static_cast<SwConditionTextFormatColl*>(GetFormatColl())
                 ->HasCondition( aTmp );
 
             if (pCColl)
             {
-                SetCondFmtColl( pCColl->GetTxtFmtColl() );
+                SetCondFormatColl( pCColl->GetTextFormatColl() );
                 bDone = true;
             }
         }
 
         if (!bDone)
         {
-            if( IsTxtNode() && static_cast<SwTxtNode*>(this)->GetNumRule())
+            if( IsTextNode() && static_cast<SwTextNode*>(this)->GetNumRule())
             {
                 // Is at which Level in a list?
                 aTmp.SetCondition( PARA_IN_LIST,
-                                static_cast<SwTxtNode*>(this)->GetActualListLevel() );
-                pCColl = static_cast<SwConditionTxtFmtColl*>(GetFmtColl())->
+                                static_cast<SwTextNode*>(this)->GetActualListLevel() );
+                pCColl = static_cast<SwConditionTextFormatColl*>(GetFormatColl())->
                                 HasCondition( aTmp );
             }
             else
                 pCColl = 0;
 
             if( pCColl )
-                SetCondFmtColl( pCColl->GetTxtFmtColl() );
+                SetCondFormatColl( pCColl->GetTextFormatColl() );
             else if( pCondColl )
-                SetCondFmtColl( 0 );
+                SetCondFormatColl( 0 );
         }
     }
 }
 
 // #i42921#
-short SwCntntNode::GetTextDirection( const SwPosition& rPos,
+short SwContentNode::GetTextDirection( const SwPosition& rPos,
                                      const Point* pPt ) const
 {
     short nRet = -1;
@@ -1974,11 +1974,11 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos,
     return nRet;
 }
 
-SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize )
+SwOLENodes* SwContentNode::CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize )
 {
     SwOLENodes *pNodes = 0;
-    SwIterator<SwCntntNode,SwFmtColl> aIter( rColl );
-    for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+    SwIterator<SwContentNode,SwFormatColl> aIter( rColl );
+    for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
     {
         SwOLENode *pONd = pNd->GetOLENode();
         if ( pONd && (!bOnlyWithInvalidSize || pONd->IsOLESizeInvalid()) )
@@ -1993,7 +1993,7 @@ SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnly
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwCntntNode::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwContentNode::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
 }
@@ -2029,27 +2029,27 @@ bool SwNode::IsInRedlines() const
     return bResult;
 }
 
-void SwNode::AddAnchoredFly(SwFrmFmt *const pFlyFmt)
+void SwNode::AddAnchoredFly(SwFrameFormat *const pFlyFormat)
 {
-    assert(pFlyFmt);
-    assert(&pFlyFmt->GetAnchor(false).GetCntntAnchor()->nNode.GetNode() == this);
-    // check node type, cf. SwFmtAnchor::SetAnchor()
-    assert(IsTxtNode() || IsStartNode() || IsTableNode());
+    assert(pFlyFormat);
+    assert(&pFlyFormat->GetAnchor(false).GetContentAnchor()->nNode.GetNode() == this);
+    // check node type, cf. SwFormatAnchor::SetAnchor()
+    assert(IsTextNode() || IsStartNode() || IsTableNode());
     if (!m_pAnchoredFlys)
     {
-        m_pAnchoredFlys.reset(new std::vector<SwFrmFmt*>);
+        m_pAnchoredFlys.reset(new std::vector<SwFrameFormat*>);
     }
-    m_pAnchoredFlys->push_back(pFlyFmt);
+    m_pAnchoredFlys->push_back(pFlyFormat);
 }
 
-void SwNode::RemoveAnchoredFly(SwFrmFmt *const pFlyFmt)
+void SwNode::RemoveAnchoredFly(SwFrameFormat *const pFlyFormat)
 {
-    assert(pFlyFmt);
+    assert(pFlyFormat);
     // cannot assert this in Remove because it is called when new anchor is already set
-//    assert(&pFlyFmt->GetAnchor(false).GetCntntAnchor()->nNode.GetNode() == this);
-    assert(IsTxtNode() || IsStartNode() || IsTableNode());
+//    assert(&pFlyFormat->GetAnchor(false).GetContentAnchor()->nNode.GetNode() == this);
+    assert(IsTextNode() || IsStartNode() || IsTableNode());
     assert(m_pAnchoredFlys);
-    auto it(std::find(m_pAnchoredFlys->begin(), m_pAnchoredFlys->end(), pFlyFmt));
+    auto it(std::find(m_pAnchoredFlys->begin(), m_pAnchoredFlys->end(), pFlyFormat));
     assert(it != m_pAnchoredFlys->end());
     m_pAnchoredFlys->erase(it);
     if (m_pAnchoredFlys->empty())
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index e9351873100b..4ed1518c2d56 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -68,10 +68,10 @@ SwNode* GoNextWithFrm(const SwNodes& rNodes, SwNodeIndex *pIdx)
     {
         pNd = &aTmp.GetNode();
         bool bFound = false;
-        if ( pNd->IsCntntNode() )
-            bFound = SwIterator<SwFrm,SwCntntNode>(*static_cast<SwCntntNode*>(pNd)).First();
+        if ( pNd->IsContentNode() )
+            bFound = SwIterator<SwFrm,SwContentNode>(*static_cast<SwContentNode*>(pNd)).First();
         else if ( pNd->IsTableNode() )
-            bFound = SwIterator<SwFrm,SwFmt>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrmFmt()).First() ;
+            bFound = SwIterator<SwFrm,SwFormat>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrameFormat()).First() ;
         else if( pNd->IsEndNode() && !pNd->StartOfSectionNode()->IsSectionNode() )
         {
             pNd = 0;
@@ -100,10 +100,10 @@ SwNode* GoPreviousWithFrm(SwNodeIndex *pIdx)
     {
         pNd = &aTmp.GetNode();
         bool bFound = false;
-        if ( pNd->IsCntntNode() )
-            bFound = SwIterator<SwFrm,SwCntntNode>(*static_cast<SwCntntNode*>(pNd)).First();
+        if ( pNd->IsContentNode() )
+            bFound = SwIterator<SwFrm,SwContentNode>(*static_cast<SwContentNode*>(pNd)).First();
         else if ( pNd->IsTableNode() )
-            bFound = SwIterator<SwFrm,SwFmt>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrmFmt()).First();
+            bFound = SwIterator<SwFrm,SwFormat>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrameFormat()).First();
         else if( pNd->IsStartNode() && !pNd->IsSectionNode() )
         {
             pNd = 0;
@@ -136,7 +136,7 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearc
     const SwNode* pNd;
     if( bSearch || rNode.IsSectionNode() )
     {
-        // Find the next Cntnt/TableNode that contains a Frame, so that we can add
+        // Find the next Content/TableNode that contains a Frame, so that we can add
         // ourselves before/after it
         if( !bSearch && rNode.GetIndex() < nIndex )
         {
@@ -162,12 +162,12 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearc
     }
     if( pNd )
     {
-        if( pNd->IsCntntNode() )
-            pMod = (SwModify*)pNd->GetCntntNode();
+        if( pNd->IsContentNode() )
+            pMod = (SwModify*)pNd->GetContentNode();
         else
         {
             OSL_ENSURE( pNd->IsTableNode(), "For Tablenodes only" );
-            pMod = pNd->GetTableNode()->GetTable().GetFrmFmt();
+            pMod = pNd->GetTableNode()->GetTable().GetFrameFormat();
         }
         pIter = new SwIterator<SwFrm,SwModify>( *pMod );
     }
@@ -207,7 +207,7 @@ SwFrm* SwNode2LayImpl::NextFrm()
     while( pRet )
     {
         SwFlowFrm* pFlow = SwFlowFrm::CastFlowFrm( pRet );
-        OSL_ENSURE( pFlow, "Cntnt or Table expected?!" );
+        OSL_ENSURE( pFlow, "Content or Table expected?!" );
         // Follows are pretty volatile, thus we ignore them.
         // Even if we insert after the Frame, we start from the Master
         // and iterate through it until the last Follow
@@ -227,14 +227,14 @@ SwFrm* SwNode2LayImpl::NextFrm()
                 // should be outside of it when looking at the Nodes.
                 // Thus, when dealing with Footnotes, we need to check whether the
                 // SectionFrm is also located within the Footnote and not outside of it.
-                if( !pRet->IsInFtn() || pSct->IsInFtn() )
+                if( !pRet->IsInFootnote() || pSct->IsInFootnote() )
                 {
                     OSL_ENSURE( pSct && pSct->GetSection(), "Where's my section?" );
-                    SwSectionNode* pNd = pSct->GetSection()->GetFmt()->GetSectionNode();
+                    SwSectionNode* pNd = pSct->GetSection()->GetFormat()->GetSectionNode();
                     OSL_ENSURE( pNd, "Lost SectionNode" );
                     // If the result Frame is located within a Section Frame
                     // whose Section does not contain the Node, we return with
-                    // the SectionFrm, else we return with the Cntnt/TabFrm
+                    // the SectionFrm, else we return with the Content/TabFrm
                     if( bMaster )
                     {
                         if( pNd->GetIndex() >= nIndex )
@@ -261,8 +261,8 @@ void SwNode2LayImpl::SaveUpperFrms()
         pFrm = pFrm->GetUpper();
         if( pFrm )
         {
-            if( pFrm->IsFtnFrm() )
-                static_cast<SwFtnFrm*>(pFrm)->ColLock();
+            if( pFrm->IsFootnoteFrm() )
+                static_cast<SwFootnoteFrm*>(pFrm)->ColLock();
             else if( pFrm->IsInSct() )
                 pFrm->FindSctFrm()->ColLock();
             if( pPrv && pPrv->IsSctFrm() )
@@ -347,7 +347,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
         SwFrm* pNew = 0;
         SwFrm* pNxt;
         SwLayoutFrm* pUp;
-        if( (pNd = rNds[nStt])->IsCntntNode() )
+        if( (pNd = rNds[nStt])->IsContentNode() )
             for( std::vector<SwFrm*>::size_type n = 0; n < pUpperFrms->size(); )
             {
                 pNxt = (*pUpperFrms)[n++];
@@ -358,7 +358,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
                     pNxt = pNxt->GetNext();
                 else
                     pNxt = pUp->Lower();
-                pNew = static_cast<SwCntntNode*>(pNd)->MakeFrm( pUp );
+                pNew = static_cast<SwContentNode*>(pNd)->MakeFrm( pUp );
                 pNew->Paste( pUp, pNxt );
                 (*pUpperFrms)[n-2] = pNew;
             }
@@ -399,8 +399,8 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
     for( std::vector<SwFrm*>::size_type x = 0; x < pUpperFrms->size(); ++x )
     {
         SwFrm* pTmp = (*pUpperFrms)[++x];
-        if( pTmp->IsFtnFrm() )
-            static_cast<SwFtnFrm*>(pTmp)->ColUnlock();
+        if( pTmp->IsFootnoteFrm() )
+            static_cast<SwFootnoteFrm*>(pTmp)->ColUnlock();
         else if ( pTmp->IsInSct() )
         {
             SwSectionFrm* pSctFrm = pTmp->FindSctFrm();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 807100a5648c..30e33ae5cd83 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -145,16 +145,16 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             SwNode& rNd = aDelIdx.GetNode();
 
             // #i57920# - correction of refactoring done by cws swnumtree:
-            // - <SwTxtNode::SetLevel( NO_NUMBERING ) is deprecated and
+            // - <SwTextNode::SetLevel( NO_NUMBERING ) is deprecated and
             //   set <IsCounted> state of the text node to <false>, which
             //   isn't correct here.
-            if ( rNd.IsTxtNode() )
+            if ( rNd.IsTextNode() )
             {
-                SwTxtNode* pTxtNode = rNd.GetTxtNode();
+                SwTextNode* pTextNode = rNd.GetTextNode();
 
-                pTxtNode->RemoveFromList();
+                pTextNode->RemoveFromList();
 
-                if (pTxtNode->IsOutline())
+                if (pTextNode->IsOutline())
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
                     pOutlineNds->erase( pSrch );
@@ -163,26 +163,26 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
 
             BigPtrArray::Move( aDelIdx.GetIndex(), rInsPos.GetIndex() );
 
-            if( rNd.IsTxtNode() )
+            if( rNd.IsTextNode() )
             {
-                SwTxtNode& rTxtNd = static_cast<SwTxtNode&>(rNd);
+                SwTextNode& rTextNd = static_cast<SwTextNode&>(rNd);
 
-                rTxtNd.AddToList();
+                rTextNd.AddToList();
 
-                if (bInsOutlineIdx && rTxtNd.IsOutline())
+                if (bInsOutlineIdx && rTextNd.IsOutline())
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
                     pOutlineNds->insert( pSrch );
                 }
-                rTxtNd.InvalidateNumRule();
+                rTextNd.InvalidateNumRule();
 
 //FEATURE::CONDCOLL
-                if( RES_CONDTXTFMTCOLL == rTxtNd.GetTxtColl()->Which() )
-                    rTxtNd.ChkCondColl();
+                if( RES_CONDTXTFMTCOLL == rTextNd.GetTextColl()->Which() )
+                    rTextNd.ChkCondColl();
 //FEATURE::CONDCOLL
             }
-            else if( rNd.IsCntntNode() )
-                static_cast<SwCntntNode&>(rNd).InvalidateNumRule();
+            else if( rNd.IsContentNode() )
+                static_cast<SwContentNode&>(rNd).InvalidateNumRule();
         }
     }
     else
@@ -203,17 +203,17 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             SwNode* pNd = &rDelPos.GetNode();
 
             // NoTextNode keep their persistent data
-            if( pNd->IsNoTxtNode() )
+            if( pNd->IsNoTextNode() )
             {
                 if( bSavePersData )
-                    static_cast<SwNoTxtNode*>(pNd)->SavePersistentData();
+                    static_cast<SwNoTextNode*>(pNd)->SavePersistentData();
             }
-            else if( pNd->IsTxtNode() )
+            else if( pNd->IsTextNode() )
             {
-                SwTxtNode* pTxtNd = static_cast<SwTxtNode*>(pNd);
+                SwTextNode* pTextNd = static_cast<SwTextNode*>(pNd);
 
                 // remove outline index from old nodes array
-                if (pTxtNd->IsOutline())
+                if (pTextNd->IsOutline())
                 {
                     pOutlineNds->erase( pNd );
                 }
@@ -221,7 +221,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                 // copy rules if needed
                 if( pDestDoc )
                 {
-                    const SwNumRule* pNumRule = pTxtNd->GetNumRule();
+                    const SwNumRule* pNumRule = pTextNd->GetNumRule();
                     if( pNumRule && sNumRule != pNumRule->GetName() )
                     {
                         sNumRule = pNumRule->GetName();
@@ -234,28 +234,28 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                 }
                 else
                     // if movement into the UndoNodes-array, update numbering
-                    pTxtNd->InvalidateNumRule();
+                    pTextNd->InvalidateNumRule();
 
-                pTxtNd->RemoveFromList();
+                pTextNd->RemoveFromList();
             }
 
             RemoveNode( rDelPos.GetIndex(), 1, false ); // move indices
-            SwCntntNode * pCNd = pNd->GetCntntNode();
+            SwContentNode * pCNd = pNd->GetContentNode();
             rNds.InsertNode( pNd, aInsPos );
 
             if( pCNd )
             {
-                SwTxtNode* pTxtNd = pCNd->GetTxtNode();
-                if( pTxtNd )
+                SwTextNode* pTextNd = pCNd->GetTextNode();
+                if( pTextNd )
                 {
-                    SwpHints * const pHts = pTxtNd->GetpSwpHints();
+                    SwpHints * const pHts = pTextNd->GetpSwpHints();
                     // OultineNodes set the new nodes in the array
-                    if (bInsOutlineIdx && pTxtNd->IsOutline())
+                    if (bInsOutlineIdx && pTextNd->IsOutline())
                     {
-                        rNds.pOutlineNds->insert( pTxtNd );
+                        rNds.pOutlineNds->insert( pTextNd );
                     }
 
-                    pTxtNd->AddToList();
+                    pTextNd->AddToList();
 
                     // special treatment for fields
                     if( pHts && pHts->Count() )
@@ -264,25 +264,25 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                             GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNds);
                         for( size_t i = pHts->Count(); i; )
                         {
-                            SwTxtAttr * const pAttr = pHts->GetTextHint( --i );
+                            SwTextAttr * const pAttr = pHts->GetTextHint( --i );
                             switch ( pAttr->Which() )
                             {
                             case RES_TXTATR_FIELD:
                             case RES_TXTATR_ANNOTATION:
                             case RES_TXTATR_INPUTFIELD:
                                 {
-                                    SwTxtFld* pTxtFld = static_txtattr_cast<SwTxtFld*>(pAttr);
-                                    rNds.GetDoc()->getIDocumentFieldsAccess().InsDelFldInFldLst( !bToUndo, *pTxtFld );
+                                    SwTextField* pTextField = static_txtattr_cast<SwTextField*>(pAttr);
+                                    rNds.GetDoc()->getIDocumentFieldsAccess().InsDelFieldInFieldLst( !bToUndo, *pTextField );
 
-                                    const SwFieldType* pTyp = pTxtFld->GetFmtFld().GetField()->GetTyp();
+                                    const SwFieldType* pTyp = pTextField->GetFormatField().GetField()->GetTyp();
                                     if ( RES_POSTITFLD == pTyp->Which() )
                                     {
                                         rNds.GetDoc()->GetDocShell()->Broadcast(
-                                            SwFmtFldHint(
-                                                &pTxtFld->GetFmtFld(),
-                                                ( pTxtFld->GetFmtFld().IsFldInDoc()
-                                                  ? SwFmtFldHintWhich::INSERTED
-                                                  : SwFmtFldHintWhich::REMOVED ) ) );
+                                            SwFormatFieldHint(
+                                                &pTextField->GetFormatField(),
+                                                ( pTextField->GetFormatField().IsFieldInDoc()
+                                                  ? SwFormatFieldHintWhich::INSERTED
+                                                  : SwFormatFieldHintWhich::REMOVED ) ) );
                                     }
                                     else if( RES_DDEFLD == pTyp->Which() )
                                     {
@@ -291,13 +291,13 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                                         else
                                             const_cast<SwDDEFieldType*>(static_cast<const SwDDEFieldType*>(pTyp))->IncRefCnt();
                                     }
-                                    static_cast<SwFmtFld&>(pAttr->GetAttr())
+                                    static_cast<SwFormatField&>(pAttr->GetAttr())
                                         .InvalidateField();
                                 }
                                 break;
 
                             case RES_TXTATR_FTN:
-                                static_cast<SwFmtFtn&>(pAttr->GetAttr())
+                                static_cast<SwFormatFootnote&>(pAttr->GetAttr())
                                     .InvalidateFootnote();
                                 break;
 
@@ -307,18 +307,18 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                                 break;
 
                             case RES_TXTATR_REFMARK:
-                                static_cast<SwFmtRefMark&>(pAttr->GetAttr())
+                                static_cast<SwFormatRefMark&>(pAttr->GetAttr())
                                     .InvalidateRefMark();
                                 break;
 
                             case RES_TXTATR_META:
                             case RES_TXTATR_METAFIELD:
                                 {
-                                    SwTxtMeta *const pTxtMeta(
-                                        static_txtattr_cast<SwTxtMeta*>(pAttr));
+                                    SwTextMeta *const pTextMeta(
+                                        static_txtattr_cast<SwTextMeta*>(pAttr));
                                     // force removal of UNO object
-                                    pTxtMeta->ChgTxtNode(0);
-                                    pTxtMeta->ChgTxtNode(pTxtNd);
+                                    pTextMeta->ChgTextNode(0);
+                                    pTextMeta->ChgTextNode(pTextNd);
                                 }
                                 break;
 
@@ -328,15 +328,15 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                         }
                     }
                     //FEATURE::CONDCOLL
-                    if( RES_CONDTXTFMTCOLL == pTxtNd->GetTxtColl()->Which() )
-                        pTxtNd->ChkCondColl();
+                    if( RES_CONDTXTFMTCOLL == pTextNd->GetTextColl()->Which() )
+                        pTextNd->ChkCondColl();
                     //FEATURE::CONDCOLL
                 }
                 else
                 {
                     // Moved into different Docs? Persist data again!
-                    if( pCNd->IsNoTxtNode() && bRestPersData )
-                        static_cast<SwNoTxtNode*>(pCNd)->RestorePersistentData();
+                    if( pCNd->IsNoTextNode() && bRestPersData )
+                        static_cast<SwNoTextNode*>(pCNd)->RestorePersistentData();
                 }
             }
         }
@@ -365,14 +365,14 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             OSL_ENSURE( false, "here, something wrong happened" );
             aFrmNdIdx = rNds.GetEndOfContent();
             pFrmNd = SwNodes::GoPrevSection( &aFrmNdIdx, true, false );
-            if( pFrmNd && !static_cast<SwCntntNode*>(pFrmNd)->HasWriterListeners() )
+            if( pFrmNd && !static_cast<SwContentNode*>(pFrmNd)->HasWriterListeners() )
                 pFrmNd = 0;
             OSL_ENSURE( pFrmNd, "ChgNode() - no FrameNode found" );
         }
         if( pFrmNd )
             while( aIdx != rInsPos )
             {
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( pCNd )
                 {
                     if( pFrmNd->IsTableNode() )
@@ -380,7 +380,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                     else if( pFrmNd->IsSectionNode() )
                         static_cast<SwSectionNode*>(pFrmNd)->MakeFrms( aIdx );
                     else
-                        static_cast<SwCntntNode*>(pFrmNd)->MakeFrms( *pCNd );
+                        static_cast<SwContentNode*>(pFrmNd)->MakeFrms( *pCNd );
                     pFrmNd = pCNd;
                 }
                 ++aIdx;
@@ -480,7 +480,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                 SwStartNode* pSttNd = pAktNode->pStartOfSection;
                 if( pSttNd->IsTableNode() )
                 {
-                    SwTableNode* pTblNd = static_cast<SwTableNode*>(pSttNd);
+                    SwTableNode* pTableNd = static_cast<SwTableNode*>(pSttNd);
 
                     // move the whole table/range
                     nInsPos = (aRg.aEnd.GetIndex() -
@@ -495,25 +495,25 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
                     if( bNewFrms )
                         // delete all frames
-                        pTblNd->DelFrms();
+                        pTableNd->DelFrms();
                     if( &rNodes == this ) // move into self?
                     {
                         // move all Start/End/ContentNodes
                         // ContentNodes: delete also the frames!
-                        pTblNd->pStartOfSection = aIdx.GetNode().pStartOfSection;
+                        pTableNd->pStartOfSection = aIdx.GetNode().pStartOfSection;
                         for( sal_uLong n = 0; n < nInsPos; ++n )
                         {
                             SwNodeIndex aMvIdx( aRg.aEnd, 1 );
-                            SwCntntNode* pCNd = 0;
+                            SwContentNode* pCNd = 0;
                             SwNode* pTmpNd = &aMvIdx.GetNode();
-                            if( pTmpNd->IsCntntNode() )
+                            if( pTmpNd->IsContentNode() )
                             {
-                                pCNd = static_cast<SwCntntNode*>(pTmpNd);
-                                if( pTmpNd->IsTxtNode() )
-                                    static_cast<SwTxtNode*>(pTmpNd)->RemoveFromList();
+                                pCNd = static_cast<SwContentNode*>(pTmpNd);
+                                if( pTmpNd->IsTextNode() )
+                                    static_cast<SwTextNode*>(pTmpNd)->RemoveFromList();
 
                                 // remove outline index from old nodes array
-                                if (pCNd->IsTxtNode() && pCNd->GetTxtNode()->IsOutline())
+                                if (pCNd->IsTextNode() && pCNd->GetTextNode()->IsOutline())
                                 {
                                     pOutlineNds->erase( pCNd );
                                 }
@@ -525,8 +525,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
                             if( bInsOutlineIdx && pCNd )
                                 pOutlineNds->insert( pCNd );
-                            if( pTmpNd->IsTxtNode() )
-                                static_cast<SwTxtNode*>(pTmpNd)->AddToList();
+                            if( pTmpNd->IsTextNode() )
+                                static_cast<SwTextNode*>(pTmpNd)->AddToList();
                         }
                     }
                     else
@@ -545,7 +545,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                         {
                             SwNode* pNd = &aMvIdx.GetNode();
 
-                            const bool bOutlNd = pNd->IsTxtNode() && pNd->GetTxtNode()->IsOutline();
+                            const bool bOutlNd = pNd->IsTextNode() && pNd->GetTextNode()->IsOutline();
                             // delete outline indices from old node array
                             if( bOutlNd )
                                 pOutlineNds->erase( pNd );
@@ -569,10 +569,10 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                             }
                         }
 
-                        if( pTblNd->GetTable().IsA( TYPE( SwDDETable ) ))
+                        if( pTableNd->GetTable().IsA( TYPE( SwDDETable ) ))
                         {
-                            SwDDEFieldType* pTyp = static_cast<SwDDETable&>(pTblNd->
-                                                GetTable()).GetDDEFldType();
+                            SwDDEFieldType* pTyp = static_cast<SwDDETable&>(pTableNd->
+                                                GetTable()).GetDDEFieldType();
                             if( pTyp )
                             {
                                 if( rNodes.IsDocNodes() )
@@ -585,16 +585,16 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                         if (GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(
                                     rNodes))
                         {
-                            SwFrmFmt* pTblFmt = pTblNd->GetTable().GetFrmFmt();
+                            SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                             SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
-                                                        pTblFmt );
-                            pTblFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+                                                        pTableFormat );
+                            pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
                         }
                     }
                     if( bNewFrms )
                     {
                         SwNodeIndex aTmp( aIdx );
-                        pTblNd->MakeFrms( &aTmp );
+                        pTableNd->MakeFrms( &aTmp );
                     }
                     aIdx -= nInsPos;
                     nInsPos = 0;
@@ -795,8 +795,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
         case ND_TEXTNODE:
             //Add special function to text node.
             {
-                if( bNewFrms && pAktNode->GetCntntNode() )
-                    static_cast<SwCntntNode*>(pAktNode)->DelFrms();
+                if( bNewFrms && pAktNode->GetContentNode() )
+                    static_cast<SwContentNode*>(pAktNode)->DelFrms();
                 pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
                 nInsPos++;
                 --aRg.aEnd;
@@ -805,8 +805,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
         case ND_GRFNODE:
         case ND_OLENODE:
             {
-                if( bNewFrms && pAktNode->GetCntntNode() )
-                    static_cast<SwCntntNode*>(pAktNode)->DelFrms();
+                if( bNewFrms && pAktNode->GetContentNode() )
+                    static_cast<SwContentNode*>(pAktNode)->DelFrms();
 
                 pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
                 nInsPos++;
@@ -873,13 +873,13 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
     if( this == &rNodes &&
         aRg.aEnd.GetIndex() >= aOrigInsPos.aStart.GetIndex() )
     {
-        UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
-        UpdtOutlineIdx( aRg.aEnd.GetNode() );
+        UpdateOutlineIdx( aOrigInsPos.aStart.GetNode() );
+        UpdateOutlineIdx( aRg.aEnd.GetNode() );
     }
     else
     {
-        UpdtOutlineIdx( aRg.aEnd.GetNode() );
-        rNodes.UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
+        UpdateOutlineIdx( aRg.aEnd.GetNode() );
+        rNodes.UpdateOutlineIdx( aOrigInsPos.aStart.GetNode() );
     }
 
     return true;
@@ -1114,26 +1114,26 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
             // delete the whole section?
             if( pAktNode->StartOfSectionIndex() > aRg.aStart.GetIndex() )
             {
-                SwTableNode* pTblNd = pAktNode->pStartOfSection->GetTableNode();
-                if( pTblNd )
-                    pTblNd->DelFrms();
+                SwTableNode* pTableNd = pAktNode->pStartOfSection->GetTableNode();
+                if( pTableNd )
+                    pTableNd->DelFrms();
 
                 SwNode *pNd, *pChkNd = pAktNode->pStartOfSection;
                 sal_uInt16 nIdxPos;
                 do {
                     pNd = &aRg.aEnd.GetNode();
 
-                    if( pNd->IsTxtNode() )
+                    if( pNd->IsTextNode() )
                     {
-                        SwTxtNode *const pTxtNode(pNd->GetTxtNode());
-                        if (pTxtNode->IsOutline() &&
+                        SwTextNode *const pTextNode(pNd->GetTextNode());
+                        if (pTextNode->IsOutline() &&
                                 pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
                         {
                             // remove outline indices
                             pOutlineNds->erase(nIdxPos);
                             bUpdateOutline = true;
                         }
-                        pTxtNode->InvalidateNumRule();
+                        pTextNode->InvalidateNumRule();
                     }
                     else if( pNd->IsEndNode() &&
                             pNd->pStartOfSection->IsTableNode() )
@@ -1187,19 +1187,19 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
         }
         else // "normal" node, so insert into TmpArray
         {
-            SwTxtNode* pTxtNd = pAktNode->GetTxtNode();
-            if( pTxtNd )
+            SwTextNode* pTextNd = pAktNode->GetTextNode();
+            if( pTextNd )
             {
-                if( pTxtNd->IsOutline())
+                if( pTextNd->IsOutline())
                 {
                     // delete outline indices
-                    pOutlineNds->erase( pTxtNd );
+                    pOutlineNds->erase( pTextNd );
                     bUpdateOutline = true;
                 }
-                pTxtNd->InvalidateNumRule();
+                pTextNd->InvalidateNumRule();
             }
-            else if( pAktNode->IsCntntNode() )
-                static_cast<SwCntntNode*>(pAktNode)->InvalidateNumRule();
+            else if( pAktNode->IsContentNode() )
+                static_cast<SwContentNode*>(pAktNode)->InvalidateNumRule();
 
             --aRg.aEnd;
             nCnt++;
@@ -1227,7 +1227,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
         // update numbering
         if( bUpdateOutline || bInDelUpdOutl )
         {
-            UpdtOutlineIdx( aRg.aEnd.GetNode() );
+            UpdateOutlineIdx( aRg.aEnd.GetNode() );
             bInDelUpdOutl = false;
         }
 
@@ -1263,7 +1263,7 @@ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx)
 
     // If index points to no ContentNode, than go to one.
     // If there is no further available, do not change the index' position!
-    while( !aTmp.GetNode().IsCntntNode() )
+    while( !aTmp.GetNode().IsContentNode() )
     {   // go from this StartNode (can only be one) to its end
         if( *pIdx <= aTmp )
             return;     // ERROR: already after the section
@@ -1280,38 +1280,38 @@ void SwNodes::GoEndOfSection(SwNodeIndex *pIdx)
         (*pIdx) = *pIdx->GetNode().EndOfSectionNode();
 }
 
-SwCntntNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
+SwContentNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
 {
     if( pIdx->GetIndex() >= Count() - 1 )
         return 0;
 
     SwNodeIndex aTmp(*pIdx, +1);
     SwNode* pNd = 0;
-    while( aTmp < Count()-1 && !( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp < Count()-1 && !( pNd = &aTmp.GetNode())->IsContentNode() )
         ++aTmp;
 
     if( aTmp == Count()-1 )
         pNd = 0;
     else
         (*pIdx) = aTmp;
-    return static_cast<SwCntntNode*>(pNd);
+    return static_cast<SwContentNode*>(pNd);
 }
 
-SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx)
+SwContentNode* SwNodes::GoPrevious(SwNodeIndex *pIdx)
 {
     if( !pIdx->GetIndex() )
         return 0;
 
     SwNodeIndex aTmp( *pIdx, -1 );
     SwNode* pNd = 0;
-    while( aTmp.GetIndex() && !( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp.GetIndex() && !( pNd = &aTmp.GetNode())->IsContentNode() )
         --aTmp;
 
     if( !aTmp.GetIndex() )
         pNd = 0;
     else
         (*pIdx) = aTmp;
-    return static_cast<SwCntntNode*>(pNd);
+    return static_cast<SwContentNode*>(pNd);
 }
 
 inline bool TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, sal_uLong nStt, sal_uLong nEnd )
@@ -1383,7 +1383,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
         {
             SwNode* pNd = (*this)[ n ];
 
-            if (pNd->IsTxtNode() && pNd->GetTxtNode()->IsOutline())
+            if (pNd->IsTextNode() && pNd->GetTextNode()->IsOutline())
             {
                 // remove the outline indices
                 sal_uInt16 nIdxPos;
@@ -1393,17 +1393,17 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
                     bUpdateNum = 1;
                 }
             }
-            if( pNd->IsCntntNode() )
+            if( pNd->IsContentNode() )
             {
-                static_cast<SwCntntNode*>(pNd)->InvalidateNumRule();
-                static_cast<SwCntntNode*>(pNd)->DelFrms();
+                static_cast<SwContentNode*>(pNd)->InvalidateNumRule();
+                static_cast<SwContentNode*>(pNd)->DelFrms();
             }
         }
         RemoveNode( nSttIdx, nCnt, true );
 
         // update numbering
         if( bUpdateNum )
-            UpdtOutlineIdx( rStart.GetNode() );
+            UpdateOutlineIdx( rStart.GetNode() );
     }
 }
 
@@ -1460,10 +1460,10 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
 
     SwNodeIndex aEndIdx( pEnd->nNode );
     SwNodeIndex aSttIdx( pStt->nNode );
-    SwTxtNode *const pSrcNd = aSttIdx.GetNode().GetTxtNode();
-    SwTxtNode * pDestNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *const pSrcNd = aSttIdx.GetNode().GetTextNode();
+    SwTextNode * pDestNd = rPos.nNode.GetNode().GetTextNode();
     bool bSplitDestNd = true;
-    bool bCopyCollFmt = pDestNd && pDestNd->GetTxt().isEmpty();
+    bool bCopyCollFormat = pDestNd && pDestNd->GetText().isEmpty();
 
     if( pSrcNd )
     {
@@ -1471,13 +1471,13 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         // be also a TextNode in the NodesArray to store the content
         if( !pDestNd )
         {
-            pDestNd = rNodes.MakeTxtNode( rPos.nNode, pSrcNd->GetTxtColl() );
+            pDestNd = rNodes.MakeTextNode( rPos.nNode, pSrcNd->GetTextColl() );
             --rPos.nNode;
             rPos.nContent.Assign( pDestNd, 0 );
-            bCopyCollFmt = true;
+            bCopyCollFormat = true;
         }
         bSplitDestNd = pDestNd->Len() > rPos.nContent.GetIndex() ||
-                        pEnd->nNode.GetNode().IsTxtNode();
+                        pEnd->nNode.GetNode().IsTextNode();
 
         // move the content into the new node
         bool bOneNd = pStt->nNode == pEnd->nNode;
@@ -1485,14 +1485,14 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 ( (bOneNd) ? pEnd->nContent.GetIndex() : pSrcNd->Len() )
                 - pStt->nContent.GetIndex();
 
-        if( !pEnd->nNode.GetNode().IsCntntNode() )
+        if( !pEnd->nNode.GetNode().IsContentNode() )
         {
             bOneNd = true;
             sal_uLong nSttNdIdx = pStt->nNode.GetIndex() + 1;
             const sal_uLong nEndNdIdx = pEnd->nNode.GetIndex();
             for( ; nSttNdIdx < nEndNdIdx; ++nSttNdIdx )
             {
-                if( (*this)[ nSttNdIdx ]->IsCntntNode() )
+                if( (*this)[ nSttNdIdx ]->IsContentNode() )
                 {
                     bOneNd = false;
                     break;
@@ -1505,7 +1505,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         {
             if( !rPos.nContent.GetIndex() )
             {
-                bCopyCollFmt = true;
+                bCopyCollFormat = true;
             }
             if( rNodes.IsDocNodes() )
             {
@@ -1515,7 +1515,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             }
             else
             {
-                pDestNd->SplitCntntNode( rPos );
+                pDestNd->SplitContentNode( rPos );
             }
 
             if( rPos.nNode == aEndIdx )
@@ -1524,7 +1524,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             }
             bSplitDestNd = true;
 
-            pDestNd = rNodes[ rPos.nNode.GetIndex() - 1 ]->GetTxtNode();
+            pDestNd = rNodes[ rPos.nNode.GetIndex() - 1 ]->GetTextNode();
             if( nLen )
             {
                 pSrcNd->CutText( pDestNd, SwIndex( pDestNd, pDestNd->Len()),
@@ -1536,12 +1536,12 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             pSrcNd->CutText( pDestNd, rPos.nContent, pStt->nContent, nLen );
         }
 
-        if( bCopyCollFmt )
+        if( bCopyCollFormat )
         {
             SwDoc* const pInsDoc = pDestNd->GetDoc();
             ::sw::UndoGuard const undoGuard(pInsDoc->GetIDocumentUndoRedo());
-            pSrcNd->CopyCollFmt( *pDestNd );
-            bCopyCollFmt = false;
+            pSrcNd->CopyCollFormat( *pDestNd );
+            bCopyCollFormat = false;
         }
 
         if( bOneNd )
@@ -1551,8 +1551,8 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             // Also, a selection is invalidated.
             pEnd->nContent = pStt->nContent;
             rPam.DeleteMark();
-            GetDoc()->GetDocShell()->Broadcast( SwFmtFldHint( 0,
-                rNodes.IsDocNodes() ? SwFmtFldHintWhich::INSERTED : SwFmtFldHintWhich::REMOVED ) );
+            GetDoc()->GetDocShell()->Broadcast( SwFormatFieldHint( 0,
+                rNodes.IsDocNodes() ? SwFormatFieldHintWhich::INSERTED : SwFormatFieldHintWhich::REMOVED ) );
             return;
         }
 
@@ -1580,7 +1580,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 }
                 else
                 {
-                    pDestNd->SplitCntntNode( rPos );
+                    pDestNd->SplitContentNode( rPos );
                 }
 
                 if ( bCorrEnd )
@@ -1593,7 +1593,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         bSplitDestNd = true;
     }
 
-    SwTxtNode* const pEndSrcNd = aEndIdx.GetNode().GetTxtNode();
+    SwTextNode* const pEndSrcNd = aEndIdx.GetNode().GetTextNode();
     if ( pEndSrcNd )
     {
         {
@@ -1606,13 +1606,13 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 }
 
                 pDestNd =
-                    rNodes.MakeTxtNode( rPos.nNode, pEndSrcNd->GetTxtColl() );
+                    rNodes.MakeTextNode( rPos.nNode, pEndSrcNd->GetTextColl() );
                 --rPos.nNode;
                 rPos.nContent.Assign( pDestNd, 0 );
             }
             else
             {
-                pDestNd = rPos.nNode.GetNode().GetTxtNode();
+                pDestNd = rPos.nNode.GetNode().GetTextNode();
             }
 
             if (pDestNd && pEnd->nContent.GetIndex())
@@ -1623,24 +1623,24 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                                 pEnd->nContent.GetIndex());
             }
 
-            if (pDestNd && bCopyCollFmt)
+            if (pDestNd && bCopyCollFormat)
             {
                 SwDoc* const pInsDoc = pDestNd->GetDoc();
                 ::sw::UndoGuard const ug(pInsDoc->GetIDocumentUndoRedo());
-                pEndSrcNd->CopyCollFmt( *pDestNd );
+                pEndSrcNd->CopyCollFormat( *pDestNd );
             }
         }
     }
     else
     {
-        if ( pSrcNd && aEndIdx.GetNode().IsCntntNode() )
+        if ( pSrcNd && aEndIdx.GetNode().IsContentNode() )
         {
             ++aEndIdx;
         }
         if( !bSplitDestNd )
         {
             ++rPos.nNode;
-            rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 );
+            rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), 0 );
         }
     }
 
@@ -1666,20 +1666,20 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         OSL_ENSURE( bSuccess, "Move() - no ContentNode here" );
         (void) bSuccess;
     }
-    pStt->nContent.Assign( pStt->nNode.GetNode().GetCntntNode(),
+    pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
                             pStt->nContent.GetIndex() );
     // Correct the PaM, because it might have happened that the move
     // went over the node borders (so the data might be in different nodes).
     // Also, a selection is invalidated.
     *pEnd = *pStt;
     rPam.DeleteMark();
-    GetDoc()->GetDocShell()->Broadcast( SwFmtFldHint( 0,
-                rNodes.IsDocNodes() ? SwFmtFldHintWhich::INSERTED : SwFmtFldHintWhich::REMOVED ) );
+    GetDoc()->GetDocShell()->Broadcast( SwFormatFieldHint( 0,
+                rNodes.IsDocNodes() ? SwFormatFieldHintWhich::INSERTED : SwFormatFieldHintWhich::REMOVED ) );
 }
 
 ///@see SwNodes::_MoveNodes (TODO: seems to be C&P programming here)
 void SwNodes::_CopyNodes( const SwNodeRange& rRange,
-            const SwNodeIndex& rIndex, bool bNewFrms, bool bTblInsDummyNode ) const
+            const SwNodeIndex& rIndex, bool bNewFrms, bool bTableInsDummyNode ) const
 {
     SwDoc* pDoc = rIndex.GetNode().GetDoc();
 
@@ -1753,7 +1753,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     nNodeCnt = 1;
 
                 // insert a DummyNode for a TableNode
-                if( bTblInsDummyNode )
+                if( bTableInsDummyNode )
                     new SwPlaceholderNode(aInsPos);
 
                 // copy all of the table's nodes into the current cell
@@ -1762,7 +1762,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     ++aRg.aStart )
                 {
                     // insert a DummyNode for the box-StartNode?
-                    if( bTblInsDummyNode )
+                    if( bTableInsDummyNode )
                         new SwPlaceholderNode(aInsPos);
 
                     SwStartNode* pSttNd = aRg.aStart.GetNode().GetStartNode();
@@ -1771,19 +1771,19 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                                 aInsPos, bNewFrms, false );
 
                     // insert a DummyNode for the box-EndNode?
-                    if( bTblInsDummyNode )
+                    if( bTableInsDummyNode )
                         new SwPlaceholderNode(aInsPos);
                     aRg.aStart = *pSttNd->EndOfSectionNode();
                 }
                 // insert a DummyNode for the table-EndNode
-                if( bTblInsDummyNode )
+                if( bTableInsDummyNode )
                     new SwPlaceholderNode(aInsPos);
                 aRg.aStart = *pAktNode->EndOfSectionNode();
             }
             else
             {
                 SwNodeIndex nStt( aInsPos, -1 );
-                SwTableNode* pTblNd = static_cast<SwTableNode*>(pAktNode)->
+                SwTableNode* pTableNd = static_cast<SwTableNode*>(pAktNode)->
                                         MakeCopy( pDoc, aInsPos );
                 sal_uLong nDistance = aInsPos.GetIndex() - nStt.GetIndex() - 2;
                 if (nDistance < nNodeCnt)
@@ -1793,10 +1793,10 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
 
                 aRg.aStart = pAktNode->EndOfSectionIndex();
 
-                if( bNewFrms && pTblNd )
+                if( bNewFrms && pTableNd )
                 {
                     nStt = aInsPos;
-                    pTblNd->MakeFrms( &nStt );
+                    pTableNd->MakeFrms( &nStt );
                 }
             }
             break;
@@ -1855,7 +1855,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
         case ND_GRFNODE:
         case ND_OLENODE:
             {
-                SwCntntNode* pNew = static_cast<SwCntntNode*>(pAktNode)->MakeCopy(
+                SwContentNode* pNew = static_cast<SwContentNode*>(pAktNode)->MakeCopy(
                                             pDoc, aInsPos );
                 // frames are always created as default, so delete if needed
                 if( !bNewFrms )
@@ -1907,12 +1907,12 @@ SwStartNode* SwNodes::MakeEmptySection( const SwNodeIndex& rIdx,
 
 SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
                                         SwStartNodeType eSttNdTyp,
-                                        SwTxtFmtColl *pColl,
+                                        SwTextFormatColl *pColl,
                                         SwAttrSet* pAutoAttr )
 {
     SwStartNode* pSttNd = new SwStartNode( rWhere, ND_STARTNODE, eSttNdTyp );
     new SwEndNode( rWhere, *pSttNd );
-    MakeTxtNode( SwNodeIndex( rWhere, - 1 ), pColl, pAutoAttr );
+    MakeTextNode( SwNodeIndex( rWhere, - 1 ), pColl, pAutoAttr );
     return pSttNd;
 }
 
@@ -1929,7 +1929,7 @@ SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
  * @see SwNodes::GoPrevious
  * @see SwNodes::GoNextSection (TODO: seems to be C&P programming here)
 */
-SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
+SwContentNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
                             bool bSkipHidden, bool bSkipProtect ) const
 {
     bool bFirst = true;
@@ -1971,7 +1971,7 @@ SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
             else
             {
                 (*pIdx) = aTmp;
-                return const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd));
+                return const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd));
             }
         }
         ++aTmp;
@@ -1981,7 +1981,7 @@ SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
 }
 
 ///@see SwNodes::GoNextSection (TODO: seems to be C&P programming here)
-SwCntntNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
+SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
                             bool bSkipHidden, bool bSkipProtect )
 {
     bool bFirst = true;
@@ -2029,7 +2029,7 @@ SwCntntNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
             else
             {
                 (*pIdx) = aTmp;
-                return const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd));
+                return const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd));
             }
         }
         --aTmp;
@@ -2079,7 +2079,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
             else
                 pNd = pSttNd;
 
-            if( ( pFrmNd = pNd )->IsCntntNode() )
+            if( ( pFrmNd = pNd )->IsContentNode() )
                 rFrmIdx = aIdx;
 
             // search forward or backward for a content node
@@ -2104,7 +2104,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
                     aIdx = rFrmIdx;
 
                 // NEVER leave the section when doing this!
-                if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsCntntNode() ) ||
+                if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsContentNode() ) ||
                     ( 0 != ( pFrmNd = GoNextSection( &aIdx, true, false )) &&
                     ::CheckNodesRange( aIdx, rFrmIdx, true ) &&
                     ( pFrmNd->FindTableNode() == pTableNd &&
@@ -2217,38 +2217,38 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
         for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++)
         {
             SwNode* pNode = ((*this)[ nDelPos + nCnt ]);
-            SwTxtNode * pTxtNd = pNode->GetTxtNode();
+            SwTextNode * pTextNd = pNode->GetTextNode();
 
-            if (pTxtNd)
+            if (pTextNd)
             {
-                pTxtNd->RemoveFromList();
+                pTextNd->RemoveFromList();
                 // remove FLY_AS_CHAR *before* adjusting SwNodeIndex
                 // so their anchor still points to correct node when deleted!
                 // NOTE: this will call RemoveNode() recursively!
                 // so adjust our indexes to account for removed nodes
-                sal_uLong const nPos = pTxtNd->GetIndex();
-                SwpHints *const pHints(pTxtNd->GetpSwpHints());
+                sal_uLong const nPos = pTextNd->GetIndex();
+                SwpHints *const pHints(pTextNd->GetpSwpHints());
                 if (pHints)
                 {
-                    std::vector<SwTxtAttr*> flys;
+                    std::vector<SwTextAttr*> flys;
                     for (size_t i = 0; i < pHints->Count(); ++i)
                     {
-                        SwTxtAttr *const pHint(pHints->GetTextHint(i));
+                        SwTextAttr *const pHint(pHints->GetTextHint(i));
                         if (RES_TXTATR_FLYCNT == pHint->Which())
                         {
                             flys.push_back(pHint);
                         }
                     }
-                    for (SwTxtAttr * pHint : flys)
+                    for (SwTextAttr * pHint : flys)
                     {
-                        pTxtNd->DeleteAttribute(pHint);
+                        pTextNd->DeleteAttribute(pHint);
                     }   // pHints may be dead now
-                    sal_uLong const nDiff = nPos - pTxtNd->GetIndex();
+                    sal_uLong const nDiff = nPos - pTextNd->GetIndex();
                     if (nDiff)
                     {
                         nDelPos -= nDiff;
                     }
-                    assert(pTxtNd == (*this)[nDelPos + nCnt]);
+                    assert(pTextNd == (*this)[nDelPos + nCnt]);
                     assert(pFirst == (*this)[nDelPos]);
                 }
             }
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e993c42204a3..ffc6bc876b54 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -70,11 +70,11 @@ using namespace ::com::sun::star;
 
 class SwIntrnlSectRefLink : public SwBaseLink
 {
-    SwSectionFmt& rSectFmt;
+    SwSectionFormat& rSectFormat;
 public:
-    SwIntrnlSectRefLink( SwSectionFmt& rFmt, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFmt )
-        : SwBaseLink( nUpdateType, nFmt ),
-        rSectFmt( rFmt )
+    SwIntrnlSectRefLink( SwSectionFormat& rFormat, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFormat )
+        : SwBaseLink( nUpdateType, nFormat ),
+        rSectFormat( rFormat )
     {}
 
     virtual void Closed() SAL_OVERRIDE;
@@ -92,7 +92,7 @@ public:
     }
 };
 
-TYPEINIT1(SwSectionFmt,SwFrmFmt );
+TYPEINIT1(SwSectionFormat,SwFrameFormat );
 TYPEINIT1(SwSection,SwClient );
 
 SwSectionData::SwSectionData(SectionType const eType, OUString const& rName)
@@ -198,7 +198,7 @@ OUString SwSectionData::CollapseWhiteSpaces(const OUString& sName)
 }
 
 SwSection::SwSection(
-        SectionType const eType, OUString const& rName, SwSectionFmt & rFormat)
+        SectionType const eType, OUString const& rName, SwSectionFormat & rFormat)
     : SwClient(& rFormat)
     , m_Data(eType, rName)
 {
@@ -217,7 +217,7 @@ SwSection::SwSection(
 
     if (!m_Data.IsProtectFlag())
     {
-        m_Data.SetProtectFlag( rFormat.GetProtect().IsCntntProtected() );
+        m_Data.SetProtectFlag( rFormat.GetProtect().IsContentProtected() );
     }
 
     if (!m_Data.IsEditInReadonlyFlag()) // edit in readonly sections
@@ -228,21 +228,21 @@ SwSection::SwSection(
 
 SwSection::~SwSection()
 {
-    SwSectionFmt* pFmt = GetFmt();
-    if( !pFmt )
+    SwSectionFormat* pFormat = GetFormat();
+    if( !pFormat )
         return;
 
-    SwDoc* pDoc = pFmt->GetDoc();
+    SwDoc* pDoc = pFormat->GetDoc();
     if( pDoc->IsInDtor() )
     {
-        // We reattach our Format to the default FrameFmt
+        // We reattach our Format to the default FrameFormat
         // to not get any dependencies
-        if( pFmt->DerivedFrom() != pDoc->GetDfltFrmFmt() )
-            pFmt->RegisterToFormat( *pDoc->GetDfltFrmFmt() );
+        if( pFormat->DerivedFrom() != pDoc->GetDfltFrameFormat() )
+            pFormat->RegisterToFormat( *pDoc->GetDfltFrameFormat() );
     }
     else
     {
-        pFmt->Remove( this ); // remove
+        pFormat->Remove( this ); // remove
 
         if (CONTENT_SECTION != m_Data.GetType())
         {
@@ -255,13 +255,13 @@ SwSection::~SwSection()
         }
 
         // If the Section is the last Client in the Format we can delete it
-        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-        pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
-        if( !pFmt->HasWriterListeners() )
+        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+        pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
+        if( !pFormat->HasWriterListeners() )
         {
             // Do not add to the Undo. This should've happened earlier.
             ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-            pDoc->DelSectionFmt( pFmt );
+            pDoc->DelSectionFormat( pFormat );
         }
     }
     if (m_RefObj.Is())
@@ -301,9 +301,9 @@ bool SwSection::DataEquals(SwSectionData const& rCmp) const
 
 void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
 {
-    SwSectionFmt* pFmt = GetFmt();
-    OSL_ENSURE(pFmt, "ImplSetHiddenFlag: no format?");
-    if( pFmt )
+    SwSectionFormat* pFormat = GetFormat();
+    OSL_ENSURE(pFormat, "ImplSetHiddenFlag: no format?");
+    if( pFormat )
     {
         const bool bHide = bTmpHidden && bCondition;
 
@@ -316,24 +316,24 @@ void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
 
                 // Tell all Children that they are hidden
                 SwMsgPoolItem aMsgItem( RES_SECTION_HIDDEN );
-                pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
+                pFormat->ModifyNotification( &aMsgItem, &aMsgItem );
 
                 // Delete all Frames
-                pFmt->DelFrms();
+                pFormat->DelFrms();
             }
         }
         else if (m_Data.IsHiddenFlag()) // show Nodes again
         {
             // Show all Frames (Child Sections are accounted for by MakeFrms)
             // Only if the Parent Section is not restricting us!
-            SwSection* pParentSect = pFmt->GetParentSection();
+            SwSection* pParentSect = pFormat->GetParentSection();
             if( !pParentSect || !pParentSect->IsHiddenFlag() )
             {
                 // Tell all Children that the Parent is not hidden anymore
                 SwMsgPoolItem aMsgItem( RES_SECTION_NOT_HIDDEN );
-                pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
+                pFormat->ModifyNotification( &aMsgItem, &aMsgItem );
 
-                pFmt->MakeFrms();
+                pFormat->MakeFrms();
             }
         }
     }
@@ -352,20 +352,20 @@ bool SwSection::CalcHiddenFlag() const
 
 bool SwSection::IsProtect() const
 {
-    SwSectionFmt const *const pFmt( GetFmt() );
-    OSL_ENSURE(pFmt, "SwSection::IsProtect: no format?");
-    return (pFmt)
-        ?   pFmt->GetProtect().IsCntntProtected()
+    SwSectionFormat const *const pFormat( GetFormat() );
+    OSL_ENSURE(pFormat, "SwSection::IsProtect: no format?");
+    return (pFormat)
+        ?   pFormat->GetProtect().IsContentProtected()
         :   IsProtectFlag();
 }
 
 // edit in readonly sections
 bool SwSection::IsEditInReadonly() const
 {
-    SwSectionFmt const *const pFmt( GetFmt() );
-    OSL_ENSURE(pFmt, "SwSection::IsEditInReadonly: no format?");
-    return (pFmt)
-        ?   pFmt->GetEditInReadonly().GetValue()
+    SwSectionFormat const *const pFormat( GetFormat() );
+    OSL_ENSURE(pFormat, "SwSection::IsEditInReadonly: no format?");
+    return (pFormat)
+        ?   pFormat->GetEditInReadonly().GetValue()
         :   IsEditInReadonlyFlag();
 }
 
@@ -380,13 +380,13 @@ void SwSection::SetHidden(bool const bFlag)
 
 void SwSection::SetProtect(bool const bFlag)
 {
-    SwSectionFmt *const pFormat( GetFmt() );
+    SwSectionFormat *const pFormat( GetFormat() );
     OSL_ENSURE(pFormat, "SwSection::SetProtect: no format?");
     if (pFormat)
     {
         SvxProtectItem aItem( RES_PROTECT );
-        aItem.SetCntntProtect( bFlag );
-        pFormat->SetFmtAttr( aItem );
+        aItem.SetContentProtect( bFlag );
+        pFormat->SetFormatAttr( aItem );
         // note: this will call m_Data.SetProtectFlag via Modify!
     }
     else
@@ -398,13 +398,13 @@ void SwSection::SetProtect(bool const bFlag)
 // edit in readonly sections
 void SwSection::SetEditInReadonly(bool const bFlag)
 {
-    SwSectionFmt *const pFormat( GetFmt() );
+    SwSectionFormat *const pFormat( GetFormat() );
     OSL_ENSURE(pFormat, "SwSection::SetEditInReadonly: no format?");
     if (pFormat)
     {
-        SwFmtEditInReadonly aItem;
+        SwFormatEditInReadonly aItem;
         aItem.SetValue( bFlag );
-        pFormat->SetFmtAttr( aItem );
+        pFormat->SetFormatAttr( aItem );
         // note: this will call m_Data.SetEditInReadonlyFlag via Modify!
     }
     else
@@ -415,7 +415,7 @@ void SwSection::SetEditInReadonly(bool const bFlag)
 
 void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
-    bool bUpdateFtn = false;
+    bool bUpdateFootnote = false;
     switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 )
     {
     case RES_ATTRSET_CHG:
@@ -429,7 +429,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         RES_PROTECT, false, &pItem ) )
             {
                 m_Data.SetProtectFlag( static_cast<SvxProtectItem const*>(pItem)
-                        ->IsCntntProtected() );
+                        ->IsContentProtected() );
                 pNewSet->ClearItem( RES_PROTECT );
                 pOldSet->ClearItem( RES_PROTECT );
             }
@@ -439,7 +439,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         RES_EDIT_IN_READONLY, false, &pItem ) )
             {
                 m_Data.SetEditInReadonlyFlag(
-                    static_cast<SwFmtEditInReadonly const*>(pItem)->GetValue());
+                    static_cast<SwFormatEditInReadonly const*>(pItem)->GetValue());
                 pNewSet->ClearItem( RES_EDIT_IN_READONLY );
                 pOldSet->ClearItem( RES_EDIT_IN_READONLY );
             }
@@ -449,7 +449,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                 SfxItemState::SET == pNewSet->GetItemState(
                         RES_END_AT_TXTEND, false, &pItem ))
             {
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
             }
 
             if( !pNewSet->Count() )
@@ -461,7 +461,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         if( pNew )
         {
             bool bNewFlag =
-                static_cast<const SvxProtectItem*>(pNew)->IsCntntProtected();
+                static_cast<const SvxProtectItem*>(pNew)->IsContentProtected();
             if( !bNewFlag )
             {
                 // Switching off: See if there is protection transferred
@@ -485,7 +485,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         if( pNew )
         {
             const bool bNewFlag =
-                static_cast<const SwFmtEditInReadonly*>(pNew)->GetValue();
+                static_cast<const SwFormatEditInReadonly*>(pNew)->GetValue();
             m_Data.SetEditInReadonlyFlag( bNewFlag );
         }
         return;
@@ -506,14 +506,14 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     case RES_FTN_AT_TXTEND:
         if( pNew && pOld )
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
         break;
 
     case RES_END_AT_TXTEND:
         if( pNew && pOld )
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
         break;
 
@@ -522,11 +522,11 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         break;
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
-        SwSectionNode* pSectNd = GetFmt()->GetSectionNode( false );
+        SwSectionNode* pSectNd = GetFormat()->GetSectionNode( false );
         if( pSectNd )
-            pSectNd->GetDoc()->GetFtnIdxs().UpdateFtn(SwNodeIndex( *pSectNd ));
+            pSectNd->GetDoc()->GetFootnoteIdxs().UpdateFootnote(SwNodeIndex( *pSectNd ));
     }
 }
 
@@ -567,7 +567,7 @@ OUString SwSection::GetLinkFileName() const
                     sTmp += OUString(sfx2::cTokenSeparator) + sFilter
                          +  OUString(sfx2::cTokenSeparator) + sRange;
                 }
-                else if( GetFmt() && !GetFmt()->GetSectionNode() )
+                else if( GetFormat() && !GetFormat()->GetSectionNode() )
                 {
                     // If the Section is in the UndoNodesArray, the LinkManager
                     // does not contain the Link, thus it cannot be queried for it.
@@ -630,20 +630,20 @@ const SwTOXBase* SwSection::GetTOXBase() const
     return pRet;
 }
 
-SwSectionFmt::SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc )
-    : SwFrmFmt( pDoc->GetAttrPool(), OUString(), pDrvdFrm )
+SwSectionFormat::SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc )
+    : SwFrameFormat( pDoc->GetAttrPool(), OUString(), pDrvdFrm )
 {
     LockModify();
-    SetFmtAttr( *GetDfltAttr( RES_COL ) );
+    SetFormatAttr( *GetDfltAttr( RES_COL ) );
     UnlockModify();
 }
 
-SwSectionFmt::~SwSectionFmt()
+SwSectionFormat::~SwSectionFormat()
 {
     if( !GetDoc()->IsInDtor() )
     {
         SwSectionNode* pSectNd;
-        const SwNodeIndex* pIdx = GetCntnt( false ).GetCntntIdx();
+        const SwNodeIndex* pIdx = GetContent( false ).GetContentIdx();
         if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
             0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
         {
@@ -672,32 +672,32 @@ SwSectionFmt::~SwSectionFmt()
             GetDoc()->GetNodes().SectionUp( &aRg );
         }
         LockModify();
-        ResetFmtAttr( RES_CNTNT );
+        ResetFormatAttr( RES_CNTNT );
         UnlockModify();
     }
 }
 
-SwSection * SwSectionFmt::GetSection() const
+SwSection * SwSectionFormat::GetSection() const
 {
-    return SwIterator<SwSection,SwSectionFmt>( *this ).First();
+    return SwIterator<SwSection,SwSectionFormat>( *this ).First();
 }
 
 // Do not destroy all Frms in aDepend (Frms are recognized with a PTR_CAST).
-void SwSectionFmt::DelFrms()
+void SwSectionFormat::DelFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
     {
-        // First delete the <SwSectionFrm> of the <SwSectionFmt> instance
+        // First delete the <SwSectionFrm> of the <SwSectionFormat> instance
         // mba: test iteration as objects are removed in iteration
         // use hint which allows to specify, if the content shall be saved or not
         CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( false ) );
 
-        // Then delete frames of the nested <SwSectionFmt> instances
-        SwIterator<SwSectionFmt,SwSectionFmt> aIter( *this );
-        SwSectionFmt *pLast = aIter.First();
+        // Then delete frames of the nested <SwSectionFormat> instances
+        SwIterator<SwSectionFormat,SwSectionFormat> aIter( *this );
+        SwSectionFormat *pLast = aIter.First();
         while ( pLast )
         {
             pLast->DelFrms();
@@ -706,7 +706,7 @@ void SwSectionFmt::DelFrms()
 
         sal_uLong nEnde = pSectNd->EndOfSectionIndex();
         sal_uLong nStart = pSectNd->GetIndex()+1;
-        sw_DeleteFtn( pSectNd, nStart, nEnde );
+        sw_DeleteFootnote( pSectNd, nStart, nEnde );
     }
     if( pIdx )
     {
@@ -714,7 +714,7 @@ void SwSectionFmt::DelFrms()
         // Paste of the Framei tself would need to do this. But that leads
         // to subsequent errors, which we'd need to solve at run-time.
         SwNodeIndex aNextNd( *pIdx );
-        SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false );
+        SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false );
         if( pCNd )
         {
             const SfxPoolItem& rItem = pCNd->GetSwAttrSet().Get( RES_PAGEDESC );
@@ -724,10 +724,10 @@ void SwSectionFmt::DelFrms()
 }
 
 // Create the Views
-void SwSectionFmt::MakeFrms()
+void SwSectionFormat::MakeFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
 
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
@@ -737,7 +737,7 @@ void SwSectionFmt::MakeFrms()
     }
 }
 
-void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwSectionFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     bool bClients = false;
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
@@ -816,7 +816,7 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         {
             // My Parents will be destroyed, so get the Parent's Parent
             // and update
-            SwFrmFmt::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
             UpdateParent();
             return;
         }
@@ -824,17 +824,17 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
     case RES_FMT_CHG:
         if( !GetDoc()->IsInDtor() &&
-            static_cast<const SwFmtChg*>(pNew)->pChangedFmt == (void*)GetRegisteredIn() &&
-            static_cast<const SwFmtChg*>(pNew)->pChangedFmt->IsA( TYPE( SwSectionFmt )) )
+            static_cast<const SwFormatChg*>(pNew)->pChangedFormat == (void*)GetRegisteredIn() &&
+            static_cast<const SwFormatChg*>(pNew)->pChangedFormat->IsA( TYPE( SwSectionFormat )) )
         {
             // My Parent will be changed, thus I need to update
-            SwFrmFmt::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
             UpdateParent();
             return;
         }
         break;
     }
-    SwFrmFmt::Modify( pOld, pNew );
+    SwFrameFormat::Modify( pOld, pNew );
 
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
     {   // invalidate cached uno object
@@ -843,12 +843,12 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 }
 
 // Get info from the Format
-bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwSectionFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
     switch( rInfo.Which() )
     {
     case RES_FINDNEARESTNODE:
-        if( static_cast<const SwFmtPageDesc&>(GetFmtAttr( RES_PAGEDESC )).GetPageDesc() )
+        if( static_cast<const SwFormatPageDesc&>(GetFormatAttr( RES_PAGEDESC )).GetPageDesc() )
         {
             const SwSectionNode* pNd = GetSectionNode();
             if( pNd )
@@ -858,15 +858,15 @@ bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
 
     case RES_CONTENT_VISIBLE:
         {
-            SwFrm* pFrm = SwIterator<SwFrm,SwFmt>(*this).First();
+            SwFrm* pFrm = SwIterator<SwFrm,SwFormat>(*this).First();
             // if the current section has no own frame search for the children
             if(!pFrm)
             {
-                SwIterator<SwSectionFmt,SwSectionFmt> aFormatIter(*this);
-                SwSectionFmt* pChild = aFormatIter.First();
+                SwIterator<SwSectionFormat,SwSectionFormat> aFormatIter(*this);
+                SwSectionFormat* pChild = aFormatIter.First();
                 while(pChild && !pFrm)
                 {
-                    pFrm = SwIterator<SwFrm,SwFmt>(*pChild).First();
+                    pFrm = SwIterator<SwFrm,SwFormat>(*pChild).First();
                     pChild = aFormatIter.Next();
                 }
             }
@@ -879,14 +879,14 @@ bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
 
 static bool lcl_SectionCmpPos( const SwSection *pFirst, const SwSection *pSecond)
 {
-    const SwSectionFmt* pFSectFmt = pFirst->GetFmt();
-    const SwSectionFmt* pSSectFmt = pSecond->GetFmt();
-    OSL_ENSURE( pFSectFmt && pSSectFmt &&
-            pFSectFmt->GetCntnt(false).GetCntntIdx() &&
-            pSSectFmt->GetCntnt(false).GetCntntIdx(),
+    const SwSectionFormat* pFSectFormat = pFirst->GetFormat();
+    const SwSectionFormat* pSSectFormat = pSecond->GetFormat();
+    OSL_ENSURE( pFSectFormat && pSSectFormat &&
+            pFSectFormat->GetContent(false).GetContentIdx() &&
+            pSSectFormat->GetContent(false).GetContentIdx(),
                 "ungueltige Sections" );
-    return pFSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex() <
-                  pSSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex();
+    return pFSectFormat->GetContent(false).GetContentIdx()->GetIndex() <
+                  pSSectFormat->GetContent(false).GetContentIdx()->GetIndex();
 }
 
 static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
@@ -896,7 +896,7 @@ static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
 }
 
 // get all Sections that have been derived from this one
-void SwSectionFmt::GetChildSections( SwSections& rArr,
+void SwSectionFormat::GetChildSections( SwSections& rArr,
                                         SectionSort eSort,
                                         bool bAllSections ) const
 {
@@ -904,12 +904,12 @@ void SwSectionFmt::GetChildSections( SwSections& rArr,
 
     if( HasWriterListeners() )
     {
-        SwIterator<SwSectionFmt,SwSectionFmt> aIter(*this);
+        SwIterator<SwSectionFormat,SwSectionFormat> aIter(*this);
         const SwNodeIndex* pIdx;
-        for( SwSectionFmt* pLast = aIter.First(); pLast; pLast = aIter.Next() )
+        for( SwSectionFormat* pLast = aIter.First(); pLast; pLast = aIter.Next() )
             if( bAllSections ||
-                ( 0 != ( pIdx = pLast->GetCntnt(false).
-                GetCntntIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
+                ( 0 != ( pIdx = pLast->GetContent(false).
+                GetContentIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
             {
                 SwSection* pDummy = pLast->GetSection();
                 rArr.push_back( pDummy );
@@ -932,14 +932,14 @@ void SwSectionFmt::GetChildSections( SwSections& rArr,
 }
 
 // See whether the Section is within the Nodes or the UndoNodes array
-bool SwSectionFmt::IsInNodesArr() const
+bool SwSectionFormat::IsInNodesArr() const
 {
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     return pIdx && &pIdx->GetNodes() == &GetDoc()->GetNodes();
 }
 
 // Parent was changed
-void SwSectionFmt::UpdateParent()
+void SwSectionFormat::UpdateParent()
 {
     if( !HasWriterListeners() )
         return;
@@ -947,13 +947,13 @@ void SwSectionFmt::UpdateParent()
     SwSection* pSection = 0;
     const SvxProtectItem* pProtect(0);
     // edit in readonly sections
-    const SwFmtEditInReadonly* pEditInReadonly = 0;
+    const SwFormatEditInReadonly* pEditInReadonly = 0;
     bool bIsHidden = false;
 
-    SwIterator<SwClient,SwSectionFmt> aIter(*this);
+    SwIterator<SwClient,SwSectionFormat> aIter(*this);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
-        if( pLast->IsA( TYPE(SwSectionFmt) ) )
+        if( pLast->IsA( TYPE(SwSectionFormat) ) )
         {
             if( !pSection )
             {
@@ -961,9 +961,9 @@ void SwSectionFmt::UpdateParent()
                 if( GetRegisteredIn() )
                 {
                     const SwSection* pPS = GetParentSection();
-                    pProtect = &pPS->GetFmt()->GetProtect();
+                    pProtect = &pPS->GetFormat()->GetProtect();
                     // edit in readonly sections
-                    pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
+                    pEditInReadonly = &pPS->GetFormat()->GetEditInReadonly();
                     bIsHidden = pPS->IsHiddenFlag();
                 }
                 else
@@ -974,7 +974,7 @@ void SwSectionFmt::UpdateParent()
                     bIsHidden = pSection->IsHidden();
                 }
             }
-            if (!pProtect->IsCntntProtected() !=
+            if (!pProtect->IsContentProtected() !=
                 !pSection->IsProtectFlag())
             {
                 pLast->ModifyNotification( (SfxPoolItem*)pProtect,
@@ -1004,9 +1004,9 @@ void SwSectionFmt::UpdateParent()
             if( GetRegisteredIn() )
             {
                 const SwSection* pPS = GetParentSection();
-                pProtect = &pPS->GetFmt()->GetProtect();
+                pProtect = &pPS->GetFormat()->GetProtect();
                 // edit in readonly sections
-                pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
+                pEditInReadonly = &pPS->GetFormat()->GetEditInReadonly();
                 bIsHidden = pPS->IsHiddenFlag();
             }
             else
@@ -1020,16 +1020,16 @@ void SwSectionFmt::UpdateParent()
     }
 }
 
-SwSectionNode* SwSectionFmt::GetSectionNode(bool const bAlways)
+SwSectionNode* SwSectionFormat::GetSectionNode(bool const bAlways)
 {
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     if( pIdx && ( bAlways || &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
         return pIdx->GetNode().GetSectionNode();
     return 0;
 }
 
 // Is this Section valid for the GlobalDocument?
-const SwSection* SwSectionFmt::GetGlobalDocSection() const
+const SwSection* SwSectionFormat::GetGlobalDocSection() const
 {
     const SwSectionNode* pNd = GetSectionNode();
     if( pNd &&
@@ -1043,25 +1043,25 @@ const SwSection* SwSectionFmt::GetGlobalDocSection() const
 }
 
 // sw::Metadatable
-::sfx2::IXmlIdRegistry& SwSectionFmt::GetRegistry()
+::sfx2::IXmlIdRegistry& SwSectionFormat::GetRegistry()
 {
     return GetDoc()->GetXmlIdRegistry();
 }
 
-bool SwSectionFmt::IsInClipboard() const
+bool SwSectionFormat::IsInClipboard() const
 {
     return GetDoc()->IsClipBoard();
 }
 
-bool SwSectionFmt::IsInUndo() const
+bool SwSectionFormat::IsInUndo() const
 {
     return !IsInNodesArr();
 }
 
-bool SwSectionFmt::IsInContent() const
+bool SwSectionFormat::IsInContent() const
 {
-    SwNodeIndex const*const pIdx = GetCntnt(false).GetCntntIdx();
-    OSL_ENSURE(pIdx, "SwSectionFmt::IsInContent: no index?");
+    SwNodeIndex const*const pIdx = GetContent(false).GetContentIdx();
+    OSL_ENSURE(pIdx, "SwSectionFormat::IsInContent: no index?");
     return pIdx == nullptr || !GetDoc()->IsInHeaderFooter(*pIdx);
 }
 
@@ -1071,7 +1071,7 @@ bool SwSectionFmt::IsInContent() const
 // section format.  but here only one UNO object can be returned,
 // so always return the text section.
 uno::Reference< rdf::XMetadatable >
-SwSectionFmt::MakeUnoObject()
+SwSectionFormat::MakeUnoObject()
 {
     uno::Reference<rdf::XMetadatable> xMeta;
     SwSection *const pSection( GetSection() );
@@ -1084,19 +1084,19 @@ SwSectionFmt::MakeUnoObject()
     return xMeta;
 }
 
-void SwSectionFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwSectionFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFmt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFormat"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     GetAttrSet().dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwSectionFmts::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwSectionFormats::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFmts"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFormats"));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
@@ -1185,8 +1185,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 ::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged(
     const OUString& rMimeType, const uno::Any & rValue )
 {
-    SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false );
-    SwDoc* pDoc = rSectFmt.GetDoc();
+    SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false );
+    SwDoc* pDoc = rSectFormat.GetDoc();
 
     SotClipboardFormatId nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
@@ -1213,13 +1213,13 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     SwPaM* pPam;
     SwViewShell* pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
     SwEditShell* pESh = pDoc->GetEditShell();
-    pDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pDoc->getIDocumentFieldsAccess().LockExpFields();
     {
         // Insert an empty TextNode at the Section's start
         SwNodeIndex aIdx( *pSectNd, +1 );
         SwNodeIndex aEndIdx( *pSectNd->EndOfSectionNode() );
-        SwTxtNode* pNewNd = pDoc->GetNodes().MakeTxtNode( aIdx,
-                        pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        SwTextNode* pNewNd = pDoc->GetNodes().MakeTextNode( aIdx,
+                        pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
 
         if( pESh )
             pESh->StartAllAction();
@@ -1361,7 +1361,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
                                 pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
                                 rInsPos.GetNode().FindTableNode();
 
-                    SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
+                    SwTableNumFormatMerge aTNFM( *pSrcDoc, *pDoc );
 
                     pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( *pCpyRg, 0, rInsPos, NULL, bCreateFrm );
                     ++aSave;
@@ -1438,9 +1438,9 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     pDoc->GetIDocumentUndoRedo().DoUndo(bWasUndo);
     pDoc->getIDocumentLinksAdministration().SetVisibleLinks( bWasVisibleLinks );
 
-    pDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     if( pESh )
         pESh->EndAllAction();
@@ -1453,14 +1453,14 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 
 void SwIntrnlSectRefLink::Closed()
 {
-    SwDoc* pDoc = rSectFmt.GetDoc();
+    SwDoc* pDoc = rSectFormat.GetDoc();
     if( pDoc && !pDoc->IsInDtor() )
     {
         // Advise says goodbye: mark the Section as not protected
         // and change the Flag
-        const SwSectionFmts& rFmts = pDoc->GetSections();
-        for( auto n = rFmts.size(); n; )
-            if( rFmts[ --n ] == &rSectFmt )
+        const SwSectionFormats& rFormats = pDoc->GetSections();
+        for( auto n = rFormats.size(); n; )
+            if( rFormats[ --n ] == &rSectFormat )
             {
                 SwViewShell* pSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
                 SwEditShell* pESh = pDoc->GetEditShell();
@@ -1470,7 +1470,7 @@ void SwIntrnlSectRefLink::Closed()
                 else
                     pSh->StartAction();
 
-                SwSectionData aSectionData(*rSectFmt.GetSection());
+                SwSectionData aSectionData(*rSectFormat.GetSection());
                 aSectionData.SetType( CONTENT_SECTION );
                 aSectionData.SetLinkFileName( OUString() );
                 aSectionData.SetHidden( false );
@@ -1483,7 +1483,7 @@ void SwIntrnlSectRefLink::Closed()
                 pDoc->UpdateSection( n, aSectionData );
 
                 // Make all Links within the Section visible again
-                SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false );
+                SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false );
                 if( pSectNd )
                     SwSection::MakeChildLinksVisible( *pSectNd );
 
@@ -1499,9 +1499,9 @@ void SwIntrnlSectRefLink::Closed()
 
 void SwSection::CreateLink( LinkCreateType eCreateType )
 {
-    SwSectionFmt* pFmt = GetFmt();
-    OSL_ENSURE(pFmt, "SwSection::CreateLink: no format?");
-    if (!pFmt || (CONTENT_SECTION == m_Data.GetType()))
+    SwSectionFormat* pFormat = GetFormat();
+    OSL_ENSURE(pFormat, "SwSection::CreateLink: no format?");
+    if (!pFormat || (CONTENT_SECTION == m_Data.GetType()))
         return ;
 
     SfxLinkUpdateMode nUpdateType = SfxLinkUpdateMode::ALWAYS;
@@ -1509,11 +1509,11 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
     if (!m_RefLink.Is())
     {
         // create BaseLink
-        m_RefLink = new SwIntrnlSectRefLink( *pFmt, nUpdateType, SotClipboardFormatId::RTF );
+        m_RefLink = new SwIntrnlSectRefLink( *pFormat, nUpdateType, SotClipboardFormatId::RTF );
     }
     else
     {
-        pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
+        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
     }
 
     SwIntrnlSectRefLink *const pLnk =
@@ -1521,13 +1521,13 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
 
     const OUString sCmd(SwSectionData::CollapseWhiteSpaces(m_Data.GetLinkFileName()));
     pLnk->SetUpdateMode( nUpdateType );
-    pLnk->SetVisible( pFmt->GetDoc()->getIDocumentLinksAdministration().IsVisibleLinks() );
+    pLnk->SetVisible( pFormat->GetDoc()->getIDocumentLinksAdministration().IsVisibleLinks() );
 
     switch (m_Data.GetType())
     {
     case DDE_LINK_SECTION:
         pLnk->SetLinkSourceName( sCmd );
-        pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( pLnk );
+        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( pLnk );
         break;
     case FILE_LINK_SECTION:
         {
@@ -1536,7 +1536,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
             const OUString sFile(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sFltr(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sRange(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
-            pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *pLnk,
+            pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *pLnk,
                                 static_cast<sal_uInt16>(m_Data.GetType()),
                                 sFile,
                                 ( !sFltr.isEmpty() ? &sFltr : 0 ),
@@ -1574,7 +1574,7 @@ void SwSection::BreakLink()
     // Release link, if it exists
     if (m_RefLink.Is())
     {
-        SwSectionFmt *const pFormat( GetFmt() );
+        SwSectionFormat *const pFormat( GetFormat() );
         OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?");
         if (pFormat)
         {
@@ -1591,13 +1591,13 @@ void SwSection::BreakLink()
 
 const SwNode* SwIntrnlSectRefLink::GetAnchor() const
 {
-    return rSectFmt.GetSectionNode( false );
+    return rSectFormat.GetSectionNode( false );
 }
 
 bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
                                      sal_Int32 , sal_Int32 ) const
 {
-    SwStartNode* pSttNd = rSectFmt.GetSectionNode( false );
+    SwStartNode* pSttNd = rSectFormat.GetSectionNode( false );
     return pSttNd &&
             nSttNd < pSttNd->GetIndex() &&
             pSttNd->EndOfSectionIndex() < nEndNd;
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index edd25b63a154..a00c8f966c1c 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -60,19 +60,19 @@ TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
 
 static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 {
-    //call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
-    //              The reason is, that in the SwNoTxtFrames the Graphic
+    //call fist all not SwNoTextFrames, then the SwNoTextFrames.
+    //              The reason is, that in the SwNoTextFrames the Graphic
     //              after a Paint will be swapped out! So all other "behind"
     //              them havent't a loaded Graphic.
     rGrfNd.LockModify();
     {
         SwIterator<SwClient,SwGrfNode> aIter(rGrfNd);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
-            if(!pLast->ISA(SwCntntFrm))
+            if(!pLast->ISA(SwContentFrm))
                 pLast->ModifyNotification(&rItem, &rItem);
     }
     {
-        SwIterator<SwCntntFrm,SwGrfNode> aIter(rGrfNd);
+        SwIterator<SwContentFrm,SwGrfNode> aIter(rGrfNd);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
             pLast->ModifyNotification(&rItem, &rItem);
     }
@@ -82,23 +82,23 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 ::sfx2::SvBaseLink::UpdateResult SwBaseLink::DataChanged(
     const OUString& rMimeType, const uno::Any & rValue )
 {
-    if( !pCntntNode )
+    if( !pContentNode )
     {
         OSL_ENSURE(false, "DataChanged without ContentNode" );
         return ERROR_GENERAL;
     }
 
-    SwDoc* pDoc = pCntntNode->GetDoc();
+    SwDoc* pDoc = pContentNode->GetDoc();
     if( pDoc->IsInDtor() || ChkNoDataFlag() || bIgnoreDataChanged )
     {
         bIgnoreDataChanged = false;
         return SUCCESS;
     }
 
-    SotClipboardFormatId nFmt = SotExchange::GetFormatIdFromMimeType( rMimeType );
+    SotClipboardFormatId nFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
-    if( pCntntNode->IsNoTxtNode() &&
-        nFmt == sfx2::LinkManager::RegisterStatusInfoId() )
+    if( pContentNode->IsNoTextNode() &&
+        nFormat == sfx2::LinkManager::RegisterStatusInfoId() )
     {
         // Only a status change - serve Events?
         OUString sState;
@@ -113,11 +113,11 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
             case sfx2::LinkManager::STATE_LOAD_ABORT:   nEvent = SVX_EVENT_IMAGE_ABORT; break;
             }
 
-            SwFrmFmt* pFmt;
-            if( nEvent && 0 != ( pFmt = pCntntNode->GetFlyFmt() ))
+            SwFrameFormat* pFormat;
+            if( nEvent && 0 != ( pFormat = pContentNode->GetFlyFormat() ))
             {
                 SwCallMouseEvent aCallEvent;
-                aCallEvent.Set( EVENT_OBJECT_IMAGE, pFmt );
+                aCallEvent.Set( EVENT_OBJECT_IMAGE, pFormat );
                 pDoc->CallEvent( nEvent, aCallEvent );
             }
         }
@@ -132,9 +132,9 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 
     SwGrfNode* pSwGrfNode = NULL;
 
-    if (pCntntNode->IsGrfNode())
+    if (pContentNode->IsGrfNode())
     {
-        pSwGrfNode = pCntntNode->GetGrfNode();
+        pSwGrfNode = pContentNode->GetGrfNode();
         assert(pSwGrfNode && "Error, pSwGrfNode expected when node answers IsGrfNode() with true (!)");
         aOldSz = pSwGrfNode->GetTwipSize();
         const GraphicObject& rGrfObj = pSwGrfNode->GetGrfObj();
@@ -184,7 +184,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         if ( bUpdate && !bGraphicArrived && !bGraphicPieceArrived )
             pSwGrfNode->SetTwipSize( Size(0,0) );
     }
-    else if( pCntntNode->IsOLENode() )
+    else if( pContentNode->IsOLENode() )
         bUpdate = true;
 
     SwViewShell *pSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
@@ -196,7 +196,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         if ( (!pSh || !pSh->ActionPend()) && (!pESh || !pESh->ActionPend()) )
         {
             SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED );
-            pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint );
+            pContentNode->ModifyNotification( &aMsgHint, &aMsgHint );
             bUpdate = false;
         }
     }
@@ -233,7 +233,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
                     pLnk->ISA( SwBaseLink ) && pLnk->GetObj() == GetObj() )
                 {
                     SwBaseLink* pBLink = static_cast<SwBaseLink*>(pLnk);
-                    SwGrfNode* pGrfNd = static_cast<SwGrfNode*>(pBLink->pCntntNode);
+                    SwGrfNode* pGrfNd = static_cast<SwGrfNode*>(pBLink->pContentNode);
 
                     if( pBLink != this &&
                         ( !bSwapIn ||
@@ -245,7 +245,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
                         pBLink->DataChanged( rMimeType, rValue );
                         pBLink->bIgnoreDataChanged = true;
 
-                        pGrfNd->SetGraphicArrived( static_cast<SwGrfNode*>(pCntntNode)->
+                        pGrfNd->SetGraphicArrived( static_cast<SwGrfNode*>(pContentNode)->
                                                     IsGraphicArrived() );
 
                         // Adjust the Fly's graphic
@@ -268,7 +268,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         }
         else
         {
-            pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint );
+            pContentNode->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
         if( pESh )
@@ -300,9 +300,9 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
     if ( !(aSz.Width() && aSz.Height()) &&
             rGrfSz.Width() && rGrfSz.Height() )
     {
-        SwFrmFmt* pFmt;
+        SwFrameFormat* pFormat;
         if( pGrfNd->IsChgTwipSize() &&
-            0 != (pFmt = pGrfNd->GetFlyFmt()) )
+            0 != (pFormat = pGrfNd->GetFlyFormat()) )
         {
             Size aCalcSz( aSz );
             if ( !aSz.Height() && aSz.Width() )
@@ -317,17 +317,17 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
                 // Take over height and width
                 aCalcSz = rGrfSz;
 
-            const SvxBoxItem     &rBox = pFmt->GetBox();
+            const SvxBoxItem     &rBox = pFormat->GetBox();
             aCalcSz.Width() += rBox.CalcLineSpace(SvxBoxItemLine::LEFT) +
                                rBox.CalcLineSpace(SvxBoxItemLine::RIGHT);
             aCalcSz.Height()+= rBox.CalcLineSpace(SvxBoxItemLine::TOP) +
                                rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM);
-            const SwFmtFrmSize& rOldAttr = pFmt->GetFrmSize();
+            const SwFormatFrmSize& rOldAttr = pFormat->GetFrmSize();
             if( rOldAttr.GetSize() != aCalcSz )
             {
-                SwFmtFrmSize aAttr( rOldAttr  );
+                SwFormatFrmSize aAttr( rOldAttr  );
                 aAttr.SetSize( aCalcSz );
-                pFmt->SetFmtAttr( aAttr );
+                pFormat->SetFormatAttr( aAttr );
                 bRet = true;
             }
 
@@ -336,16 +336,16 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
                 // If the graphic is anchored in a table, we need to recalculate
                 // the table rows
                 const SwDoc *pDoc = pGrfNd->GetDoc();
-                const SwPosition* pAPos = pFmt->GetAnchor().GetCntntAnchor();
+                const SwPosition* pAPos = pFormat->GetAnchor().GetContentAnchor();
                 SwNode *pANd;
-                SwTableNode *pTblNd;
+                SwTableNode *pTableNd;
                 if( pAPos &&
                     0 != (pANd = & pAPos->nNode.GetNode()) &&
-                    0 != (pTblNd = pANd->FindTableNode()) )
+                    0 != (pTableNd = pANd->FindTableNode()) )
                 {
-                    const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+                    const bool bLastGrf = !pTableNd->GetTable().DecGrfsThatResize();
                     SwHTMLTableLayout *pLayout =
-                        pTblNd->GetTable().GetHTMLTableLayout();
+                        pTableNd->GetTable().GetHTMLTableLayout();
                     if( pLayout )
                     {
                         const sal_uInt16 nBrowseWidth =
@@ -431,24 +431,24 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
 
 void SwBaseLink::Closed()
 {
-    if( pCntntNode && !pCntntNode->GetDoc()->IsInDtor() )
+    if( pContentNode && !pContentNode->GetDoc()->IsInDtor() )
     {
         // Delete the connection
-        if( pCntntNode->IsGrfNode() )
-            static_cast<SwGrfNode*>(pCntntNode)->ReleaseLink();
+        if( pContentNode->IsGrfNode() )
+            static_cast<SwGrfNode*>(pContentNode)->ReleaseLink();
     }
     SvBaseLink::Closed();
 }
 
 const SwNode* SwBaseLink::GetAnchor() const
 {
-    if (pCntntNode)
+    if (pContentNode)
     {
-        SwFrmFmt *const pFmt = pCntntNode->GetFlyFmt();
-        if (pFmt)
+        SwFrameFormat *const pFormat = pContentNode->GetFlyFormat();
+        if (pFormat)
         {
-            const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if (pAPos &&
                 ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
                  (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b0fe5b69c8a3..08e628b70b20 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -98,20 +98,20 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor )
  * Otherwise it is just a simple drawing object. This has a
  * UserCall and is the client of the searched format.
 */
-SwFrmFmt *FindFrmFmt( SdrObject *pObj )
+SwFrameFormat *FindFrameFormat( SdrObject *pObj )
 {
-    SwFrmFmt* pRetval = 0L;
+    SwFrameFormat* pRetval = 0L;
 
     if ( pObj->ISA(SwVirtFlyDrawObj) )
     {
-       pRetval = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFmt();
+       pRetval = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFormat();
     }
     else
     {
         SwDrawContact* pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
         if ( pContact )
         {
-            pRetval = pContact->GetFmt();
+            pRetval = pContact->GetFormat();
         }
     }
     return pRetval;
@@ -121,10 +121,10 @@ bool HasWrap( const SdrObject* pObj )
 {
     if ( pObj )
     {
-        const SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-        if ( pFmt )
+        const SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
+        if ( pFormat )
         {
-            return SURROUND_THROUGHT != pFmt->GetSurround().GetSurround();
+            return SURROUND_THROUGHT != pFormat->GetSurround().GetSurround();
         }
     }
 
@@ -169,7 +169,7 @@ bool IsMarqueeTextObj( const SdrObject& rObj )
          || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind );
 }
 
-SwContact::SwContact( SwFrmFmt *pToRegisterIn ) :
+SwContact::SwContact( SwFrameFormat *pToRegisterIn ) :
     SwClient( pToRegisterIn ),
     mbInDTOR( false )
 {}
@@ -190,7 +190,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 {
     // #i46297# - notify background about the arriving of
     // the object and invalidate its position.
-    const bool bNotify( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
+    const bool bNotify( !GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
 
     _MoveObjToLayer( true, _pDrawObj );
 
@@ -220,7 +220,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
 {
     // #i46297# - notify background about the leaving of the object.
-    const bool bNotify( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
+    const bool bNotify( GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
 
     _MoveObjToLayer( false, _pDrawObj );
 
@@ -260,7 +260,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
         return;
     }
 
-    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
+    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrameFormat*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
     if ( !pIDDMA )
     {
         OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
@@ -337,9 +337,9 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
 // some virtual helper methods for information
 // about the object (Writer fly frame resp. drawing object)
 
-const SwIndex& SwContact::GetCntntAnchorIndex() const
+const SwIndex& SwContact::GetContentAnchorIndex() const
 {
-    return GetCntntAnchor().nContent;
+    return GetContentAnchor().nContent;
 }
 
 /// get minimum order number of anchored objects handled by with contact
@@ -390,7 +390,7 @@ sal_uInt32 SwContact::GetMaxOrdNum() const
     return nMaxOrdNum;
 }
 
-SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel * ) :
+SwFlyDrawContact::SwFlyDrawContact( SwFlyFrameFormat *pToRegisterIn, SdrModel * ) :
     SwContact( pToRegisterIn )
 {
     // #i26791# - class <SwFlyDrawContact> contains the 'master'
@@ -481,7 +481,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
     OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToVisibleLayer(..)> - wrong SdrObject type -> crash" );
 
-    if ( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
+    if ( GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
     {
         // nothing to do
         return;
@@ -522,7 +522,7 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
     OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToInvisibleLayer(..)> - wrong SdrObject type -> crash" );
 
-    if ( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
+    if ( !GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
     {
         // nothing to do
         return;
@@ -550,8 +550,8 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
 /// get data collection of anchored objects, handled by with contact
 void SwFlyDrawContact::GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const
 {
-    const SwFrmFmt* pFmt = GetFmt();
-    SwFlyFrm::GetAnchoredObjects( _roAnchoredObjs, *pFmt );
+    const SwFrameFormat* pFormat = GetFormat();
+    SwFlyFrm::GetAnchoredObjects( _roAnchoredObjs, *pFormat );
 }
 
 // SwDrawContact
@@ -575,7 +575,7 @@ bool CheckControlLayer( const SdrObject *pObj )
     return false;
 }
 
-SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
+SwDrawContact::SwDrawContact( SwFrameFormat* pToRegisterIn, SdrObject* pObj ) :
     SwContact( pToRegisterIn ),
     maAnchoredDrawObj(),
     mbMasterObjCleared( false ),
@@ -610,7 +610,7 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
 
     // if there already exists an SwXShape for the object, ensure it knows about us, and the SdrObject
     // #i99056#
-    SwXShape::AddExistingShapeToFmt( *pObj );
+    SwXShape::AddExistingShapeToFormat( *pObj );
 }
 
 SwDrawContact::~SwDrawContact()
@@ -632,14 +632,14 @@ SwDrawContact::~SwDrawContact()
     }
 }
 
-void SwDrawContact::GetTextObjectsFromFmt( std::list<SdrTextObj*>& rTextObjects, SwDoc* pDoc )
+void SwDrawContact::GetTextObjectsFromFormat( std::list<SdrTextObj*>& rTextObjects, SwDoc* pDoc )
 {
-    for( sal_Int32 n=0; n<(sal_Int32)pDoc->GetSpzFrmFmts()->size(); n++ )
+    for( sal_Int32 n=0; n<(sal_Int32)pDoc->GetSpzFrameFormats()->size(); n++ )
     {
-        const SwFrmFmt* pFly = (*pDoc->GetSpzFrmFmts())[n];
-        if( pFly->IsA( TYPE(SwDrawFrmFmt) ) )
+        const SwFrameFormat* pFly = (*pDoc->GetSpzFrameFormats())[n];
+        if( pFly->IsA( TYPE(SwDrawFrameFormat) ) )
         {
-            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFrmFmt>(*pFly).First();
+            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFrameFormat>(*pFly).First();
             if( pContact )
             {
                 SdrObject* pSdrO = pContact->GetMaster();
@@ -889,10 +889,10 @@ SwDrawContact::VirtObjAnchoredAtFrmPred::VirtObjAnchoredAtFrmPred(
                                                 const SwFrm& _rAnchorFrm )
     : mpAnchorFrm( &_rAnchorFrm )
 {
-    if ( mpAnchorFrm->IsCntntFrm() )
+    if ( mpAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( mpAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( mpAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -905,10 +905,10 @@ SwDrawContact::VirtObjAnchoredAtFrmPred::VirtObjAnchoredAtFrmPred(
 bool SwDrawContact::VirtObjAnchoredAtFrmPred::operator() ( const SwDrawVirtObj* _pDrawVirtObj )
 {
     const SwFrm* pObjAnchorFrm = _pDrawVirtObj->GetAnchorFrm();
-    if ( pObjAnchorFrm && pObjAnchorFrm->IsCntntFrm() )
+    if ( pObjAnchorFrm && pObjAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pObjAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pObjAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -926,10 +926,10 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
 
     // #i26791# - compare master frames instead of direct frames
     const SwFrm* pProposedAnchorFrm = &_rAnchorFrm;
-    if ( pProposedAnchorFrm->IsCntntFrm() )
+    if ( pProposedAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pProposedAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pProposedAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -938,10 +938,10 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
     }
 
     const SwFrm* pMasterObjAnchorFrm = GetAnchorFrm();
-    if ( pMasterObjAnchorFrm && pMasterObjAnchorFrm->IsCntntFrm() )
+    if ( pMasterObjAnchorFrm && pMasterObjAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pMasterObjAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pMasterObjAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -1042,7 +1042,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
 {
     // #i26791# - no event handling, if existing <SwViewShell>
     // is in construction
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     if ( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() &&
          pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->IsInConstructor() )
     {
@@ -1157,15 +1157,15 @@ class NestedUserCallHdl
 };
 
 /// Notify the format's textbox that it should reconsider its position / size.
-void lcl_textBoxSizeNotify(SwFrmFmt* pFmt)
+void lcl_textBoxSizeNotify(SwFrameFormat* pFormat)
 {
-    if (SwTextBoxHelper::findTextBox(pFmt))
+    if (SwTextBoxHelper::findTextBox(pFormat))
     {
         // Just notify the textbox that the size has changed, the actual object size is not interesting.
-        SfxItemSet aResizeSet(pFmt->GetDoc()->GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0);
-        SwFmtFrmSize aSize;
+        SfxItemSet aResizeSet(pFormat->GetDoc()->GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0);
+        SwFormatFrmSize aSize;
         aResizeSet.Put(aSize);
-        SwTextBoxHelper::syncFlyFrmAttr(*pFmt, aResizeSet);
+        SwTextBoxHelper::syncFlyFrmAttr(*pFormat, aResizeSet);
     }
 }
 
@@ -1188,8 +1188,8 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
     // #i35007#
     // improvement: determine as-character anchored object flag only once.
     const bool bAnchoredAsChar = ObjAnchoredAsChar();
-    const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) &&
-                         ( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() ) &&
+    const bool bNotify = !(GetFormat()->GetDoc()->IsInDtor()) &&
+                         ( SURROUND_THROUGHT != GetFormat()->GetSurround().GetSurround() ) &&
                          !bAnchoredAsChar;
     switch( eType )
     {
@@ -1243,7 +1243,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
             {
                 if(::CheckControlLayer(maAnchoredDrawObj.DrawObj()))
                 {
-                    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
+                    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrameFormat*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
                     const SdrLayerID aCurrentLayer(maAnchoredDrawObj.DrawObj()->GetLayer());
                     const SdrLayerID aControlLayerID(pIDDMA->GetControlsId());
                     const SdrLayerID aInvisibleControlLayerID(pIDDMA->GetInvisibleControlsId());
@@ -1308,8 +1308,8 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 }
                 // #i31698# - determine layout direction
                 // via draw frame format.
-                SwFrmFmt::tLayoutDir eLayoutDir =
-                                pAnchoredDrawObj->GetFrmFmt().GetLayoutDir();
+                SwFrameFormat::tLayoutDir eLayoutDir =
+                                pAnchoredDrawObj->GetFrameFormat().GetLayoutDir();
                 // use geometry of drawing object
                 SwRect aObjRect( rObj.GetSnapRect() );
                 // If drawing object is a member of a group, the adjustment
@@ -1329,19 +1329,19 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 SwTwips nYPosDiff(0L);
                 switch ( eLayoutDir )
                 {
-                    case SwFrmFmt::HORI_L2R:
+                    case SwFrameFormat::HORI_L2R:
                     {
                         nXPosDiff = aObjRect.Left() - aOldObjRect.Left();
                         nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                     }
                     break;
-                    case SwFrmFmt::HORI_R2L:
+                    case SwFrameFormat::HORI_R2L:
                     {
                         nXPosDiff = aOldObjRect.Right() - aObjRect.Right();
                         nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                     }
                     break;
-                    case SwFrmFmt::VERT_R2L:
+                    case SwFrameFormat::VERT_R2L:
                     {
                         nXPosDiff = aObjRect.Top() - aOldObjRect.Top();
                         nYPosDiff = aOldObjRect.Right() - aObjRect.Right();
@@ -1352,9 +1352,9 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                         OSL_FAIL( "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
                     }
                 }
-                SfxItemSet aSet( GetFmt()->GetDoc()->GetAttrPool(),
+                SfxItemSet aSet( GetFormat()->GetDoc()->GetAttrPool(),
                                  RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
-                const SwFmtVertOrient& rVert = GetFmt()->GetVertOrient();
+                const SwFormatVertOrient& rVert = GetFormat()->GetVertOrient();
                 if ( nYPosDiff != 0 )
                 {
 
@@ -1363,15 +1363,15 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                     {
                         nYPosDiff = -nYPosDiff;
                     }
-                    aSet.Put( SwFmtVertOrient( rVert.GetPos()+nYPosDiff,
+                    aSet.Put( SwFormatVertOrient( rVert.GetPos()+nYPosDiff,
                                                text::VertOrientation::NONE,
                                                rVert.GetRelationOrient() ) );
                 }
 
-                const SwFmtHoriOrient& rHori = GetFmt()->GetHoriOrient();
+                const SwFormatHoriOrient& rHori = GetFormat()->GetHoriOrient();
                 if ( !bAnchoredAsChar && nXPosDiff != 0 )
                 {
-                    aSet.Put( SwFmtHoriOrient( rHori.GetPos()+nXPosDiff,
+                    aSet.Put( SwFormatHoriOrient( rHori.GetPos()+nXPosDiff,
                                                text::HoriOrientation::NONE,
                                                rHori.GetRelationOrient() ) );
                 }
@@ -1379,7 +1379,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 if ( nYPosDiff ||
                      ( !bAnchoredAsChar && nXPosDiff != 0 ) )
                 {
-                    GetFmt()->GetDoc()->SetFlyFrmAttr( *(GetFmt()), aSet );
+                    GetFormat()->GetDoc()->SetFlyFrmAttr( *(GetFormat()), aSet );
                     // keep new object rectangle, to avoid multiple
                     // changes of the attributes by multiple event from
                     // the drawing layer - e.g. group objects and its members
@@ -1398,17 +1398,17 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                         SwFrm* pAnchorFrm = const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)->AnchorFrm();
                         if(pAnchorFrm)
                         {
-                            pAnchorFrm->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+                            pAnchorFrm->Prepare( PREP_FLY_ATTR_CHG, GetFormat() );
                         }
                     }
 
-                    lcl_textBoxSizeNotify(GetFmt());
+                    lcl_textBoxSizeNotify(GetFormat());
                 }
                 else if (eType == SDRUSERCALL_RESIZE)
                     // Even if the bounding box of the shape didn't change,
                     // notify about the size change, as an adjustment change
                     // may affect the size of the underlying textbox.
-                    lcl_textBoxSizeNotify(GetFmt());
+                    lcl_textBoxSizeNotify(GetFormat());
             }
         }
         break;
@@ -1425,20 +1425,20 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
 
 namespace
 {
-    static const SwFmtAnchor* lcl_getAnchorFmt( const SfxPoolItem& _rItem )
+    static const SwFormatAnchor* lcl_getAnchorFormat( const SfxPoolItem& _rItem )
     {
         sal_uInt16 nWhich = _rItem.Which();
-        const SwFmtAnchor* pAnchorFmt = NULL;
+        const SwFormatAnchor* pAnchorFormat = NULL;
         if ( RES_ATTRSET_CHG == nWhich )
         {
             static_cast<const SwAttrSetChg&>(_rItem).GetChgSet()->
-                GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchorFmt) );
+                GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchorFormat) );
         }
         else if ( RES_ANCHOR == nWhich )
         {
-            pAnchorFmt = &static_cast<const SwFmtAnchor&>(_rItem);
+            pAnchorFormat = &static_cast<const SwFormatAnchor&>(_rItem);
         }
-        return pAnchorFmt;
+        return pAnchorFormat;
     }
 }
 
@@ -1448,13 +1448,13 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             "<SwDrawContact::Modify(..)> called during disconnection.");
 
     sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
-    const SwFmtAnchor* pNewAnchorFmt = pNew ? lcl_getAnchorFmt( *pNew ) : NULL;
+    const SwFormatAnchor* pNewAnchorFormat = pNew ? lcl_getAnchorFormat( *pNew ) : NULL;
 
-    if ( pNewAnchorFmt )
+    if ( pNewAnchorFormat )
     {
         // Do not respond to a Reset Anchor !!!!!
         if ( SfxItemState::SET ==
-                GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, false ) )
+                GetFormat()->GetAttrSet().GetItemState( RES_ANCHOR, false ) )
         {
             // no connect to layout during disconnection
             if ( !mbDisconnectInProgress )
@@ -1471,13 +1471,13 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                     pOldRect = &aOldRect;
                 }
                 // re-connect to layout due to anchor format change
-                ConnectToLayout( pNewAnchorFmt );
+                ConnectToLayout( pNewAnchorFormat );
                 // notify background of drawing objects
                 lcl_NotifyBackgroundOfObj( *this, *GetMaster(), pOldRect );
                 NotifyBackgrdOfAllVirtObjs( pOldRect );
 
-                const SwFmtAnchor* pOldAnchorFmt = pOld ? lcl_getAnchorFmt( *pOld ) : NULL;
-                if ( !pOldAnchorFmt || ( pOldAnchorFmt->GetAnchorId() != pNewAnchorFmt->GetAnchorId() ) )
+                const SwFormatAnchor* pOldAnchorFormat = pOld ? lcl_getAnchorFormat( *pOld ) : NULL;
+                if ( !pOldAnchorFormat || ( pOldAnchorFormat->GetAnchorId() != pNewAnchorFormat->GetAnchorId() ) )
                 {
                     OSL_ENSURE( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
                     if ( maAnchoredDrawObj.DrawObj() )
@@ -1597,7 +1597,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
 
     // --> #i36181# - notify background of drawing object
     if ( _bMoveMasterToInvisibleLayer &&
-         !(GetFmt()->GetDoc()->IsInDtor()) &&
+         !(GetFormat()->GetDoc()->IsInDtor()) &&
          GetAnchorFrm() && !GetAnchorFrm()->IsInDtor() )
     {
         const Rectangle aOldRect( maAnchoredDrawObj.GetObjRectWithSpaces().SVRect() );
@@ -1633,7 +1633,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
         // Instead of removing 'master' object from drawing page, move the
         // 'master' drawing object into the corresponding invisible layer.
         {
-            //static_cast<SwFrmFmt*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
+            //static_cast<SwFrameFormat*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
             //                            RemoveObject( GetMaster()->GetOrdNum() );
             // #i18447# - in order to consider group object correct
             // use new method <SwDrawContact::MoveObjToInvisibleLayer(..)>
@@ -1652,7 +1652,7 @@ void SwDrawContact::RemoveMasterFromDrawPage()
         GetMaster()->SetUserCall( 0 );
         if ( GetMaster()->IsInserted() )
         {
-            static_cast<SwFrmFmt*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
+            static_cast<SwFrameFormat*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
                                         RemoveObject( GetMaster()->GetOrdNum() );
         }
     }
@@ -1701,21 +1701,21 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
     }
 }
 
-static SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
-                                   const sal_Int32 _nTxtOfs )
+static SwTextFrm* lcl_GetFlyInContentAnchor( SwTextFrm* _pProposedAnchorFrm,
+                                   const sal_Int32 _nTextOfs )
 {
-    SwTxtFrm* pAct = _pProposedAnchorFrm;
-    SwTxtFrm* pTmp;
+    SwTextFrm* pAct = _pProposedAnchorFrm;
+    SwTextFrm* pTmp;
     do
     {
         pTmp = pAct;
         pAct = pTmp->GetFollow();
     }
-    while( pAct && _nTxtOfs >= pAct->GetOfst() );
+    while( pAct && _nTextOfs >= pAct->GetOfst() );
     return pTmp;
 }
 
-void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
+void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch )
 {
     // *no* connect to layout during disconnection from layout.
     if ( mbDisconnectInProgress )
@@ -1732,9 +1732,9 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
         return;
     }
 
-    SwFrmFmt* pDrawFrmFmt = static_cast<SwFrmFmt*>(GetRegisteredIn());
+    SwFrameFormat* pDrawFrameFormat = static_cast<SwFrameFormat*>(GetRegisteredIn());
 
-    if( !pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )
+    if( !pDrawFrameFormat->getIDocumentLayoutAccess()->GetCurrentViewShell() )
         return;
 
     // remove 'virtual' drawing objects from writer
@@ -1744,7 +1744,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
     if ( !pAnch )
     {
-        pAnch = &(pDrawFrmFmt->GetAnchor());
+        pAnch = &(pDrawFrameFormat->GetAnchor());
     }
 
     switch ( pAnch->GetAnchorId() )
@@ -1752,7 +1752,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
         case FLY_AT_PAGE:
                 {
                 sal_uInt16 nPgNum = pAnch->GetPageNum();
-                SwViewShell *pShell = pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell();
+                SwViewShell *pShell = pDrawFrameFormat->getIDocumentLayoutAccess()->GetCurrentViewShell();
                 if( !pShell )
                     break;
                 SwRootFrm* pRoot = pShell->GetLayout();
@@ -1786,26 +1786,26 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                 // but not control objects:
                 // anchor at first found frame the 'master' object and
                 // at the following frames 'virtual' drawing objects.
-                // Note: method is similar to <SwFlyFrmFmt::MakeFrms(..)>
+                // Note: method is similar to <SwFlyFrameFormat::MakeFrms(..)>
                 SwModify *pModify = 0;
-                if( pAnch->GetCntntAnchor() )
+                if( pAnch->GetContentAnchor() )
                 {
                     if ( pAnch->GetAnchorId() == FLY_AT_FLY )
                     {
-                        SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode );
-                        SwCntntNode* pCNd = pDrawFrmFmt->GetDoc()->GetNodes().GoNext( &aIdx );
-                        if ( SwIterator<SwFrm,SwCntntNode>( *pCNd ).First() )
+                        SwNodeIndex aIdx( pAnch->GetContentAnchor()->nNode );
+                        SwContentNode* pCNd = pDrawFrameFormat->GetDoc()->GetNodes().GoNext( &aIdx );
+                        if ( SwIterator<SwFrm,SwContentNode>( *pCNd ).First() )
                             pModify = pCNd;
                         else
                         {
-                            const SwNodeIndex& rIdx = pAnch->GetCntntAnchor()->nNode;
-                            SwFrmFmts& rFmts = *(pDrawFrmFmt->GetDoc()->GetSpzFrmFmts());
-                            for( auto pFlyFmt : rFmts )
+                            const SwNodeIndex& rIdx = pAnch->GetContentAnchor()->nNode;
+                            SwFrameFormats& rFormats = *(pDrawFrameFormat->GetDoc()->GetSpzFrameFormats());
+                            for( auto pFlyFormat : rFormats )
                             {
-                                if( pFlyFmt->GetCntnt().GetCntntIdx() &&
-                                    rIdx == *(pFlyFmt->GetCntnt().GetCntntIdx()) )
+                                if( pFlyFormat->GetContent().GetContentIdx() &&
+                                    rIdx == *(pFlyFormat->GetContent().GetContentIdx()) )
                                 {
-                                    pModify = pFlyFmt;
+                                    pModify = pFlyFormat;
                                     break;
                                 }
                             }
@@ -1813,7 +1813,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                     }
                     else
                     {
-                        pModify = pAnch->GetCntntAnchor()->nNode.GetNode().GetCntntNode();
+                        pModify = pAnch->GetContentAnchor()->nNode.GetNode().GetContentNode();
                     }
                 }
 
@@ -1835,8 +1835,8 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                     // (1) proposed anchor frame isn't a follow and
                     // (2) drawing object isn't a control object to be anchored
                     //     in header/footer.
-                    const bool bAdd = ( !pFrm->IsCntntFrm() ||
-                                        !static_cast<SwCntntFrm*>(pFrm)->IsFollow() ) &&
+                    const bool bAdd = ( !pFrm->IsContentFrm() ||
+                                        !static_cast<SwContentFrm*>(pFrm)->IsFollow() ) &&
                                       ( !::CheckControlLayer( GetMaster() ) ||
                                         !pFrm->FindFooterOrHeader() );
 
@@ -1851,11 +1851,11 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
                         // find correct follow for as character anchored objects
                         if ((pAnch->GetAnchorId() == FLY_AS_CHAR) &&
-                             pFrm->IsTxtFrm() )
+                             pFrm->IsTextFrm() )
                         {
-                            pFrm = lcl_GetFlyInCntntAnchor(
-                                        static_cast<SwTxtFrm*>(pFrm),
-                                        pAnch->GetCntntAnchor()->nContent.GetIndex() );
+                            pFrm = lcl_GetFlyInContentAnchor(
+                                        static_cast<SwTextFrm*>(pFrm),
+                                        pAnch->GetContentAnchor()->nContent.GetIndex() );
                         }
 
                         if ( !pAnchorFrmOfMaster )
@@ -1902,7 +1902,7 @@ void SwDrawContact::InsertMasterIntoDrawPage()
 {
     if ( !GetMaster()->IsInserted() )
     {
-        GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)
+        GetFormat()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)
                 ->InsertObject( GetMaster(), GetMaster()->GetOrdNumDirect() );
     }
     GetMaster()->SetUserCall( this );
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 56f39c5dac1c..ad6062f25ada 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -382,7 +382,7 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
     SdrVirtObj( rNew ),
     pFlyFrm( pFly )
 {
-    const SvxProtectItem &rP = pFlyFrm->GetFmt()->GetProtect();
+    const SvxProtectItem &rP = pFlyFrm->GetFormat()->GetProtect();
     bMovProt = rP.IsPosProtected();
     bSizProt = rP.IsSizeProtected();
 }
@@ -393,13 +393,13 @@ SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
         GetPage()->RemoveObject( GetOrdNum() );
 }
 
-const SwFrmFmt *SwVirtFlyDrawObj::GetFmt() const
+const SwFrameFormat *SwVirtFlyDrawObj::GetFormat() const
 {
-    return GetFlyFrm()->GetFmt();
+    return GetFlyFrm()->GetFormat();
 }
-SwFrmFmt *SwVirtFlyDrawObj::GetFmt()
+SwFrameFormat *SwVirtFlyDrawObj::GetFormat()
 {
-    return GetFlyFrm()->GetFmt();
+    return GetFlyFrm()->GetFormat();
 }
 
 // --> OD #i102707#
@@ -596,11 +596,11 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
 
     //If the Fly has a automatic align (right or top),
     //so preserve the automatic.
-    SwFrmFmt *pFmt = GetFlyFrm()->GetFmt();
-    const sal_Int16 eHori = pFmt->GetHoriOrient().GetHoriOrient();
-    const sal_Int16 eVert = pFmt->GetVertOrient().GetVertOrient();
-    const sal_Int16 eRelHori = pFmt->GetHoriOrient().GetRelationOrient();
-    const sal_Int16 eRelVert = pFmt->GetVertOrient().GetRelationOrient();
+    SwFrameFormat *pFormat = GetFlyFrm()->GetFormat();
+    const sal_Int16 eHori = pFormat->GetHoriOrient().GetHoriOrient();
+    const sal_Int16 eVert = pFormat->GetVertOrient().GetVertOrient();
+    const sal_Int16 eRelHori = pFormat->GetHoriOrient().GetRelationOrient();
+    const sal_Int16 eRelVert = pFormat->GetVertOrient().GetRelationOrient();
     //On paragraph bound Flys starting from the new position a new
     //anchor must be set. Anchor and the new RelPos is calculated and
     //placed by the Fly itself.
@@ -608,9 +608,9 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         static_cast<SwFlyAtCntFrm*>(GetFlyFrm())->SetAbsPos( aNewPos );
     else
     {
-        const SwFrmFmt *pTmpFmt = GetFmt();
-        const SwFmtVertOrient &rVert = pTmpFmt->GetVertOrient();
-        const SwFmtHoriOrient &rHori = pTmpFmt->GetHoriOrient();
+        const SwFrameFormat *pTmpFormat = GetFormat();
+        const SwFormatVertOrient &rVert = pTmpFormat->GetVertOrient();
+        const SwFormatHoriOrient &rHori = pTmpFormat->GetHoriOrient();
         long lXDiff = aNewPos.X() - aOldPos.X();
         if( rHori.IsPosToggle() && text::HoriOrientation::NONE == eHori &&
             !GetFlyFrm()->FindPageFrm()->OnRightPage() )
@@ -652,14 +652,14 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         GetFlyFrm()->ChgRelPos( aTmp );
     }
 
-    SwAttrSet aSet( pFmt->GetDoc()->GetAttrPool(),
+    SwAttrSet aSet( pFormat->GetDoc()->GetAttrPool(),
                                             RES_VERT_ORIENT, RES_HORI_ORIENT );
-    SwFmtHoriOrient aHori( pFmt->GetHoriOrient() );
-    SwFmtVertOrient aVert( pFmt->GetVertOrient() );
+    SwFormatHoriOrient aHori( pFormat->GetHoriOrient() );
+    SwFormatVertOrient aVert( pFormat->GetVertOrient() );
     bool bPut = false;
 
     if( !GetFlyFrm()->IsFlyLayFrm() &&
-        ::GetHtmlMode(pFmt->GetDoc()->GetDocShell()) )
+        ::GetHtmlMode(pFormat->GetDoc()->GetDocShell()) )
     {
         //In HTML-Mode only automatic aligns are allowed.
         //Only we can try a snap to left/right respectively left-/right border
@@ -729,7 +729,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         }
     }
     if ( bPut )
-        pFmt->SetFmtAttr( aSet );
+        pFormat->SetFormatAttr( aSet );
 }
 
 
@@ -804,11 +804,11 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F
     pSh->SetAttrItem(aCrop);
 
     // Set new frame size
-    SwFrmFmt *pFmt = GetFmt();
-    SwFmtFrmSize aSz( pFmt->GetFrmSize() );
+    SwFrameFormat *pFormat = GetFormat();
+    SwFormatFrmSize aSz( pFormat->GetFrmSize() );
     aSz.SetWidth(aNewRect.GetWidth());
     aSz.SetHeight(aNewRect.GetHeight());
-    pFmt->GetDoc()->SetAttr( aSz, *pFmt );
+    pFormat->GetDoc()->SetAttr( aSz, *pFormat );
 
 //    pSh->EndUndo(UNDO_END);
     pSh->EndAllAction();
@@ -843,7 +843,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             SwBorderAttrAccess aAccess( SwFrm::GetCache(), GetFlyFrm() );
             const SwBorderAttrs &rAttrs = *aAccess.Get();
             long nMin = rAttrs.CalcLeftLine()+rAttrs.CalcRightLine();
-            const SwFmtCol& rCol = rAttrs.GetAttrSet().GetCol();
+            const SwFormatCol& rCol = rAttrs.GetAttrSet().GetCol();
             if ( rCol.GetColumns().size() > 1 )
             {
                 for ( const auto &rC : rCol.GetColumns() )
@@ -855,10 +855,10 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             aSz.Width() = std::max( aSz.Width(), nMin );
         }
 
-        SwFrmFmt *pFmt = GetFmt();
-        const SwFmtFrmSize aOldFrmSz( pFmt->GetFrmSize() );
+        SwFrameFormat *pFormat = GetFormat();
+        const SwFormatFrmSize aOldFrmSz( pFormat->GetFrmSize() );
         GetFlyFrm()->ChgSize( aSz );
-        SwFmtFrmSize aFrmSz( pFmt->GetFrmSize() );
+        SwFormatFrmSize aFrmSz( pFormat->GetFrmSize() );
         if ( aFrmSz.GetWidthPercent() || aFrmSz.GetHeightPercent() )
         {
             long nRelWidth, nRelHeight;
@@ -886,7 +886,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             if ( aFrmSz.GetHeightPercent() && aFrmSz.GetHeightPercent() != 0xFF &&
                  aOldFrmSz.GetHeight() != aFrmSz.GetHeight() )
                 aFrmSz.SetHeightPercent( sal_uInt8(aSz.Height() * 100.0 / nRelHeight + 0.5) );
-            pFmt->GetDoc()->SetAttr( aFrmSz, *pFmt );
+            pFormat->GetDoc()->SetAttr( aFrmSz, *pFormat );
         }
     }
 
@@ -922,7 +922,7 @@ void SwVirtFlyDrawObj::Move(const Size& rSiz)
 {
     NbcMove( rSiz );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::Resize(const Point& rRef,
@@ -930,14 +930,14 @@ void SwVirtFlyDrawObj::Resize(const Point& rRef,
 {
     NbcResize( rRef, xFact, yFact );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
     NbcCrop( rRef, xFact, yFact );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const
@@ -967,17 +967,17 @@ Pointer  SwVirtFlyDrawObj::GetMacroPointer(
 
 bool SwVirtFlyDrawObj::HasMacro() const
 {
-    const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
     return rURL.GetMap() || !rURL.GetURL().isEmpty();
 }
 
 SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) const
 {
-    const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
     if( rURL.GetMap() || !rURL.GetURL().isEmpty() )
     {
         SwRect aRect;
-        if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
+        if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
         {
             aRect = pFlyFrm->Prt();
             aRect += pFlyFrm->Frm().Pos();
@@ -995,7 +995,7 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons
             if( aRect.IsInside( rRec.aPos ) )
             {
                 if( !rURL.GetMap() ||
-                    pFlyFrm->GetFmt()->GetIMapObject( rRec.aPos, pFlyFrm ))
+                    pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, pFlyFrm ))
                     return (SdrObject*)this;
 
                 return 0;
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 091ff77c3813..fe774a1ce1ca 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -111,7 +111,7 @@ SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, size_t nObjNum )
     OSL_ENSURE( pOld, "Oups, Object not replaced" );
     SdrObjUserCall* pContact;
     if ( 0 != ( pContact = GetUserCall(pOld) ) &&
-         RES_DRAWFRMFMT == static_cast<SwContact*>(pContact)->GetFmt()->Which())
+         RES_DRAWFRMFMT == static_cast<SwContact*>(pContact)->GetFormat()->Which())
         static_cast<SwDrawContact*>(pContact)->ChangeMasterObject( pNewObj );
     return FmFormPage::ReplaceObject( pNewObj, nObjNum );
 }
@@ -188,23 +188,23 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
              pObj->ISA(SwVirtFlyDrawObj) )
         {
             SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
-            const SwFmtURL &rURL = pFly->GetFmt()->GetURL();
-            OUString sTxt;
+            const SwFormatURL &rURL = pFly->GetFormat()->GetURL();
+            OUString sText;
             if( rURL.GetMap() )
             {
-                IMapObject *pTmpObj = pFly->GetFmt()->GetIMapObject( aPos, pFly );
+                IMapObject *pTmpObj = pFly->GetFormat()->GetIMapObject( aPos, pFly );
                 if( pTmpObj )
                 {
-                    sTxt = pTmpObj->GetAltText();
-                    if ( sTxt.isEmpty() )
-                        sTxt = URIHelper::removePassword( pTmpObj->GetURL(),
+                    sText = pTmpObj->GetAltText();
+                    if ( sText.isEmpty() )
+                        sText = URIHelper::removePassword( pTmpObj->GetURL(),
                                         INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
                 }
             }
             else if ( !rURL.GetURL().isEmpty() )
             {
-                sTxt = URIHelper::removePassword( rURL.GetURL(),
+                sText = URIHelper::removePassword( rURL.GetURL(),
                                         INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
 
@@ -217,12 +217,12 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
                     // without MapMode-Offset, without Offset, w ... !!!!!
                     aPt = pWindow->LogicToPixel(
                             aPt, MapMode( MAP_TWIP ) );
-                    sTxt += "?" + OUString::number( aPt.getX() )
+                    sText += "?" + OUString::number( aPt.getX() )
                           + "," + OUString::number( aPt.getY() );
                 }
             }
 
-            if ( !sTxt.isEmpty() )
+            if ( !sText.isEmpty() )
             {
                 // #i80029#
                 bool bExecHyperlinks = pDoc->GetDocShell()->IsReadOnly();
@@ -232,20 +232,20 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
                     bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
                     if ( !bExecHyperlinks )
-                        sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sText;
                     else
-                        sTxt = SwViewShell::GetShellRes()->aLinkClick + ": " + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkClick + ": " + sText;
                 }
 
                 if( rEvt.GetMode() & HelpEventMode::BALLOON )
                 {
-                    Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sTxt );
+                    Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sText );
                 }
                 else
                 {
                     // then display the help:
                     Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
-                    Help::ShowQuickHelp( pWindow, aRect, sTxt );
+                    Help::ShowQuickHelp( pWindow, aRect, sText );
                 }
                 bContinue = false;
             }
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 4361ade375a0..0f005b878951 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -145,9 +145,9 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt
 
         if(pSwVirtFlyDrawObj)
         {
-            if(pSwVirtFlyDrawObj->GetFlyFrm()->Lower() && pSwVirtFlyDrawObj->GetFlyFrm()->Lower()->IsNoTxtFrm())
+            if(pSwVirtFlyDrawObj->GetFlyFrm()->Lower() && pSwVirtFlyDrawObj->GetFlyFrm()->Lower()->IsNoTextFrm())
             {
-                // the old method used IsNoTxtFrm (should be for SW's own OLE and
+                // the old method used IsNoTextFrm (should be for SW's own OLE and
                 // graphic's) to accept hit only based on outer bounds; nothing to do
             }
             else
@@ -209,13 +209,13 @@ void SwDrawView::AddCustomHdl()
 
     SdrObject *pObj = rMrkList.GetMark(0)->GetMarkedSdrObj();
     // make code robust
-    SwFrmFmt* pFrmFmt( ::FindFrmFmt( pObj ) );
-    if ( !pFrmFmt )
+    SwFrameFormat* pFrameFormat( ::FindFrameFormat( pObj ) );
+    if ( !pFrameFormat )
     {
         OSL_FAIL( "<SwDrawView::AddCustomHdl()> - missing frame format!" );
         return;
     }
-    const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
+    const SwFormatAnchor &rAnchor = pFrameFormat->GetAnchor();
 
     if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         return;
@@ -536,8 +536,8 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
          ( !bMovedForward && nNewPos > 0 ) )
     {
         size_t nTmpNewPos( nNewPos );
-        const SwFrmFmt* pParentFrmFmt =
-                pParentAnchoredObj ? &(pParentAnchoredObj->GetFrmFmt()) : 0L;
+        const SwFrameFormat* pParentFrameFormat =
+                pParentAnchoredObj ? &(pParentAnchoredObj->GetFrameFormat()) : 0L;
         const SdrObject* pTmpObj = pDrawPage->GetObj( nNewPos + 1 );
         while ( pTmpObj )
         {
@@ -549,7 +549,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             if ( pTmpParentObj &&
-                 &(pTmpParentObj->GetFrmFmt()) != pParentFrmFmt )
+                 &(pTmpParentObj->GetFrameFormat()) != pParentFrameFormat )
             {
                 if ( bMovedForward )
                 {
@@ -717,12 +717,12 @@ const SwFrm* SwDrawView::CalcAnchor()
 
     if ( aPt != aMyPt )
     {
-        if ( pAnch && pAnch->IsCntntFrm() )
+        if ( pAnch && pAnch->IsContentFrm() )
         {
             // allow drawing objects in header/footer,
             // but exclude control objects.
             bool bBodyOnly = CheckControlLayer( pObj );
-            pAnch = ::FindAnchor( static_cast<const SwCntntFrm*>(pAnch), aPt, bBodyOnly );
+            pAnch = ::FindAnchor( static_cast<const SwContentFrm*>(pAnch), aPt, bBodyOnly );
         }
         else if ( !bFly )
         {
@@ -825,9 +825,9 @@ void SwDrawView::CheckPossibilities()
             if ( pFly  )
             {
                 pFrm = pFly->GetAnchorFrm();
-                if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+                if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
                 {
-                    SwOLENode *pNd = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pFly->Lower()))->GetNode()->GetOLENode();
+                    SwOLENode *pNd = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pFly->Lower()))->GetNode()->GetOLENode();
                     if ( pNd )
                     {
                         uno::Reference < embed::XEmbeddedObject > xObj = pNd->GetOLEObj().GetOleRef();
@@ -842,7 +842,7 @@ void SwDrawView::CheckPossibilities()
                             // #i972: protect position if it is a Math object anchored 'as char' and baseline alignment is activated
                             SwDoc* pDoc = Imp().GetShell()->GetDoc();
                             const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )
-                                    && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId()
+                                    && FLY_AS_CHAR == pFly->GetFormat()->GetAnchor().GetAnchorId()
                                     && pDoc->GetDocumentSettingManager().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT );
                             if (bProtectMathPos)
                                 bMoveProtect = true;
@@ -860,13 +860,13 @@ void SwDrawView::CheckPossibilities()
         if ( pFrm )
             bProtect = pFrm->IsProtected(); //Frames, areas etc.
         {
-            SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
-            if ( !pFrmFmt )
+            SwFrameFormat* pFrameFormat( ::FindFrameFormat( const_cast<SdrObject*>(pObj) ) );
+            if ( !pFrameFormat )
             {
                 OSL_FAIL( "<SwDrawView::CheckPossibilities()> - missing frame format" );
                 bProtect = true;
             }
-            else if ((FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId()) &&
+            else if ((FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId()) &&
                       rMrkList.GetMarkCount() > 1 )
             {
                 bProtect = true;
@@ -941,13 +941,13 @@ void SwDrawView::DeleteMarked()
 
     // Check what textboxes have to be deleted afterwards.
     const SdrMarkList& rMarkList = GetMarkedObjectList();
-    std::vector<SwFrmFmt*> aTextBoxesToDelete;
+    std::vector<SwFrameFormat*> aTextBoxesToDelete;
     for (size_t i = 0; i < rMarkList.GetMarkCount(); ++i)
     {
         SdrObject *pObject = rMarkList.GetMark(i)->GetMarkedSdrObj();
         SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(GetUserCall(pObject));
-        SwFrmFmt* pFmt = pDrawContact->GetFmt();
-        if (SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pFmt))
+        SwFrameFormat* pFormat = pDrawContact->GetFormat();
+        if (SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(pFormat))
             aTextBoxesToDelete.push_back(pTextBox);
     }
 
@@ -957,8 +957,8 @@ void SwDrawView::DeleteMarked()
         ::FrameNotify( Imp().GetShell(), FLY_DRAG_END );
 
         // Only delete these now: earlier deletion would clear the mark list as well.
-        for (std::vector<SwFrmFmt*>::iterator i = aTextBoxesToDelete.begin(); i != aTextBoxesToDelete.end(); ++i)
-            pDoc->getIDocumentLayoutAccess().DelLayoutFmt(*i);
+        for (std::vector<SwFrameFormat*>::iterator i = aTextBoxesToDelete.begin(); i != aTextBoxesToDelete.end(); ++i)
+            pDoc->getIDocumentLayoutAccess().DelLayoutFormat(*i);
     }
     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
     if( pTmpRoot )
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index c986957dd218..d3281eb391c2 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -101,7 +101,7 @@ SwAutoCorrDoc::~SwAutoCorrDoc()
 void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam )
 {
     SwDoc* pDoc = rEditSh.GetDoc();
-    if( pDoc->IsAutoFmtRedline() )
+    if( pDoc->IsAutoFormatRedline() )
     {
         // so that also the DelPam be moved,  include it in the
         // Shell-Cursr-Ring !!
@@ -125,14 +125,14 @@ bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd )
     return true;
 }
 
-bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt )
+bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rText )
 {
     SwPaM aPam( rCrsr.GetPoint()->nNode.GetNode(), nPos );
-    rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rTxt );
+    rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rText );
     if( !bUndoIdInitialized )
     {
         bUndoIdInitialized = true;
-        if( 1 == rTxt.getLength() )
+        if( 1 == rText.getLength() )
         {
             rEditSh.StartUndo( UNDO_AUTOCORRECT );
             ++m_nEndUndoCounter;
@@ -141,12 +141,12 @@ bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt )
     return true;
 }
 
-bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rTxt )
+bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rText )
 {
-    return ReplaceRange( nPos, rTxt.getLength(), rTxt );
+    return ReplaceRange( nPos, rText.getLength(), rText );
 }
 
-bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt )
+bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rText )
 {
     SwPaM* pPam = &rCrsr;
     if( pPam->GetPoint()->nContent.GetIndex() != nPos )
@@ -155,7 +155,7 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
         pPam->GetPoint()->nContent = nPos;
     }
 
-    SwTxtNode * const pNd = pPam->GetNode().GetTxtNode();
+    SwTextNode * const pNd = pPam->GetNode().GetTextNode();
     if ( !pNd )
     {
         return false;
@@ -163,12 +163,12 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 
     // text attributes with dummy characters must not be replaced!
     bool bDoReplace = true;
-    sal_Int32 const nLen = rTxt.getLength();
+    sal_Int32 const nLen = rText.getLength();
     for ( sal_Int32 n = 0; n < nLen; ++n )
     {
-        sal_Unicode const Char = pNd->GetTxt()[n + nPos];
+        sal_Unicode const Char = pNd->GetText()[n + nPos];
         if ( ( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char )
-             && pNd->GetTxtAttrForCharAt( n + nPos ) )
+             && pNd->GetTextAttrForCharAt( n + nPos ) )
         {
             bDoReplace = false;
             break;
@@ -179,11 +179,11 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
     {
         SwDoc* pDoc = rEditSh.GetDoc();
 
-        if( pDoc->IsAutoFmtRedline() )
+        if( pDoc->IsAutoFormatRedline() )
         {
-            if (nPos == pNd->GetTxt().getLength()) // at the End do an Insert
+            if (nPos == pNd->GetText().getLength()) // at the End do an Insert
             {
-                pDoc->getIDocumentContentOperations().InsertString( *pPam, rTxt );
+                pDoc->getIDocumentContentOperations().InsertString( *pPam, rText );
             }
             else
             {
@@ -191,31 +191,31 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 
                 pPam->SetMark();
                 pPam->GetPoint()->nContent = std::min<sal_Int32>(
-                        pNd->GetTxt().getLength(), nPos + nSourceLength);
-                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rTxt, false );
+                        pNd->GetText().getLength(), nPos + nSourceLength);
+                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rText, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
             }
         }
         else
         {
-            if( nSourceLength != rTxt.getLength() )
+            if( nSourceLength != rText.getLength() )
             {
                 pPam->SetMark();
                 pPam->GetPoint()->nContent = std::min<sal_Int32>(
-                        pNd->GetTxt().getLength(), nPos + nSourceLength);
-                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rTxt, false );
+                        pNd->GetText().getLength(), nPos + nSourceLength);
+                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rText, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
             }
             else
-                pDoc->getIDocumentContentOperations().Overwrite( *pPam, rTxt );
+                pDoc->getIDocumentContentOperations().Overwrite( *pPam, rText );
         }
 
         if( bUndoIdInitialized )
         {
             bUndoIdInitialized = true;
-            if( 1 == rTxt.getLength() )
+            if( 1 == rText.getLength() )
             {
                 rEditSh.StartUndo( UNDO_AUTOCORRECT );
                 ++m_nEndUndoCounter;
@@ -241,10 +241,10 @@ bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
     {
         rItem.SetWhich( nWhich );
 
-        SfxItemSet aSet( rPool, aCharFmtSetRange );
+        SfxItemSet aSet( rPool, aCharFormatSetRange );
         SetAllScriptItem( aSet, rItem );
 
-        rEditSh.GetDoc()->SetFmtItemByAutoFmt( aPam, aSet );
+        rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
 
         if( bUndoIdInitialized )
             bUndoIdInitialized = true;
@@ -259,8 +259,8 @@ bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString&
 
     SfxItemSet aSet( rEditSh.GetDoc()->GetAttrPool(),
                         RES_TXTATR_INETFMT, RES_TXTATR_INETFMT );
-    aSet.Put( SwFmtINetFmt( rURL, OUString() ));
-    rEditSh.GetDoc()->SetFmtItemByAutoFmt( aPam, aSet );
+    aSet.Put( SwFormatINetFormat( rURL, OUString() ));
+    rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
     if( bUndoIdInitialized )
         bUndoIdInitialized = true;
     return true;
@@ -281,14 +281,14 @@ OUString const* SwAutoCorrDoc::GetPrevPara(bool const bAtNormalPos)
     else
         --(*pIdx);
 
-    SwTxtNode* pTNd = pIdx->GetNode().GetTxtNode();
-    while (pTNd && !pTNd->GetTxt().getLength())
+    SwTextNode* pTNd = pIdx->GetNode().GetTextNode();
+    while (pTNd && !pTNd->GetText().getLength())
     {
         --(*pIdx);
-        pTNd = pIdx->GetNode().GetTxtNode();
+        pTNd = pIdx->GetNode().GetTextNode();
     }
     if( pTNd && 0 == pTNd->GetAttrOutlineLevel() )
-        pStr = & pTNd->GetTxt();
+        pStr = & pTNd->GetText();
 
     if( bUndoIdInitialized )
         bUndoIdInitialized = true;
@@ -305,8 +305,8 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
     // Found a beginning of a paragraph or a Blank,
     // search for the word Kuerzel (Shortcut) in the Auto
-    SwTxtNode* pTxtNd = rCrsr.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "where is the TextNode?" );
+    SwTextNode* pTextNd = rCrsr.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "where is the TextNode?" );
 
     bool bRet = false;
     if( nEndPos == rSttPos )
@@ -318,11 +318,11 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
     LanguageTag aLanguageTag( eLang);
 
     //JP 22.04.99: Bug 63883 - Special treatment for dots.
-    bool bLastCharIsPoint = nEndPos < pTxtNd->GetTxt().getLength() &&
-                            ('.' == pTxtNd->GetTxt()[nEndPos]);
+    bool bLastCharIsPoint = nEndPos < pTextNd->GetText().getLength() &&
+                            ('.' == pTextNd->GetText()[nEndPos]);
 
     const SvxAutocorrWord* pFnd = rACorrect.SearchWordsInList(
-                                pTxtNd->GetTxt(), rSttPos, nEndPos, *this, aLanguageTag );
+                                pTextNd->GetText(), rSttPos, nEndPos, *this, aLanguageTag );
     SwDoc* pDoc = rEditSh.GetDoc();
     if( pFnd )
     {
@@ -347,7 +347,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
             if( USHRT_MAX != nPos && aTBlks.BeginGetDoc( nPos ) )
             {
                 DeleteSel( aPam );
-                pDoc->DontExpandFmt( *aPam.GetPoint() );
+                pDoc->DontExpandFormat( *aPam.GetPoint() );
 
                 if( pPara )
                 {
@@ -357,22 +357,22 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
                 SwDoc* pAutoDoc = aTBlks.GetDoc();
                 SwNodeIndex aSttIdx( pAutoDoc->GetNodes().GetEndOfExtras(), 1 );
-                SwCntntNode* pCntntNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
+                SwContentNode* pContentNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
                 SwPaM aCpyPam( aSttIdx );
 
-                const SwTableNode* pTblNd = pCntntNd->FindTableNode();
-                if( pTblNd )
+                const SwTableNode* pTableNd = pContentNd->FindTableNode();
+                if( pTableNd )
                 {
                     aCpyPam.GetPoint()->nContent.Assign( 0, 0 );
-                    aCpyPam.GetPoint()->nNode = *pTblNd;
+                    aCpyPam.GetPoint()->nNode = *pTableNd;
                 }
                 aCpyPam.SetMark();
 
                 // then until the end of the Nodes Array
                 aCpyPam.GetPoint()->nNode.Assign( pAutoDoc->GetNodes().GetEndOfContent(), -1 );
-                pCntntNd = aCpyPam.GetCntntNode();
+                pContentNd = aCpyPam.GetContentNode();
                 aCpyPam.GetPoint()->nContent.Assign(
-                       pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0);
+                       pContentNd, (pContentNd) ? pContentNd->Len() : 0);
 
                 SwDontExpandItem aExpItem;
                 aExpItem.SaveDontExpandItems( *aPam.GetPoint() );
@@ -384,7 +384,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
                 if( pPara )
                 {
                     ++(*pIdx);
-                    pTxtNd = pIdx->GetNode().GetTxtNode();
+                    pTextNd = pIdx->GetNode().GetTextNode();
                 }
                 bRet = true;
             }
@@ -392,8 +392,8 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
         }
     }
 
-    if( bRet && pPara && pTxtNd )
-        *pPara = pTxtNd->GetTxt();
+    if( bRet && pPara && pTextNd )
+        *pPara = pTextNd->GetText();
 
     return bRet;
 }
@@ -417,9 +417,9 @@ LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool bPrevPara ) const
 {
     LanguageType eRet = LANGUAGE_SYSTEM;
 
-    SwTxtNode* pNd = (( bPrevPara && pIdx )
+    SwTextNode* pNd = (( bPrevPara && pIdx )
                             ? *pIdx
-                            : rCrsr.GetPoint()->nNode ).GetNode().GetTxtNode();
+                            : rCrsr.GetPoint()->nNode ).GetNode().GetTextNode();
 
     if( pNd )
         eRet = pNd->GetLang( nPos, 0 );
@@ -460,35 +460,35 @@ SwDontExpandItem::~SwDontExpandItem()
 
 void SwDontExpandItem::SaveDontExpandItems( const SwPosition& rPos )
 {
-    const SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    const SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        pDontExpItems = new SfxItemSet( const_cast<SwDoc*>(pTxtNd->GetDoc())->GetAttrPool(),
-                                            aCharFmtSetRange );
+        pDontExpItems = new SfxItemSet( const_cast<SwDoc*>(pTextNd->GetDoc())->GetAttrPool(),
+                                            aCharFormatSetRange );
         const sal_Int32 n = rPos.nContent.GetIndex();
-        if( !pTxtNd->GetAttr( *pDontExpItems, n, n,
-                                n != pTxtNd->GetTxt().getLength() ))
+        if( !pTextNd->GetAttr( *pDontExpItems, n, n,
+                                n != pTextNd->GetText().getLength() ))
             delete pDontExpItems, pDontExpItems = 0;
     }
 }
 
 void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
         const sal_Int32 nStart = rPos.nContent.GetIndex();
-        if( nStart == pTxtNd->GetTxt().getLength() )
-            pTxtNd->FmtToTxtAttr( pTxtNd );
+        if( nStart == pTextNd->GetText().getLength() )
+            pTextNd->FormatToTextAttr( pTextNd );
 
-        if( pTxtNd->GetpSwpHints() && pTxtNd->GetpSwpHints()->Count() )
+        if( pTextNd->GetpSwpHints() && pTextNd->GetpSwpHints()->Count() )
         {
-            const size_t nSize = pTxtNd->GetpSwpHints()->Count();
+            const size_t nSize = pTextNd->GetpSwpHints()->Count();
             sal_Int32 nAttrStart;
 
             for( size_t n = 0; n < nSize; ++n )
             {
-                SwTxtAttr* pHt = pTxtNd->GetpSwpHints()->GetTextHint( n );
+                SwTextAttr* pHt = pTextNd->GetpSwpHints()->GetTextHint( n );
                 nAttrStart = pHt->GetStart();
                 if( nAttrStart > nStart )       // beyond the area
                     break;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 729a37529eca..af48083d1141 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -81,7 +81,7 @@ const int cnPosEnDash = 2, cnPosEmDash = 4;
 const sal_Unicode cStarSymbolEnDash = 0x2013;
 const sal_Unicode cStarSymbolEmDash = 0x2014;
 
-SvxSwAutoFmtFlags* SwEditShell::s_pAutoFmtFlags = nullptr;
+SvxSwAutoFormatFlags* SwEditShell::s_pAutoFormatFlags = nullptr;
 
 // Number of num-/bullet-paragraph templates. MAXLEVEL will soon be raised
 // to x, but not the number of templates. (Artifact from <= 4.0)
@@ -89,21 +89,21 @@ const sal_uInt16 cnNumBullColls = 4;
 
 class SwAutoFormat
 {
-    SvxSwAutoFmtFlags m_aFlags;
+    SvxSwAutoFormatFlags m_aFlags;
     SwPaM m_aDelPam;            // a Pam that can be used
     SwNodeIndex m_aNdIdx;       // the index on the current TextNode
     SwNodeIndex m_aEndNdIdx;    // index on the end of the area
 
     SwEditShell* m_pEditShell;
     SwDoc* m_pDoc;
-    SwTxtNode* m_pCurTxtNd;     // the current TextNode
-    SwTxtFrm* m_pCurTxtFrm;     // frame of the current TextNode
+    SwTextNode* m_pCurTextNd;     // the current TextNode
+    SwTextFrm* m_pCurTextFrm;     // frame of the current TextNode
     sal_uLong m_nEndNdIdx;      // for the percentage-display
     mutable boost::scoped_ptr<CharClass> m_pCharClass; // Character classification
     mutable LanguageType m_eCharClassLang;
 
     sal_uInt16 m_nLastHeadLvl, m_nLastCalcHeadLvl;
-    sal_uInt16 m_nRedlAutoFmtSeqId;
+    sal_uInt16 m_nRedlAutoFormatSeqId;
 
     enum
     {
@@ -154,18 +154,18 @@ class SwAutoFormat
     OUString GoNextPara();
     bool HasObjects( const SwNode& rNd );
 
-    // TxtNode methods
-    const SwTxtNode* GetNextNode() const;
-    static bool IsEmptyLine( const SwTxtNode& rNd )
-        {   return rNd.GetTxt().isEmpty() ||
-                rNd.GetTxt().getLength() == GetLeadingBlanks( rNd.GetTxt() ); }
-
-    bool IsOneLine( const SwTxtNode& ) const;
-    bool IsFastFullLine( const SwTxtNode& ) const;
-    bool IsNoAlphaLine( const SwTxtNode&) const;
-    bool IsEnumericChar( const SwTxtNode&) const;
-    static bool IsBlanksInString( const SwTxtNode&);
-    sal_uInt16 CalcLevel( const SwTxtNode&, sal_uInt16 *pDigitLvl = 0 ) const;
+    // TextNode methods
+    const SwTextNode* GetNextNode() const;
+    static bool IsEmptyLine( const SwTextNode& rNd )
+        {   return rNd.GetText().isEmpty() ||
+                rNd.GetText().getLength() == GetLeadingBlanks( rNd.GetText() ); }
+
+    bool IsOneLine( const SwTextNode& ) const;
+    bool IsFastFullLine( const SwTextNode& ) const;
+    bool IsNoAlphaLine( const SwTextNode&) const;
+    bool IsEnumericChar( const SwTextNode&) const;
+    static bool IsBlanksInString( const SwTextNode&);
+    sal_uInt16 CalcLevel( const SwTextNode&, sal_uInt16 *pDigitLvl = 0 ) const;
     sal_Int32 GetBigIndent( sal_Int32& rAktSpacePos ) const;
 
     static OUString DelLeadingBlanks(const OUString& rStr);
@@ -173,12 +173,12 @@ class SwAutoFormat
     static sal_Int32 GetLeadingBlanks( const OUString& rStr );
     static sal_Int32 GetTrailingBlanks( const OUString& rStr );
 
-    bool IsFirstCharCapital( const SwTxtNode& rNd ) const;
-    sal_uInt16 GetDigitLevel( const SwTxtNode& rTxtNd, sal_Int32& rPos,
+    bool IsFirstCharCapital( const SwTextNode& rNd ) const;
+    sal_uInt16 GetDigitLevel( const SwTextNode& rTextNd, sal_Int32& rPos,
                             OUString* pPrefix = 0, OUString* pPostfix = 0,
                             OUString* pNumTypes = 0 ) const;
     /// get the FORMATED TextFrame
-    SwTxtFrm* GetFrm( const SwTxtNode& rTxtNd ) const;
+    SwTextFrm* GetFrm( const SwTextNode& rTextNd ) const;
 
     void BuildIndent();
     void BuildText();
@@ -188,7 +188,7 @@ class SwAutoFormat
     void BuildHeadLine( sal_uInt16 nLvl );
 
     static bool HasSelBlanks( SwPaM& rPam );
-    static bool HasBreakAttr( const SwTxtNode& );
+    static bool HasBreakAttr( const SwTextNode& );
     void DeleteSel( SwPaM& rPam );
     bool DeleteCurNxtPara( const OUString& rNxtPara );
     /// delete in the node start and/or end
@@ -202,31 +202,31 @@ class SwAutoFormat
     /// execute AutoCorrect on current TextNode
     void AutoCorrect( sal_Int32 nSttPos = 0 );
 
-    bool CanJoin( const SwTxtNode* pTxtNd ) const
+    bool CanJoin( const SwTextNode* pTextNd ) const
     {
-        return !m_bEnd && pTxtNd &&
-             !IsEmptyLine( *pTxtNd ) &&
-             !IsNoAlphaLine( *pTxtNd) &&
-             !IsEnumericChar( *pTxtNd ) &&
-             ((COMPLETE_STRING - 50 - pTxtNd->GetTxt().getLength()) >
-                    m_pCurTxtNd->GetTxt().getLength()) &&
-             !HasBreakAttr( *pTxtNd );
+        return !m_bEnd && pTextNd &&
+             !IsEmptyLine( *pTextNd ) &&
+             !IsNoAlphaLine( *pTextNd) &&
+             !IsEnumericChar( *pTextNd ) &&
+             ((COMPLETE_STRING - 50 - pTextNd->GetText().getLength()) >
+                    m_pCurTextNd->GetText().getLength()) &&
+             !HasBreakAttr( *pTextNd );
     }
 
     /// is a dot at the end ??
-    static bool IsSentenceAtEnd( const SwTxtNode& rTxtNd );
+    static bool IsSentenceAtEnd( const SwTextNode& rTextNd );
 
     bool DoUnderline();
     bool DoTable();
 
-    void _SetRedlineTxt( sal_uInt16 nId );
-    bool SetRedlineTxt( sal_uInt16 nId )
-        { if( m_aFlags.bWithRedlining )   _SetRedlineTxt( nId );  return true; }
-    bool ClearRedlineTxt()
-        { if( m_aFlags.bWithRedlining )   m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment(0);  return true; }
+    void _SetRedlineText( sal_uInt16 nId );
+    bool SetRedlineText( sal_uInt16 nId )
+        { if( m_aFlags.bWithRedlining )   _SetRedlineText( nId );  return true; }
+    bool ClearRedlineText()
+        { if( m_aFlags.bWithRedlining )   m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment(0);  return true; }
 
 public:
-    SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
+    SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
                 SwNodeIndex* pSttNd = 0, SwNodeIndex* pEndNd = 0 );
 };
 
@@ -237,30 +237,30 @@ const sal_Unicode* StrChr( const sal_Unicode* pSrc, sal_Unicode c )
     return *pSrc ? pSrc : 0;
 }
 
-SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
+SwTextFrm* SwAutoFormat::GetFrm( const SwTextNode& rTextNd ) const
 {
     // get the Frame
-    const SwCntntFrm *pFrm = rTxtNd.getLayoutFrm( m_pEditShell->GetLayout() );
+    const SwContentFrm *pFrm = rTextNd.getLayoutFrm( m_pEditShell->GetLayout() );
     OSL_ENSURE( pFrm, "For Autoformat a Layout is needed" );
-    if( m_aFlags.bAFmtByInput && !pFrm->IsValid() )
+    if( m_aFlags.bAFormatByInput && !pFrm->IsValid() )
     {
         SwRect aTmpFrm( pFrm->Frm() );
         SwRect aTmpPrt( pFrm->Prt() );
         pFrm->Calc();
         if( pFrm->Frm() != aTmpFrm || pFrm->Prt() != aTmpPrt ||
-            ( pFrm->IsTxtFrm() && !const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->Paint().IsEmpty() ) )
+            ( pFrm->IsTextFrm() && !const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->Paint().IsEmpty() ) )
             pFrm->SetCompletePaint();
     }
-    return const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->GetFormatted();
+    return const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->GetFormatted();
 }
 
-void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
+void SwAutoFormat::_SetRedlineText( sal_uInt16 nActionId )
 {
-    OUString sTxt;
+    OUString sText;
     sal_uInt16 nSeqNo = 0;
     if( STR_AUTOFMTREDL_END > nActionId )
     {
-        sTxt = SwViewShell::GetShellRes()->GetAutoFmtNameLst()[ nActionId ];
+        sText = SwViewShell::GetShellRes()->GetAutoFormatNameLst()[ nActionId ];
         switch( nActionId )
         {
         case STR_AUTOFMTREDL_SET_NUMBULET:
@@ -277,16 +277,16 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
         case STR_AUTOFMTREDL_DASH:
         case STR_AUTOFMTREDL_ORDINAL:
         case STR_AUTOFMTREDL_NON_BREAK_SPACE:
-            nSeqNo = ++m_nRedlAutoFmtSeqId;
+            nSeqNo = ++m_nRedlAutoFormatSeqId;
             break;
         }
     }
 #if OSL_DEBUG_LEVEL > 0
     else
-        sTxt = "Action text is missing";
+        sText = "Action text is missing";
 #endif
 
-    m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment( &sTxt, nSeqNo );
+    m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment( &sText, nSeqNo );
 }
 
 OUString SwAutoFormat::GoNextPara()
@@ -311,7 +311,7 @@ OUString SwAutoFormat::GoNextPara()
 
         // not a TextNode ->
         //      TableNode   : skip table
-        //      NoTxtNode   : skip nodes
+        //      NoTextNode   : skip nodes
         //      EndNode     : at the end, terminate
         if( pNewNd->IsEndNode() )
         {
@@ -326,15 +326,15 @@ OUString SwAutoFormat::GoNextPara()
             if( rSect.IsHiddenFlag() || rSect.IsProtectFlag() )
                 m_aNdIdx = *pNewNd->EndOfSectionNode();
         }
-    } while( !pNewNd->IsTxtNode() );
+    } while( !pNewNd->IsTextNode() );
 
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::SetProgressState( m_aNdIdx.GetIndex() + m_nEndNdIdx - m_aEndNdIdx.GetIndex(),
                             m_pDoc->GetDocShell() );
 
-    m_pCurTxtNd = static_cast<SwTxtNode*>(pNewNd);
-    m_pCurTxtFrm = GetFrm( *m_pCurTxtNd );
-    return m_pCurTxtNd->GetTxt();
+    m_pCurTextNd = static_cast<SwTextNode*>(pNewNd);
+    m_pCurTextFrm = GetFrm( *m_pCurTextNd );
+    return m_pCurTextNd->GetText();
 }
 
 bool SwAutoFormat::HasObjects( const SwNode& rNd )
@@ -342,13 +342,13 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
     // Is there something bound to the paragraph in the paragraph
     // like borders, DrawObjects, ...
     bool bRet = false;
-    const SwFrmFmts& rFmts = *m_pDoc->GetSpzFrmFmts();
-    for( auto pFrmFmt : rFmts )
+    const SwFrameFormats& rFormats = *m_pDoc->GetSpzFrameFormats();
+    for( auto pFrameFormat : rFormats )
     {
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
         if ((FLY_AT_PAGE != rAnchor.GetAnchorId()) &&
-            rAnchor.GetCntntAnchor() &&
-            &rAnchor.GetCntntAnchor()->nNode.GetNode() == &rNd )
+            rAnchor.GetContentAnchor() &&
+            &rAnchor.GetContentAnchor()->nNode.GetNode() == &rNd )
         {
             bRet = true;
             break;
@@ -357,45 +357,45 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
     return bRet;
 }
 
-const SwTxtNode* SwAutoFormat::GetNextNode() const
+const SwTextNode* SwAutoFormat::GetNextNode() const
 {
     if( m_aNdIdx.GetIndex()+1 >= m_aEndNdIdx.GetIndex() )
         return 0;
-    return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTxtNode();
+    return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTextNode();
 }
 
-bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsOneLine( const SwTextNode& rNd ) const
 {
-    SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+    SwTextFrmInfo aFInfo( GetFrm( rNd ) );
     return aFInfo.IsOneLine();
 }
 
-bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsFastFullLine( const SwTextNode& rNd ) const
 {
     bool bRet = m_aFlags.bRightMargin;
     if( bRet )
     {
-        SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+        SwTextFrmInfo aFInfo( GetFrm( rNd ) );
         bRet = aFInfo.IsFilled( m_aFlags.nRightMargin );
     }
     return bRet;
 }
 
-bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsEnumericChar( const SwTextNode& rNd ) const
 {
-    const OUString& rTxt = rNd.GetTxt();
-    sal_Int32 nBlnks = GetLeadingBlanks( rTxt );
-    const sal_Int32 nLen = rTxt.getLength() - nBlnks;
+    const OUString& rText = rNd.GetText();
+    sal_Int32 nBlnks = GetLeadingBlanks( rText );
+    const sal_Int32 nLen = rText.getLength() - nBlnks;
     if( !nLen )
         return false;
 
     // -, +, * separated by blank ??
-    if (2 < nLen && IsSpace(rTxt[nBlnks + 1]))
+    if (2 < nLen && IsSpace(rText[nBlnks + 1]))
     {
-        if (StrChr(pBulletChar, rTxt[nBlnks]))
+        if (StrChr(pBulletChar, rText[nBlnks]))
             return true;
         // Should there be a symbol font at the position?
-        SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+        SwTextFrmInfo aFInfo( GetFrm( rNd ) );
         if( aFInfo.IsBullet( nBlnks ))
             return true;
     }
@@ -404,10 +404,10 @@ bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
     return USHRT_MAX != GetDigitLevel( rNd, nBlnks );
 }
 
-bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd )
+bool SwAutoFormat::IsBlanksInString( const SwTextNode& rNd )
 {
     // Search more than 5 consecutive blanks/tabs in the string.
-    OUString sTmp( DelLeadingBlanks(rNd.GetTxt()) );
+    OUString sTmp( DelLeadingBlanks(rNd.GetText()) );
     const sal_Int32 nLen = sTmp.getLength();
     sal_Int32 nIdx = 0;
     while (nIdx < nLen)
@@ -426,28 +426,28 @@ bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd )
     return false;
 }
 
-sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl ) const
+sal_uInt16 SwAutoFormat::CalcLevel( const SwTextNode& rNd, sal_uInt16 *pDigitLvl ) const
 {
     sal_uInt16 nLvl = 0, nBlnk = 0;
-    const OUString& rTxt = rNd.GetTxt();
+    const OUString& rText = rNd.GetText();
     if( pDigitLvl )
         *pDigitLvl = USHRT_MAX;
 
-    if( RES_POOLCOLL_TEXT_MOVE == rNd.GetTxtColl()->GetPoolFmtId() )
+    if( RES_POOLCOLL_TEXT_MOVE == rNd.GetTextColl()->GetPoolFormatId() )
     {
-        if( m_aFlags.bAFmtByInput )
+        if( m_aFlags.bAFormatByInput )
         {
-            nLvl = rNd.GetAutoFmtLvl();
-            const_cast<SwTxtNode&>(rNd).SetAutoFmtLvl( 0 );
+            nLvl = rNd.GetAutoFormatLvl();
+            const_cast<SwTextNode&>(rNd).SetAutoFormatLvl( 0 );
             if( nLvl )
                 return nLvl;
         }
         ++nLvl;
     }
 
-    for (sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd; ++n)
+    for (sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd; ++n)
     {
-        switch (rTxt[n])
+        switch (rText[n])
         {
         case ' ':   if( 3 == ++nBlnk )
                         ++nLvl, nBlnk = 0;
@@ -466,12 +466,12 @@ sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl
 
 sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
 {
-    SwTxtFrmInfo aFInfo( GetFrm( *m_pCurTxtNd ) );
-    const SwTxtFrm* pNxtFrm = 0;
+    SwTextFrmInfo aFInfo( GetFrm( *m_pCurTextNd ) );
+    const SwTextFrm* pNxtFrm = 0;
 
     if( !m_bMoreLines )
     {
-        const SwTxtNode* pNxtNd = GetNextNode();
+        const SwTextNode* pNxtNd = GetNextNode();
         if( !CanJoin( pNxtNd ) || !IsOneLine( *pNxtNd ) )
             return 0;
 
@@ -481,9 +481,9 @@ sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
     return aFInfo.GetBigIndent( rAktSpacePos, pNxtFrm );
 }
 
-bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsNoAlphaLine( const SwTextNode& rNd ) const
 {
-    const OUString& rStr = rNd.GetTxt();
+    const OUString& rStr = rNd.GetText();
     if( rStr.isEmpty() )
         return false;
     // or better: determine via number of AlphaNum and !AlphaNum characters
@@ -507,13 +507,13 @@ bool SwAutoFormat::DoUnderline()
     if( !m_aFlags.bSetBorder )
         return false;
 
-    OUString const& rTxt(m_pCurTxtNd->GetTxt());
+    OUString const& rText(m_pCurTextNd->GetText());
     int eState = 0;
     sal_Int32 nCnt = 0;
-    while (nCnt < rTxt.getLength())
+    while (nCnt < rText.getLength())
     {
         int eTmp = 0;
-        switch (rTxt[nCnt])
+        switch (rText[nCnt])
         {
             case '-': eTmp = 1; break;
             case '_': eTmp = 2; break;
@@ -584,11 +584,11 @@ bool SwAutoFormat::DoUnderline()
 
 bool SwAutoFormat::DoTable()
 {
-    if( !m_aFlags.bCreateTable || !m_aFlags.bAFmtByInput ||
-        m_pCurTxtNd->FindTableNode() )
+    if( !m_aFlags.bCreateTable || !m_aFlags.bAFormatByInput ||
+        m_pCurTextNd->FindTableNode() )
         return false;
 
-    const OUString& rTmp = m_pCurTxtNd->GetTxt();
+    const OUString& rTmp = m_pCurTextNd->GetText();
     sal_Int32 nSttPlus = GetLeadingBlanks( rTmp );
     sal_Int32 nEndPlus = GetTrailingBlanks( rTmp );
     sal_Unicode cChar;
@@ -598,7 +598,7 @@ bool SwAutoFormat::DoTable()
         ( '+' != ( cChar = rTmp[nEndPlus - 1]) && '|' != cChar ))
         return false;
 
-    SwTxtFrmInfo aInfo( m_pCurTxtFrm );
+    SwTextFrmInfo aInfo( m_pCurTextFrm );
 
     sal_Int32 n = nSttPlus;
     std::vector<sal_uInt16> aPosArr;
@@ -632,7 +632,7 @@ bool SwAutoFormat::DoTable()
         sal_uInt16 nColCnt = aPosArr.size() - 1;
         SwTwips nSttPos = aPosArr[ 0 ];
         sal_Int16 eHori;
-        switch( m_pCurTxtNd->GetSwAttrSet().GetAdjust().GetAdjust() )
+        switch( m_pCurTextNd->GetSwAttrSet().GetAdjust().GetAdjust() )
         {
         case SVX_ADJUST_CENTER:     eHori = text::HoriOrientation::CENTER;    break;
         case SVX_ADJUST_RIGHT:      eHori = text::HoriOrientation::RIGHT;     break;
@@ -642,7 +642,7 @@ bool SwAutoFormat::DoTable()
             {
                 eHori = text::HoriOrientation::NONE;
                 // then - as last - we need to add the current frame width into the array
-                aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTxtFrm->Frm().Width()) );
+                aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTextFrm->Frm().Width()) );
             }
             else
                 eHori = text::HoriOrientation::LEFT;
@@ -705,15 +705,15 @@ sal_Int32 SwAutoFormat::GetTrailingBlanks( const OUString& rStr )
     return ++n;
 }
 
-bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsFirstCharCapital( const SwTextNode& rNd ) const
 {
-    const OUString& rTxt = rNd.GetTxt();
-    for( sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd; ++n )
-        if (!IsSpace(rTxt[n]))
+    const OUString& rText = rNd.GetText();
+    for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd; ++n )
+        if (!IsSpace(rText[n]))
         {
             CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().
                                         GetLanguage().GetLanguage() );
-            sal_Int32 nCharType = rCC.getCharacterType( rTxt, n );
+            sal_Int32 nCharType = rCC.getCharacterType( rText, n );
             return CharClass::isLetterType( nCharType ) &&
                    0 != ( i18n::KCharacterType::UPPER &
                                                     nCharType );
@@ -721,11 +721,11 @@ bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const
     return false;
 }
 
-sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
+sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTextNode& rNd, sal_Int32& rPos,
         OUString* pPrefix, OUString* pPostfix, OUString* pNumTypes ) const
 {
     // check for 1.) / 1. / 1.1.1 / (1). / (1) / ....
-    const OUString& rTxt = rNd.GetTxt();
+    const OUString& rText = rNd.GetText();
     sal_Int32 nPos = rPos;
     int eScan = NONE;
 
@@ -737,9 +737,9 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
 
     CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().GetLanguage().GetLanguage() );
 
-    while (nPos < rTxt.getLength() && nDigitLvl < MAXLEVEL - 1)
+    while (nPos < rText.getLength() && nDigitLvl < MAXLEVEL - 1)
     {
-        const sal_Unicode cCurrentChar = rTxt[nPos];
+        const sal_Unicode cCurrentChar = rText[nPos];
         if( ('0' <= cCurrentChar &&  '9' >= cCurrentChar) ||
             (0xff10 <= cCurrentChar &&  0xff19 >= cCurrentChar) )
         {
@@ -771,12 +771,12 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
             nStart *= 10;
             nStart += cCurrentChar <= '9' ? cCurrentChar - '0' : cCurrentChar - 0xff10;
         }
-        else if( rCC.isAlpha( rTxt, nPos ) )
+        else if( rCC.isAlpha( rText, nPos ) )
         {
             bool bIsUpper =
                 0 != ( i18n::KCharacterType::UPPER &
-                                        rCC.getCharacterType( rTxt, nPos ));
-            sal_Unicode cLow = rCC.lowercase(rTxt, nPos, 1)[0], cNumTyp;
+                                        rCC.getCharacterType( rText, nPos ));
+            sal_Unicode cLow = rCC.lowercase(rText, nPos, 1)[0], cNumTyp;
             int eTmpScan;
 
             // Roman numbers are "mdclxvi". Since we want to start numbering with c or d more often,
@@ -927,9 +927,9 @@ CHECK_ROMAN_5:
                 nClosingParentheses++;
             // only if no numbers were read until here
             if( pPrefix && !( eScan & ( NO_DELIM | CHG )) )
-                *pPrefix += OUString(rTxt[nPos]);
+                *pPrefix += OUString(rText[nPos]);
             else if( pPostfix )
-                *pPostfix += OUString(rTxt[nPos]);
+                *pPostfix += OUString(rText[nPos]);
 
             if( NO_DELIM & eScan )
             {
@@ -947,7 +947,7 @@ CHECK_ROMAN_5:
         ++nPos;
     }
     if( !( CHG & eScan ) || rPos == nPos ||
-        nPos == rTxt.getLength() || !IsSpace(rTxt[nPos]) ||
+        nPos == rText.getLength() || !IsSpace(rText[nPos]) ||
         (nOpeningParentheses > nClosingParentheses))
         return USHRT_MAX;
 
@@ -962,7 +962,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
 {
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
     // keep hard tabs, alignment, language, hyphenation, DropCaps and nearly all frame attributes
     SfxItemSet aSet( m_pDoc->GetAttrPool(),
@@ -972,9 +972,9 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
                         RES_BACKGROUND, RES_SHADOW,
                         0 );
 
-    if( m_pCurTxtNd->HasSwAttrSet() )
+    if( m_pCurTextNd->HasSwAttrSet() )
     {
-        aSet.Put( *m_pCurTxtNd->GetpSwAttrSet() );
+        aSet.Put( *m_pCurTextNd->GetpSwAttrSet() );
         // take HeaderLine/TextBody only if centered or right aligned, otherwise only justification
         SvxAdjustItem const * pAdj;
         if( SfxItemState::SET == aSet.GetItemState( RES_PARATR_ADJUST,
@@ -988,7 +988,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
         }
     }
 
-    m_pDoc->SetTxtFmtCollByAutoFmt( *m_aDelPam.GetPoint(), nId, &aSet );
+    m_pDoc->SetTextFormatCollByAutoFormat( *m_aDelPam.GetPoint(), nId, &aSet );
 }
 
 bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
@@ -997,17 +997,17 @@ bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
     // Do not delete it, it will be inserted again.
     SwPosition * pPos = rPam.End();
     sal_Int32 nBlnkPos = pPos->nContent.GetIndex();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    if (nBlnkPos && nBlnkPos-- < pTxtNd->GetTxt().getLength() &&
-        (' ' == pTxtNd->GetTxt()[nBlnkPos]))
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    if (nBlnkPos && nBlnkPos-- < pTextNd->GetText().getLength() &&
+        (' ' == pTextNd->GetText()[nBlnkPos]))
         --pPos->nContent;
     else
     {
         pPos = rPam.GetPoint() == pPos ? rPam.GetMark() : rPam.GetPoint();
         nBlnkPos = pPos->nContent.GetIndex();
-        pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        if (nBlnkPos < pTxtNd->GetTxt().getLength() &&
-            (' ' == pTxtNd->GetTxt()[nBlnkPos]))
+        pTextNd = pPos->nNode.GetNode().GetTextNode();
+        if (nBlnkPos < pTextNd->GetText().getLength() &&
+            (' ' == pTextNd->GetText()[nBlnkPos]))
             ++pPos->nContent;
         else
             return false;
@@ -1015,28 +1015,28 @@ bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
     return true;
 }
 
-bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd )
+bool SwAutoFormat::HasBreakAttr( const SwTextNode& rTextNd )
 {
-    const SfxItemSet* pSet = rTxtNd.GetpSwAttrSet();
+    const SfxItemSet* pSet = rTextNd.GetpSwAttrSet();
     if( !pSet )
         return false;
 
     const SfxPoolItem* pItem;
     if( SfxItemState::SET == pSet->GetItemState( RES_BREAK, false, &pItem )
-        && SVX_BREAK_NONE != static_cast<const SvxFmtBreakItem*>(pItem)->GetBreak() )
+        && SVX_BREAK_NONE != static_cast<const SvxFormatBreakItem*>(pItem)->GetBreak() )
         return true;
 
     if( SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem )
-        && static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()
-        && nsUseOnPage::PD_NONE != static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()->GetUseOn() )
+        && static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()
+        && nsUseOnPage::PD_NONE != static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()->GetUseOn() )
         return true;
     return false;
 }
 
 /// Is there a dot at the end?
-bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd )
+bool SwAutoFormat::IsSentenceAtEnd( const SwTextNode& rTextNd )
 {
-    const OUString& rStr = rTxtNd.GetTxt();
+    const OUString& rStr = rTextNd.GetText();
     sal_Int32 n = rStr.getLength();
     if( !n )
         return true;
@@ -1049,27 +1049,27 @@ bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd )
 /// Delete beginning and/or end in a node
 void SwAutoFormat::DeleteCurrentParagraph( bool bStart, bool bEnd )
 {
-    if( m_aFlags.bAFmtByInput
-        ? m_aFlags.bAFmtByInpDelSpacesAtSttEnd
-        : m_aFlags.bAFmtDelSpacesAtSttEnd )
+    if( m_aFlags.bAFormatByInput
+        ? m_aFlags.bAFormatByInpDelSpacesAtSttEnd
+        : m_aFlags.bAFormatDelSpacesAtSttEnd )
     {
         // delete blanks at the end of the current and at the beginning of the next one
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
         sal_Int32 nPos(0);
-        if( bStart && 0 != ( nPos = GetLeadingBlanks( m_pCurTxtNd->GetTxt() )))
+        if( bStart && 0 != ( nPos = GetLeadingBlanks( m_pCurTextNd->GetText() )))
         {
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
             m_aDelPam.SetMark();
             m_aDelPam.GetPoint()->nContent = nPos;
             DeleteSel( m_aDelPam );
             m_aDelPam.DeleteMark();
         }
-        if (bEnd && m_pCurTxtNd->GetTxt().getLength() !=
-                    ( nPos = GetTrailingBlanks( m_pCurTxtNd->GetTxt() )) )
+        if (bEnd && m_pCurTextNd->GetText().getLength() !=
+                    ( nPos = GetTrailingBlanks( m_pCurTextNd->GetText() )) )
         {
             m_aDelPam.GetPoint()->nContent.Assign(
-                    m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength());
+                    m_pCurTextNd, m_pCurTextNd->GetText().getLength());
             m_aDelPam.SetMark();
             m_aDelPam.GetPoint()->nContent = nPos;
             DeleteSel( m_aDelPam );
@@ -1084,7 +1084,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
     {
         // Add to Shell-Cursor-Ring so that DelPam will be moved as well!
         SwPaM* pShCrsr = m_pEditShell->_GetCrsr();
-        SwPaM aTmp( *m_pCurTxtNd, 0, pShCrsr );
+        SwPaM aTmp( *m_pCurTextNd, 0, pShCrsr );
 
         SwPaM* pPrev = rDelPam.GetPrev();
         rDelPam.GetRingContainer().merge( pShCrsr->GetRingContainer() );
@@ -1101,7 +1101,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
         } while( p != pPrev );
 
         m_aNdIdx = aTmp.GetPoint()->nNode;
-        m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
+        m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
     }
     else
         m_pEditShell->DeleteSel( rDelPam );
@@ -1112,17 +1112,17 @@ bool SwAutoFormat::DeleteCurNxtPara( const OUString& rNxtPara )
     // delete blanks at the end of the current and at the beginning of the next one
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd,
-                    GetTrailingBlanks( m_pCurTxtNd->GetTxt() ) );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd,
+                    GetTrailingBlanks( m_pCurTextNd->GetText() ) );
     m_aDelPam.SetMark();
 
     ++m_aDelPam.GetPoint()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode().GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode().GetTextNode();
     if( !pTNd )
     {
         // then delete only up to end of the paragraph
         --m_aDelPam.GetPoint()->nNode;
-        m_aDelPam.GetPoint()->nContent = m_pCurTxtNd->GetTxt().getLength();
+        m_aDelPam.GetPoint()->nContent = m_pCurTextNd->GetText().getLength();
     }
     else
         m_aDelPam.GetPoint()->nContent.Assign( pTNd,
@@ -1141,24 +1141,24 @@ bool SwAutoFormat::DeleteCurNxtPara( const OUString& rNxtPara )
 
 void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
+    SetRedlineText( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
     // delete blanks in empty paragraph
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
     m_aDelPam.GetPoint()->nContent.Assign(
-            m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength() );
+            m_pCurTextNd, m_pCurTextNd->GetText().getLength() );
     m_aDelPam.SetMark();
 
     --m_aDelPam.GetMark()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode( false ).GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode( false ).GetTextNode();
     if( pTNd )
         // first use the previous text node
-        m_aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        m_aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetText().getLength());
     else if( bTstNextPara )
     {
         // then try the next (at the beginning of a Doc, table cells, borders, ...)
         m_aDelPam.GetMark()->nNode += 2;
-        pTNd = m_aDelPam.GetNode( false ).GetTxtNode();
+        pTNd = m_aDelPam.GetNode( false ).GetTextNode();
         if( pTNd )
         {
             m_aDelPam.GetMark()->nContent.Assign( pTNd, 0 );
@@ -1169,28 +1169,28 @@ void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
     {
         m_aDelPam.GetMark()->nNode = m_aNdIdx;
         m_aDelPam.GetMark()->nContent = 0;
-        pTNd = m_pCurTxtNd;
+        pTNd = m_pCurTextNd;
     }
     if( pTNd )
         DeleteSel( m_aDelPam );
 
     m_aDelPam.DeleteMark();
-    ClearRedlineTxt();
+    ClearRedlineText();
 }
 
 void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks )
 {
-    if( m_aFlags.bAFmtByInput
-        ? m_aFlags.bAFmtByInpDelSpacesBetweenLines
-        : m_aFlags.bAFmtDelSpacesBetweenLines )
+    if( m_aFlags.bAFormatByInput
+        ? m_aFlags.bAFormatByInpDelSpacesBetweenLines
+        : m_aFlags.bAFormatDelSpacesBetweenLines )
     {
         // delete all blanks on the left and right of the indentation
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
-        SwTxtFrmInfo aFInfo( m_pCurTxtFrm );
-        aFInfo.GetSpaces( m_aDelPam, !m_aFlags.bAFmtByInput || bWithLineBreaks );
+        SwTextFrmInfo aFInfo( m_pCurTextFrm );
+        aFInfo.GetSpaces( m_aDelPam, !m_aFlags.bAFormatByInput || bWithLineBreaks );
 
         do {
             SwPaM* pNxt = m_aDelPam.GetNext();
@@ -1218,15 +1218,15 @@ void SwAutoFormat::DelPrevPara()
 {
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
     m_aDelPam.SetMark();
 
     --m_aDelPam.GetPoint()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode().GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode().GetTextNode();
     if( pTNd )
     {
         // use the previous text node first
-        m_aDelPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        m_aDelPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetText().getLength());
         DeleteSel( m_aDelPam );
     }
     m_aDelPam.DeleteMark();
@@ -1234,28 +1234,28 @@ void SwAutoFormat::DelPrevPara()
 
 void SwAutoFormat::BuildIndent()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_INDENT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_INDENT );
 
     // read all succeeding paragraphs that belong to this indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                IsBlanksInString( *m_pCurTxtNd ) ||
-                IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                IsBlanksInString( *m_pCurTextNd ) ||
+                IsSentenceAtEnd( *m_pCurTextNd );
     SetColl( RES_POOLCOLL_TEXT_IDENT );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         if( pNxtNd && !m_bEnd )
         {
             do {
                 bBreak = !IsFastFullLine( *pNxtNd ) ||
                         IsBlanksInString( *pNxtNd ) ||
                         IsSentenceAtEnd( *pNxtNd );
-                if( DeleteCurNxtPara( pNxtNd->GetTxt() ))
+                if( DeleteCurNxtPara( pNxtNd->GetText() ))
                 {
                     m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
                 }
@@ -1272,30 +1272,30 @@ void SwAutoFormat::BuildIndent()
 
 void SwAutoFormat::BuildTextIndent()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT);
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT);
     // read all succeeding paragraphs that belong to this indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
 
-    if( m_aFlags.bAFmtByInput )
-        m_pCurTxtNd->SetAutoFmtLvl( (sal_uInt8)CalcLevel( *m_pCurTxtNd ) );
+    if( m_aFlags.bAFormatByInput )
+        m_pCurTextNd->SetAutoFormatLvl( (sal_uInt8)CalcLevel( *m_pCurTextNd ) );
 
     SetColl( RES_POOLCOLL_TEXT_MOVE );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 CalcLevel( *pNxtNd ) )
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
@@ -1310,32 +1310,32 @@ void SwAutoFormat::BuildTextIndent()
 
 void SwAutoFormat::BuildText()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_TEXT );
     // read all succeeding paragraphs that belong to this text without indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks();
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
     SetColl( RES_POOLCOLL_TEXT, true );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 !CalcLevel( *pNxtNd ) )
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
             if( bBreak )
                 break;
-            const SwTxtNode* pCurrNode = pNxtNd;
+            const SwTextNode* pCurrNode = pNxtNd;
             pNxtNd = GetNextNode();
             if(!pNxtNd || pCurrNode == pNxtNd)
                 break;
@@ -1347,32 +1347,32 @@ void SwAutoFormat::BuildText()
 
 void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_NUMBULET );
+    SetRedlineText( STR_AUTOFMTREDL_SET_NUMBULET );
 
     bool bBreak = true;
 
     // first, determine current indentation and frame width
-    SwTwips nFrmWidth = m_pCurTxtFrm->Prt().Width();;
-    SwTwips nLeftTxtPos;
+    SwTwips nFrmWidth = m_pCurTextFrm->Prt().Width();;
+    SwTwips nLeftTextPos;
     {
         sal_Int32 nPos(0);
-        while (nPos < m_pCurTxtNd->GetTxt().getLength() &&
-               IsSpace(m_pCurTxtNd->GetTxt()[nPos]))
+        while (nPos < m_pCurTextNd->GetText().getLength() &&
+               IsSpace(m_pCurTextNd->GetText()[nPos]))
         {
             ++nPos;
         }
 
-        SwTxtFrmInfo aInfo( m_pCurTxtFrm );
-        nLeftTxtPos = aInfo.GetCharPos(nPos);
-        nLeftTxtPos -= m_pCurTxtNd->GetSwAttrSet().GetLRSpace().GetLeft();
+        SwTextFrmInfo aInfo( m_pCurTextFrm );
+        nLeftTextPos = aInfo.GetCharPos(nPos);
+        nLeftTextPos -= m_pCurTextNd->GetSwAttrSet().GetLRSpace().GetLeft();
     }
 
     if( m_bMoreLines )
         DelMoreLinesBlanks();
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
     bool bRTL = m_pEditShell->IsInRightToLeftText();
     DeleteCurrentParagraph( true, true );
 
@@ -1385,27 +1385,27 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                      numfunc::GetDefaultPositionAndSpaceMode() );
 
     const SwNumRule* pCur = 0;
-    if( m_aFlags.bSetNumRule && 0 != (pCur = m_pCurTxtNd->GetNumRule()) )
+    if( m_aFlags.bSetNumRule && 0 != (pCur = m_pCurTextNd->GetNumRule()) )
         aRule = *pCur;
 
     // replace bullet character with defined one
-    const OUString& rStr = m_pCurTxtNd->GetTxt();
-    sal_Int32 nTxtStt = 0;
+    const OUString& rStr = m_pCurTextNd->GetText();
+    sal_Int32 nTextStt = 0;
     const sal_Unicode* pFndBulletChr;
     if( m_aFlags.bChgEnumNum &&
         2 < rStr.getLength() &&
-        0 != ( pFndBulletChr = StrChr( pBulletChar, rStr[ nTxtStt ] ))
-        && IsSpace( rStr[ nTxtStt + 1 ] ) )
+        0 != ( pFndBulletChr = StrChr( pBulletChar, rStr[ nTextStt ] ))
+        && IsSpace( rStr[ nTextStt + 1 ] ) )
     {
-        if( m_aFlags.bAFmtByInput )
+        if( m_aFlags.bAFormatByInput )
         {
             if( m_aFlags.bSetNumRule )
             {
-                SwCharFmt* pCFmt = m_pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+                SwCharFormat* pCFormat = m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                                             RES_POOLCHR_BUL_LEVEL );
                 bChgBullet = true;
                 // Was the format already somewhere adjusted?
-                if( !aRule.GetNumFmt( nLvl ) )
+                if( !aRule.GetNumFormat( nLvl ) )
                 {
                     int nBulletPos = pFndBulletChr - pBulletChar;
                     sal_Unicode cBullChar;
@@ -1430,29 +1430,29 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
                     sal_uInt16 nAbsPos = lBullIndent;
                     sal_uInt16 nSpaceSteps = nLvl
-                                            ? sal_uInt16(nLeftTxtPos / nLvl)
+                                            ? sal_uInt16(nLeftTextPos / nLvl)
                                             : lBullIndent;
                     for( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nAbsPos = nAbsPos + nSpaceSteps )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
-                        aFmt.SetBulletFont( pBullFnt );
-                        aFmt.SetBulletChar( cBullChar );
-                        aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                        SwNumFormat aFormat( aRule.Get( n ) );
+                        aFormat.SetBulletFont( pBullFnt );
+                        aFormat.SetBulletChar( cBullChar );
+                        aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                         // #i93908# clear suffix for bullet lists
-                        aFmt.SetPrefix(OUString());
-                        aFmt.SetSuffix(OUString());
-                        aFmt.SetFirstLineOffset( lBullFirstLineOffset );
-                        aFmt.SetAbsLSpace( nAbsPos );
-                        if( !aFmt.GetCharFmt() )
-                            aFmt.SetCharFmt( pCFmt );
+                        aFormat.SetPrefix(OUString());
+                        aFormat.SetSuffix(OUString());
+                        aFormat.SetFirstLineOffset( lBullFirstLineOffset );
+                        aFormat.SetAbsLSpace( nAbsPos );
+                        if( !aFormat.GetCharFormat() )
+                            aFormat.SetCharFormat( pCFormat );
                         if( bRTL )
-                            aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                            aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
 
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
 
                         if( n == nLvl &&
                             nFrmWidth < ( nSpaceSteps * MAXLEVEL ) )
-                            nSpaceSteps = static_cast<sal_uInt16>(( nFrmWidth - nLeftTxtPos ) /
+                            nSpaceSteps = static_cast<sal_uInt16>(( nFrmWidth - nLeftTextPos ) /
                                                 ( MAXLEVEL - nLvl ));
                     }
                 }
@@ -1472,14 +1472,14 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         //             it is determined by the indentation level.
 
         OUString aPostfix, aPrefix, aNumTypes;
-        if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *m_pCurTxtNd, nTxtStt,
+        if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *m_pCurTextNd, nTextStt,
                                         &aPrefix, &aPostfix, &aNumTypes )) )
         {
             bChgEnum = true;
 
             // Level 0 and Indentation, determine level by left indentation and default NumIndent
-            if( !nDigitLevel && nLeftTxtPos )
-                nLvl = std::min( sal_uInt16( nLeftTxtPos / lNumIndent ),
+            if( !nDigitLevel && nLeftTextPos )
+                nLvl = std::min( sal_uInt16( nLeftTextPos / lNumIndent ),
                             sal_uInt16( MAXLEVEL - 1 ) );
             else
                 nLvl = nDigitLevel;
@@ -1489,73 +1489,73 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         {
             if( !pCur )         // adjust NumRule if it is new
             {
-                SwCharFmt* pCFmt = m_pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+                SwCharFormat* pCFormat = m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                                             RES_POOLCHR_NUM_LEVEL );
                 if( !nDigitLevel )
                 {
-                    SwNumFmt aFmt( aRule.Get( nLvl ) );
-                    aFmt.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( 1,
+                    SwNumFormat aFormat( aRule.Get( nLvl ) );
+                    aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( 1,
                                             (sal_Unicode)1 ).toInt32()));
-                    aFmt.SetPrefix( aPrefix.getToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetSuffix( aPostfix.getToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetIncludeUpperLevels( 0 );
+                    aFormat.SetPrefix( aPrefix.getToken( 0, (sal_Unicode)1 ));
+                    aFormat.SetSuffix( aPostfix.getToken( 0, (sal_Unicode)1 ));
+                    aFormat.SetIncludeUpperLevels( 0 );
 
-                    if( !aFmt.GetCharFmt() )
-                        aFmt.SetCharFmt( pCFmt );
+                    if( !aFormat.GetCharFormat() )
+                        aFormat.SetCharFormat( pCFormat );
 
                     if( !aNumTypes.isEmpty() )
-                        aFmt.SetNumberingType(aNumTypes[ 0 ] - '0');
+                        aFormat.SetNumberingType(aNumTypes[ 0 ] - '0');
 
                     if( bRTL )
-                        aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
-                    aRule.Set( nLvl, aFmt );
+                        aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
+                    aRule.Set( nLvl, aFormat );
                 }
                 else
                 {
-                    sal_uInt16 nSpaceSteps = nLvl ? sal_uInt16(nLeftTxtPos / nLvl) : 0;
+                    sal_uInt16 nSpaceSteps = nLvl ? sal_uInt16(nLeftTextPos / nLvl) : 0;
                     sal_uInt8 n;
                     for( n = 0; n <= nLvl; ++n )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
+                        SwNumFormat aFormat( aRule.Get( n ) );
 
-                        aFmt.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( n+1,
+                        aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( n+1,
                                                     (sal_Unicode)1 ).toInt32() ));
                         if( !n )
-                            aFmt.SetPrefix( aPrefix.getToken( n, (sal_Unicode)1 ));
-                        aFmt.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
-                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
+                            aFormat.SetPrefix( aPrefix.getToken( n, (sal_Unicode)1 ));
+                        aFormat.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
+                        aFormat.SetIncludeUpperLevels( MAXLEVEL );
                         if( n < aNumTypes.getLength() )
-                            aFmt.SetNumberingType((aNumTypes[ n ] - '0'));
+                            aFormat.SetNumberingType((aNumTypes[ n ] - '0'));
 
-                        aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
+                        aFormat.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
                                             + lNumIndent );
 
-                        if( !aFmt.GetCharFmt() )
-                            aFmt.SetCharFmt( pCFmt );
+                        if( !aFormat.GetCharFormat() )
+                            aFormat.SetCharFormat( pCFormat );
                         if( bRTL )
-                            aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                            aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
 
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
                     }
 
                     // Does it fit completely into the frame?
                     bool bDefStep = nFrmWidth < (nSpaceSteps * MAXLEVEL);
                     for( ; n < MAXLEVEL; ++n )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
-                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
+                        SwNumFormat aFormat( aRule.Get( n ) );
+                        aFormat.SetIncludeUpperLevels( MAXLEVEL );
                         if( bDefStep )
-                            aFmt.SetAbsLSpace( sal_uInt16( (nLeftTxtPos +
+                            aFormat.SetAbsLSpace( sal_uInt16( (nLeftTextPos +
                                 SwNumRule::GetNumIndent(static_cast<sal_uInt8>(n-nLvl)))));
                         else
-                            aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
+                            aFormat.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
                                                 + lNumIndent );
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
                     }
                 }
             }
         }
-        else if( !m_aFlags.bAFmtByInput )
+        else if( !m_aFlags.bAFormatByInput )
             SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_NUM_LEVEL1 + ( std::min( nLvl, cnNumBullColls ) * 4 ) ));
         else
             bChgEnum = false;
@@ -1568,34 +1568,34 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
         if( m_aFlags.bSetNumRule )
         {
-            if( m_aFlags.bAFmtByInput )
+            if( m_aFlags.bAFormatByInput )
             {
                 m_aDelPam.SetMark();
                 ++m_aDelPam.GetMark()->nNode;
-                m_aDelPam.GetNode(false).GetTxtNode()->SetAttrListLevel( nLvl );
+                m_aDelPam.GetNode(false).GetTextNode()->SetAttrListLevel( nLvl );
             }
 
-            m_pCurTxtNd->SetAttrListLevel(nLvl);
-            m_pCurTxtNd->SetNumLSpace( true );
+            m_pCurTextNd->SetAttrListLevel(nLvl);
+            m_pCurTextNd->SetNumLSpace( true );
 
             // start new list
             m_pDoc->SetNumRule( m_aDelPam, aRule, true );
             m_aDelPam.DeleteMark();
 
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
         }
         else
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd,
-                        bChgEnum ? nTxtStt : 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd,
+                        bChgEnum ? nTextStt : 0 );
         m_aDelPam.SetMark();
 
         if ( bChgBullet )
-            nTxtStt += 2;
+            nTextStt += 2;
 
-        while( nTxtStt < rStr.getLength() && IsSpace( rStr[ nTxtStt ] ))
-            nTxtStt++;
+        while( nTextStt < rStr.getLength() && IsSpace( rStr[ nTextStt ] ))
+            nTextStt++;
 
-        m_aDelPam.GetPoint()->nContent = nTxtStt;
+        m_aDelPam.GetPoint()->nContent = nTextStt;
         DeleteSel( m_aDelPam );
 
         if( !m_aFlags.bSetNumRule )
@@ -1605,7 +1605,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                 sChgStr = OUString( m_aFlags.cBullet ) + sChgStr;
             m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, sChgStr );
 
-            SfxItemSet aSet( m_pDoc->GetAttrPool(), aTxtNodeSetRange );
+            SfxItemSet aSet( m_pDoc->GetAttrPool(), aTextNodeSetRange );
             if( bChgBullet )
             {
                 m_aDelPam.GetPoint()->nContent = 0;
@@ -1618,7 +1618,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                                   m_aFlags.aBulletFont.GetPitch(),
                                   m_aFlags.aBulletFont.GetCharSet(),
                                   RES_CHRATR_FONT ) );
-                m_pDoc->SetFmtItemByAutoFmt( m_aDelPam, aSet );
+                m_pDoc->SetFormatItemByAutoFormat( m_aDelPam, aSet );
                 m_aDelPam.DeleteMark();
                 nAutoCorrPos = 2;
                 aSet.ClearItem();
@@ -1626,7 +1626,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
             SvxTabStopItem aTStops( RES_PARATR_TABSTOP );
             aTStops.Insert( SvxTabStop( 0 ) );
             aSet.Put( aTStops );
-            m_pDoc->SetFmtItemByAutoFmt( m_aDelPam, aSet );
+            m_pDoc->SetFormatItemByAutoFormat( m_aDelPam, aSet );
         }
     }
 
@@ -1636,20 +1636,20 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         return;
     }
 
-    const SwTxtNode* pNxtNd = GetNextNode();
+    const SwTextNode* pNxtNd = GetNextNode();
     while( CanJoin( pNxtNd ) &&
             nLvl == CalcLevel( *pNxtNd ) )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
         bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                 IsSentenceAtEnd( *pNxtNd );
-        if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+        if( DeleteCurNxtPara( pNxtNd->GetText() ) )
         {
             m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
         }
         if( bBreak )
             break;
-        const SwTxtNode* pCurrNode = pNxtNd;
+        const SwTextNode* pCurrNode = pNxtNd;
         pNxtNd = GetNextNode();
         if(!pNxtNd || pCurrNode == pNxtNd)
             break;
@@ -1660,27 +1660,27 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
 void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT );
     // Test of contraposition (n words, divided by spaces/tabs, with same indentation in 2nd line)
 
     // read all succeeding paragraphs that belong to this enumeration
     bool bBreak = true;
     sal_Int32 nSpacePos = 0;
-    const sal_Int32 nTxtPos = GetBigIndent( nSpacePos );
+    const sal_Int32 nTextPos = GetBigIndent( nSpacePos );
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    ( !nTxtPos && IsBlanksInString( *m_pCurTxtNd )) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    ( !nTextPos && IsBlanksInString( *m_pCurTextNd )) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
 
-    SetColl( static_cast<sal_uInt16>( nTxtPos
+    SetColl( static_cast<sal_uInt16>( nTextPos
                 ? RES_POOLCOLL_CONFRONTATION
                 : RES_POOLCOLL_TEXT_NEGIDENT ) );
 
-    if( nTxtPos )
+    if( nTextPos )
     {
-        const OUString& rStr = m_pCurTxtNd->GetTxt();
+        const OUString& rStr = m_pCurTextNd->GetText();
         bool bInsTab = true;
 
         if ('\t' == rStr[nSpacePos+1]) // leave tab alone
@@ -1702,7 +1702,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, nSpacePos );
+        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, nSpacePos );
 
         // delete old Spaces, etc.
         if( nSpaceStt < nSpacePos )
@@ -1719,9 +1719,9 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        SwTxtFrmInfo aFInfo( m_pCurTxtFrm );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        SwTextFrmInfo aFInfo( m_pCurTextFrm );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 20 < std::abs( (long)(nSpaces - aFInfo.SetFrm(
                                 GetFrm( *pNxtNd ) ).GetLineStart() ))
@@ -1730,7 +1730,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
             bBreak = !IsFastFullLine( *pNxtNd ) ||
                     IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
@@ -1747,16 +1747,16 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
 {
     if( m_aFlags.bWithRedlining )
     {
-        OUString sTxt(SwViewShell::GetShellRes()->GetAutoFmtNameLst()[
+        OUString sText(SwViewShell::GetShellRes()->GetAutoFormatNameLst()[
                                     STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] );
-        sTxt = sTxt.replaceAll( "$(ARG1)", OUString::number( nLvl + 1 ) );
-        m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment( &sTxt );
+        sText = sText.replaceAll( "$(ARG1)", OUString::number( nLvl + 1 ) );
+        m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment( &sText );
     }
 
     SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + nLvl ), true );
-    if( m_aFlags.bAFmtByInput )
+    if( m_aFlags.bAFormatByInput )
     {
-        SwTxtFmtColl& rNxtColl = m_pCurTxtNd->GetTxtColl()->GetNextTxtFmtColl();
+        SwTextFormatColl& rNxtColl = m_pCurTextNd->GetTextColl()->GetNextTextFormatColl();
 
         DelPrevPara();
 
@@ -1765,8 +1765,8 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
 
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx.GetIndex() + 1;
-        m_aDelPam.GetPoint()->nContent.Assign( m_aDelPam.GetCntntNode(), 0 );
-        m_pDoc->SetTxtFmtColl( m_aDelPam, &rNxtColl );
+        m_aDelPam.GetPoint()->nContent.Assign( m_aDelPam.GetContentNode(), 0 );
+        m_pDoc->SetTextFormatColl( m_aDelPam, &rNxtColl );
     }
     else
     {
@@ -1783,7 +1783,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     bool bReplaceQuote = ( aSvxFlags & ChgQuotes ) > 0;
     bool bReplaceSglQuote = ( aSvxFlags & ChgSglQuotes ) > 0;
 
-    if( m_aFlags.bAFmtByInput ||
+    if( m_aFlags.bAFormatByInput ||
         (!m_aFlags.bAutoCorrect && !bReplaceQuote && !bReplaceSglQuote &&
         !m_aFlags.bCptlSttSntnc && !m_aFlags.bCptlSttWrd &&
         !m_aFlags.bChgOrdinalNumber &&
@@ -1791,8 +1791,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
         !m_aFlags.bChgWeightUnderl && !m_aFlags.bAddNonBrkSpace) )
         return;
 
-    const OUString* pTxt = &m_pCurTxtNd->GetTxt();
-    if (nPos >= pTxt->getLength())
+    const OUString* pText = &m_pCurTextNd->GetText();
+    if (nPos >= pText->getLength())
         return;
 
     bool bGetLanguage = m_aFlags.bChgOrdinalNumber ||
@@ -1802,11 +1802,11 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
     SwAutoCorrDoc aACorrDoc( *m_pEditShell, m_aDelPam );
 
-    SwTxtFrmInfo aFInfo( 0 );
+    SwTextFrmInfo aFInfo( 0 );
 
     sal_Int32 nSttPos, nLastBlank = nPos;
     bool bFirst = m_aFlags.bCptlSttSntnc, bFirstSent = bFirst;
@@ -1815,22 +1815,22 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     CharClass& rAppCC = GetAppCharClass();
 
     do {
-        while (nPos < pTxt->getLength() && IsSpace(cChar = (*pTxt)[nPos]))
+        while (nPos < pText->getLength() && IsSpace(cChar = (*pText)[nPos]))
             ++nPos;
-        if (nPos == pTxt->getLength())
+        if (nPos == pText->getLength())
             break;      // das wars
 
         if( ( ( bReplaceQuote && '\"' == cChar ) ||
               ( bReplaceSglQuote && '\'' == cChar ) ) &&
-            (!nPos || ' ' == (*pTxt)[nPos-1]))
+            (!nPos || ' ' == (*pText)[nPos-1]))
         {
 
             // beachte: Sonderfall Symbolfonts !!!
             if( !aFInfo.GetFrm() )
-                aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
             if( !aFInfo.IsBullet( nPos ))
             {
-                SetRedlineTxt( STR_AUTOFMTREDL_TYPO );
+                SetRedlineText( STR_AUTOFMTREDL_TYPO );
                 m_aDelPam.GetPoint()->nContent = nPos;
                 bool bSetHardBlank = false;
 
@@ -1849,8 +1849,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     aFInfo.SetFrm( 0 );
                 }
@@ -1867,10 +1867,10 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
         bool bCallACorr = false;
         int bBreak = 0;
-        if (nPos && IsSpace((*pTxt)[nPos-1]))
+        if (nPos && IsSpace((*pText)[nPos-1]))
             nLastBlank = nPos;
-        for (nSttPos = nPos; !bBreak && nPos < pTxt->getLength(); ++nPos)
-            switch (cChar = (*pTxt)[nPos])
+        for (nSttPos = nPos; !bBreak && nPos < pText->getLength(); ++nPos)
+            switch (cChar = (*pText)[nPos])
             {
             case '\"':
             case '\'':
@@ -1878,10 +1878,10 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 {
                     // consider Symbolfonts!
                     if( !aFInfo.GetFrm() )
-                        aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                        aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
                     if( !aFInfo.IsBullet( nPos ))
                     {
-                        SetRedlineTxt( STR_AUTOFMTREDL_TYPO );
+                        SetRedlineText( STR_AUTOFMTREDL_TYPO );
                         bool bSetHardBlank = false;
                         m_aDelPam.GetPoint()->nContent = nPos;
                         OUString sReplace( pATst->GetQuote( aACorrDoc,
@@ -1900,8 +1900,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                         if( m_aFlags.bWithRedlining )
                         {
                             m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                            m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                            pTxt = &m_pCurTxtNd->GetTxt();
+                            m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                            pText = &m_pCurTextNd->GetText();
                             m_aDelPam.SetMark();
                             m_aDelPam.DeleteMark();
                             aFInfo.SetFrm( 0 );
@@ -1925,33 +1925,33 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 {
                     // consider Symbolfonts!
                     if( !aFInfo.GetFrm() )
-                        aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                        aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
                     if( !aFInfo.IsBullet( nPos ))
                     {
-                        SetRedlineTxt( '*' == cChar
+                        SetRedlineText( '*' == cChar
                                             ? STR_AUTOFMTREDL_BOLD
                                             : STR_AUTOFMTREDL_UNDER );
 
-                        sal_Unicode cBlank = nSttPos ? (*pTxt)[nSttPos - 1] : 0;
+                        sal_Unicode cBlank = nSttPos ? (*pText)[nSttPos - 1] : 0;
                         m_aDelPam.GetPoint()->nContent = nPos;
 
-                        if( pATst->FnChgWeightUnderl( aACorrDoc, *pTxt,
+                        if( pATst->FnChgWeightUnderl( aACorrDoc, *pText,
                                                             nSttPos, nPos ))
                         {
                             if( m_aFlags.bWithRedlining )
                             {
                                 m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                                m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                                pTxt = &m_pCurTxtNd->GetTxt();
+                                m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                                pText = &m_pCurTextNd->GetText();
                                 m_aDelPam.SetMark();
                                 m_aDelPam.DeleteMark();
                                 aFInfo.SetFrm( 0 );
                             }
-                            //#125102# in case of the mode REDLINE_SHOW_DELETE the ** are still contained in pTxt
+                            //#125102# in case of the mode REDLINE_SHOW_DELETE the ** are still contained in pText
                             if(0 == (m_pDoc->getIDocumentRedlineAccess().GetRedlineMode() & nsRedlineMode_t::REDLINE_SHOW_DELETE))
                                 nPos = m_aDelPam.GetPoint()->nContent.GetIndex() - 1;
                             // Was a character deleted before starting?
-                            if (cBlank && cBlank != (*pTxt)[nSttPos - 1])
+                            if (cBlank && cBlank != (*pText)[nSttPos - 1])
                                 --nSttPos;
                         }
                     }
@@ -1961,11 +1961,11 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if ( m_aFlags.bAddNonBrkSpace )
                 {
                     LanguageType eLang = bGetLanguage
-                                           ? m_pCurTxtNd->GetLang( nSttPos )
+                                           ? m_pCurTextNd->GetLang( nSttPos )
                                            : LANGUAGE_SYSTEM;
 
-                    SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
-                    if ( pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) )
+                    SetRedlineText( STR_AUTOFMTREDL_NON_BREAK_SPACE );
+                    if ( pATst->FnAddNonBrkSpace( aACorrDoc, *pText, nSttPos, nPos, eLang ) )
                         --nPos;
                 }
                 break;
@@ -1977,7 +1977,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                     bFirstSent = true;
                 /* fallthrough */
             default:
-                if( !( rAppCC.isLetterNumeric( *pTxt, nPos )
+                if( !( rAppCC.isLetterNumeric( *pText, nPos )
                         || '/' == cChar )) //  '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement)
                 {
                     --nPos;     // revert ++nPos which was decremented in for loop
@@ -1988,7 +1988,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
         if( nPos == nSttPos )
         {
-            if (++nPos == pTxt->getLength())
+            if (++nPos == pText->getLength())
                 bCallACorr = true;
         }
         else
@@ -1998,7 +1998,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
         {
             bCallACorr = false;
             m_aDelPam.GetPoint()->nContent = nPos;
-            SetRedlineTxt( STR_AUTOFMTREDL_USE_REPLACE );
+            SetRedlineText( STR_AUTOFMTREDL_USE_REPLACE );
             if( m_aFlags.bAutoCorrect &&
                 aACorrDoc.ChgAutoCorrWord( nSttPos, nPos, *pATst, 0 ) )
             {
@@ -2007,8 +2007,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     m_aDelPam.DeleteMark();
                 }
@@ -2017,39 +2017,39 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
             }
 
             LanguageType eLang = bGetLanguage
-                                           ? m_pCurTxtNd->GetLang( nSttPos )
+                                           ? m_pCurTextNd->GetLang( nSttPos )
                                            : LANGUAGE_SYSTEM;
 
             if ( m_aFlags.bAddNonBrkSpace )
             {
-                SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
-                pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang );
+                SetRedlineText( STR_AUTOFMTREDL_NON_BREAK_SPACE );
+                pATst->FnAddNonBrkSpace( aACorrDoc, *pText, nSttPos, nPos, eLang );
             }
 
             if( ( m_aFlags.bChgOrdinalNumber &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_ORDINAL ) &&
-                    pATst->FnChgOrdinalNumber( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                    SetRedlineText( STR_AUTOFMTREDL_ORDINAL ) &&
+                    pATst->FnChgOrdinalNumber( aACorrDoc, *pText, nSttPos, nPos, eLang ) ) ||
                 ( m_aFlags.bChgToEnEmDash &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_DASH ) &&
-                    pATst->FnChgToEnEmDash( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                    SetRedlineText( STR_AUTOFMTREDL_DASH ) &&
+                    pATst->FnChgToEnEmDash( aACorrDoc, *pText, nSttPos, nPos, eLang ) ) ||
                 ( m_aFlags.bSetINetAttr &&
-                    (nPos == pTxt->getLength() || IsSpace((*pTxt)[nPos])) &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_DETECT_URL ) &&
-                    pATst->FnSetINetAttr( aACorrDoc, *pTxt, nLastBlank, nPos, eLang ) ) )
+                    (nPos == pText->getLength() || IsSpace((*pText)[nPos])) &&
+                    SetRedlineText( STR_AUTOFMTREDL_DETECT_URL ) &&
+                    pATst->FnSetINetAttr( aACorrDoc, *pText, nLastBlank, nPos, eLang ) ) )
                     nPos = m_aDelPam.GetPoint()->nContent.GetIndex();
             else
             {
                 // two capital letters at the beginning of a word?
                 if( m_aFlags.bCptlSttWrd )
                 {
-                    SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_WORD );
-                    pATst->FnCptlSttWrd( aACorrDoc, *pTxt, nSttPos, nPos, eLang );
+                    SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_WORD );
+                    pATst->FnCptlSttWrd( aACorrDoc, *pText, nSttPos, nPos, eLang );
                 }
                 // capital letter at the beginning of a sentence?
                 if( m_aFlags.bCptlSttSntnc && bFirst )
                 {
-                    SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_SENT );
-                    pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, true, nSttPos, nPos, eLang);
+                    SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_SENT );
+                    pATst->FnCptlSttSntnc( aACorrDoc, *pText, true, nSttPos, nPos, eLang);
                 }
 
                 bFirst = bFirstSent;
@@ -2058,18 +2058,18 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     m_aDelPam.DeleteMark();
                 }
             }
         }
-    } while (nPos < pTxt->getLength());
-    ClearRedlineTxt();
+    } while (nPos < pText->getLength());
+    ClearRedlineText();
 }
 
-SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
+SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
                             SwNodeIndex* pSttNd, SwNodeIndex* pEndNd )
     : m_aFlags( rFlags ),
     m_aDelPam( pEdShell->GetDoc()->GetNodes().GetEndOfExtras() ),
@@ -2077,18 +2077,18 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     m_aEndNdIdx( pEdShell->GetDoc()->GetNodes().GetEndOfContent() ),
     m_pEditShell( pEdShell ),
     m_pDoc( pEdShell->GetDoc() ),
-    m_pCurTxtNd( 0 ), m_pCurTxtFrm( 0 ),
-    m_nRedlAutoFmtSeqId( 0 )
+    m_pCurTextNd( 0 ), m_pCurTextFrm( 0 ),
+    m_nRedlAutoFormatSeqId( 0 )
 {
     OSL_ENSURE( (pSttNd && pEndNd) || (!pSttNd && !pEndNd),
             "Got no area" );
 
-    if( m_aFlags.bSetNumRule && !m_aFlags.bAFmtByInput )
+    if( m_aFlags.bSetNumRule && !m_aFlags.bAFormatByInput )
         m_aFlags.bSetNumRule = false;
 
-    bool bReplaceStyles = !m_aFlags.bAFmtByInput || m_aFlags.bReplaceStyles;
+    bool bReplaceStyles = !m_aFlags.bAFormatByInput || m_aFlags.bReplaceStyles;
 
-    const SwTxtNode* pNxtNd = 0;
+    const SwTextNode* pNxtNd = 0;
     bool bNxtEmpty = false;
     bool bNxtAlpha = false;
     sal_uInt16 nNxtLevel = 0;
@@ -2102,7 +2102,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
         ++m_aEndNdIdx;
 
         // check the previous TextNode
-        pNxtNd = m_aNdIdx.GetNode().GetTxtNode();
+        pNxtNd = m_aNdIdx.GetNode().GetTextNode();
         m_bEmptyLine = !pNxtNd ||
                     IsEmptyLine( *pNxtNd ) ||
                     IsNoAlphaLine( *pNxtNd );
@@ -2115,7 +2115,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     // set value for percentage display
     m_nEndNdIdx = m_aEndNdIdx.GetIndex();
 
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::StartProgress( STR_STATSTR_AUTOFORMAT, m_aNdIdx.GetIndex(),
                          m_nEndNdIdx = m_aEndNdIdx.GetIndex(),
                          m_pDoc->GetDocShell() );
@@ -2123,7 +2123,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     RedlineMode_t eRedlMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineMode(), eOldMode = eRedlMode;
     if( m_aFlags.bWithRedlining )
     {
-        m_pDoc->SetAutoFmtRedline( true );
+        m_pDoc->SetAutoFormatRedline( true );
         eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT);
     }
     else
@@ -2142,7 +2142,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     sal_uInt16 nDigitLvl = 0;
 
     // set defaults
-    SwTxtFrmInfo aFInfo( 0 );
+    SwTextFrmInfo aFInfo( 0 );
 
     // This is the automat for autoformatting
     m_eStat = READ_NEXT_PARA;
@@ -2158,9 +2158,9 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
             break;
 
         case TST_EMPTY_LINE:
-            if( IsEmptyLine( *m_pCurTxtNd ) )
+            if( IsEmptyLine( *m_pCurTextNd ) )
             {
-                if( m_aFlags.bDelEmptyNode && !HasObjects( *m_pCurTxtNd ) )
+                if( m_aFlags.bDelEmptyNode && !HasObjects( *m_pCurTextNd ) )
                 {
                     m_bEmptyLine = true;
                     sal_uLong nOldCnt = m_pDoc->GetNodes().Count();
@@ -2176,10 +2176,10 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
             break;
 
         case TST_ALPHA_LINE:
-            if( IsNoAlphaLine( *m_pCurTxtNd ))
+            if( IsNoAlphaLine( *m_pCurTextNd ))
             {
                 // recognize a table definition +---+---+
-                if( m_aFlags.bAFmtByInput && m_aFlags.bCreateTable && DoTable() )
+                if( m_aFlags.bAFormatByInput && m_aFlags.bCreateTable && DoTable() )
                 {
                     //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr after AutoFormat!
                     pEdShell->Pop( false );
@@ -2205,7 +2205,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
 
         case GET_ALL_INFO:
             {
-                if( m_pCurTxtNd->GetNumRule() )
+                if( m_pCurTextNd->GetNumRule() )
                 {
                     // do nothing in numbering, go to next
                     m_bEmptyLine = false;
@@ -2216,14 +2216,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     break;
                 }
 
-                aFInfo.SetFrm( m_pCurTxtFrm );
+                aFInfo.SetFrm( m_pCurTextFrm );
 
                 // so far: if there were templates assigned, keep these and go to next node
-                sal_uInt16 nPoolId = m_pCurTxtNd->GetTxtColl()->GetPoolFmtId();
-                if( IsPoolUserFmt( nPoolId )
+                sal_uInt16 nPoolId = m_pCurTextNd->GetTextColl()->GetPoolFormatId();
+                if( IsPoolUserFormat( nPoolId )
                         ? !m_aFlags.bChgUserColl
                         : ( RES_POOLCOLL_STANDARD != nPoolId &&
-                           ( !m_aFlags.bAFmtByInput ||
+                           ( !m_aFlags.bAFormatByInput ||
                             (RES_POOLCOLL_TEXT_MOVE != nPoolId &&
                              RES_POOLCOLL_TEXT != nPoolId )) ))
                 {
@@ -2232,21 +2232,21 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 }
 
                 // check for hard spaces or LRSpaces set by the template
-                if( IsPoolUserFmt( nPoolId ) ||
+                if( IsPoolUserFormat( nPoolId ) ||
                     RES_POOLCOLL_STANDARD == nPoolId )
                 {
                     short nSz;
                     SvxLRSpaceItem const * pLRSpace;
-                    if( SfxItemState::SET == m_pCurTxtNd->GetSwAttrSet().
+                    if( SfxItemState::SET == m_pCurTextNd->GetSwAttrSet().
                         GetItemState( RES_LR_SPACE, true,
                                         reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
-                        ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) ||
-                            0 != pLRSpace->GetTxtLeft() ) )
+                        ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+                            0 != pLRSpace->GetTextLeft() ) )
                     {
                         // exception: numbering/enumation can have an indentation
-                        if( IsEnumericChar( *m_pCurTxtNd ))
+                        if( IsEnumericChar( *m_pCurTextNd ))
                         {
-                            nLevel = CalcLevel( *m_pCurTxtNd, &nDigitLvl );
+                            nLevel = CalcLevel( *m_pCurTextNd, &nDigitLvl );
                             if( nLevel >= MAXLEVEL )
                                 nLevel = MAXLEVEL-1;
                             BuildEnum( nLevel, nDigitLvl );
@@ -2264,7 +2264,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                                 BuildIndent();
                             else if( 0 > nSz )      // negative 1st line indentation
                                 BuildNegIndent( aFInfo.GetLineStart() );
-                            else if( pLRSpace->GetTxtLeft() )   // is indentation
+                            else if( pLRSpace->GetTextLeft() )   // is indentation
                                 BuildTextIndent();
                         }
                         m_eStat = READ_NEXT_PARA;
@@ -2272,8 +2272,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     }
                 }
 
-                nLevel = CalcLevel( *m_pCurTxtNd, &nDigitLvl );
-                m_bMoreLines = !IsOneLine( *m_pCurTxtNd );
+                nLevel = CalcLevel( *m_pCurTextNd, &nDigitLvl );
+                m_bMoreLines = !IsOneLine( *m_pCurTextNd );
                 pNxtNd = GetNextNode();
                 if( pNxtNd )
                 {
@@ -2281,7 +2281,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     bNxtAlpha = IsNoAlphaLine( *pNxtNd );
                     nNxtLevel = CalcLevel( *pNxtNd );
 
-                    if( !m_bEmptyLine && HasBreakAttr( *m_pCurTxtNd ) )
+                    if( !m_bEmptyLine && HasBreakAttr( *m_pCurTextNd ) )
                         m_bEmptyLine = true;
                     if( !bNxtEmpty && HasBreakAttr( *pNxtNd ) )
                         bNxtEmpty = true;
@@ -2303,7 +2303,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 if( !bReplaceStyles )
                     break;
 
-                const OUString sClrStr( DelLeadingBlanks(m_pCurTxtNd->GetTxt()) );
+                const OUString sClrStr( DelLeadingBlanks(m_pCurTextNd->GetText()) );
 
                 if( sClrStr.isEmpty() )
                 {
@@ -2313,8 +2313,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 }
 
                 // check if headline
-                if( !m_bEmptyLine || !IsFirstCharCapital( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) )
+                if( !m_bEmptyLine || !IsFirstCharCapital( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) )
                     break;
 
                 m_bEmptyLine = false;
@@ -2355,7 +2355,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                         }
                         m_nLastCalcHeadLvl = nLevel;
 
-                        if( m_aFlags.bAFmtByInput )
+                        if( m_aFlags.bAFormatByInput )
                             BuildHeadLine( nLevel );
                         else
                             BuildHeadLine( m_nLastHeadLvl );
@@ -2369,7 +2369,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
         case TST_ENUMERIC:
             {
                 m_bEmptyLine = false;
-                if( IsEnumericChar( *m_pCurTxtNd ))
+                if( IsEnumericChar( *m_pCurTextNd ))
                 {
                     if( nLevel >= MAXLEVEL )
                         nLevel = MAXLEVEL-1;
@@ -2467,16 +2467,16 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 DelMoreLinesBlanks( false );
 
                 // handle hard attributes
-                if( m_pCurTxtNd->HasSwAttrSet() )
+                if( m_pCurTextNd->HasSwAttrSet() )
                 {
                     short nSz;
                     SvxLRSpaceItem const * pLRSpace;
                     if( bReplaceStyles &&
-                        SfxItemState::SET == m_pCurTxtNd->GetSwAttrSet().
+                        SfxItemState::SET == m_pCurTextNd->GetSwAttrSet().
                         GetItemState( RES_LR_SPACE, false,
                                         reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
-                        ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) ||
-                            0 != pLRSpace->GetTxtLeft() ) )
+                        ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+                            0 != pLRSpace->GetTextLeft() ) )
                     {
                         // then use one of our templates
                         if( 0 < nSz )           // positive 1st line indentation
@@ -2485,7 +2485,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                         {
                             BuildNegIndent( aFInfo.GetLineStart() );
                         }
-                        else if( pLRSpace->GetTxtLeft() )   // is indentation
+                        else if( pLRSpace->GetTextLeft() )   // is indentation
                             BuildTextIndent();
                         else
                             BuildText();
@@ -2501,18 +2501,18 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     }
 
     if( m_aFlags.bWithRedlining )
-        m_pDoc->SetAutoFmtRedline( false );
+        m_pDoc->SetAutoFormatRedline( false );
     m_pDoc->getIDocumentRedlineAccess().SetRedlineMode( eOldMode );
 
     // restore undo (in case it has been changed)
     m_pDoc->GetIDocumentUndoRedo().DoUndo(bUndoState);
 
     // disable display of percentage again
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::EndProgress( m_pDoc->GetDocShell() );
 }
 
-void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
+void SwEditShell::AutoFormat( const SvxSwAutoFormatFlags* pAFlags )
 {
     boost::scoped_ptr<SwWait> pWait;
 
@@ -2520,11 +2520,11 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
     StartAllAction();
     StartUndo( UNDO_AUTOFORMAT );
 
-    SvxSwAutoFmtFlags aAFFlags;     // use default values or add params?
+    SvxSwAutoFormatFlags aAFFlags;     // use default values or add params?
     if( pAFlags )
     {
         aAFFlags = *pAFlags;
-        if( !aAFFlags.bAFmtByInput )
+        if( !aAFFlags.bAFormatByInput )
             pWait.reset(new SwWait( *GetDoc()->GetDocShell(), true ));
     }
 
@@ -2536,21 +2536,21 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
         {
             if( rPaM.HasMark() )
             {
-                SwAutoFormat aFmt( this, aAFFlags, &(rPaM.Start()->nNode),
+                SwAutoFormat aFormat( this, aAFFlags, &(rPaM.Start()->nNode),
                                      &(rPaM.End()->nNode) );
             }
         }
     }
     else
     {
-        SwAutoFormat aFmt( this, aAFFlags );
+        SwAutoFormat aFormat( this, aAFFlags );
     }
 
     EndUndo( UNDO_AUTOFORMAT );
     EndAllAction();
 }
 
-void SwEditShell::AutoFmtBySplitNode()
+void SwEditShell::AutoFormatBySplitNode()
 {
     SET_CURR_SHELL( this );
     SwPaM* pCrsr = GetCrsr();
@@ -2561,20 +2561,20 @@ void SwEditShell::AutoFmtBySplitNode()
 
         bool bRange = false;
         pCrsr->SetMark();
-        SwIndex* pCntnt = &pCrsr->GetMark()->nContent;
-        if( pCntnt->GetIndex() )
+        SwIndex* pContent = &pCrsr->GetMark()->nContent;
+        if( pContent->GetIndex() )
         {
-            *pCntnt = 0;
+            *pContent = 0;
             bRange = true;
         }
         else
         {
             // then go one node backwards
             SwNodeIndex m_aNdIdx( pCrsr->GetMark()->nNode, -1 );
-            SwTxtNode* pTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-            if (pTxtNd && !pTxtNd->GetTxt().isEmpty())
+            SwTextNode* pTextNd = m_aNdIdx.GetNode().GetTextNode();
+            if (pTextNd && !pTextNd->GetText().isEmpty())
             {
-                pCntnt->Assign( pTxtNd, 0 );
+                pContent->Assign( pTextNd, 0 );
                 pCrsr->GetMark()->nNode = m_aNdIdx;
                 bRange = true;
             }
@@ -2584,9 +2584,9 @@ void SwEditShell::AutoFmtBySplitNode()
         {
             Push();     // save cursor
 
-            SvxSwAutoFmtFlags aAFFlags = *GetAutoFmtFlags(); // use default values so far
+            SvxSwAutoFormatFlags aAFFlags = *GetAutoFormatFlags(); // use default values so far
 
-            SwAutoFormat aFmt( this, aAFFlags, &pCrsr->GetMark()->nNode,
+            SwAutoFormat aFormat( this, aAFFlags, &pCrsr->GetMark()->nNode,
                                     &pCrsr->GetPoint()->nNode );
 
             //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr!
@@ -2601,27 +2601,27 @@ void SwEditShell::AutoFmtBySplitNode()
     }
 }
 
-SvxSwAutoFmtFlags* SwEditShell::GetAutoFmtFlags()
+SvxSwAutoFormatFlags* SwEditShell::GetAutoFormatFlags()
 {
-    if (!s_pAutoFmtFlags)
-        s_pAutoFmtFlags = new SvxSwAutoFmtFlags;
+    if (!s_pAutoFormatFlags)
+        s_pAutoFormatFlags = new SvxSwAutoFormatFlags;
 
-    return s_pAutoFmtFlags;
+    return s_pAutoFormatFlags;
 }
 
-void SwEditShell::SetAutoFmtFlags(SvxSwAutoFmtFlags * pFlags)
+void SwEditShell::SetAutoFormatFlags(SvxSwAutoFormatFlags * pFlags)
 {
-    SvxSwAutoFmtFlags* pEditFlags = GetAutoFmtFlags();
+    SvxSwAutoFormatFlags* pEditFlags = GetAutoFormatFlags();
 
     pEditFlags->bSetNumRule     = pFlags->bSetNumRule;
     pEditFlags->bChgEnumNum     = pFlags->bChgEnumNum;
     pEditFlags->bSetBorder      = pFlags->bSetBorder;
     pEditFlags->bCreateTable    = pFlags->bCreateTable;
     pEditFlags->bReplaceStyles  = pFlags->bReplaceStyles;
-    pEditFlags->bAFmtByInpDelSpacesAtSttEnd =
-                                    pFlags->bAFmtByInpDelSpacesAtSttEnd;
-    pEditFlags->bAFmtByInpDelSpacesBetweenLines =
-                                    pFlags->bAFmtByInpDelSpacesBetweenLines;
+    pEditFlags->bAFormatByInpDelSpacesAtSttEnd =
+                                    pFlags->bAFormatByInpDelSpacesAtSttEnd;
+    pEditFlags->bAFormatByInpDelSpacesBetweenLines =
+                                    pFlags->bAFormatByInpDelSpacesBetweenLines;
 
     //JP 15.12.98: copy BulletChar and Font into "normal" ones
     //             because AutoFormat can only work with the latter!
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 8a798195e6b0..f0312a8f26ba 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -58,11 +58,11 @@ void SwEditShell::GCAttr()
     {
         if ( !rPaM.HasMark() )
         {
-            SwTxtNode *const pTxtNode =
-                rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
-            if (pTxtNode)
+            SwTextNode *const pTextNode =
+                rPaM.GetPoint()->nNode.GetNode().GetTextNode();
+            if (pTextNode)
             {
-                pTxtNode->GCAttr();
+                pTextNode->GCAttr();
             }
         }
         else
@@ -71,8 +71,8 @@ void SwEditShell::GCAttr()
             SwNodeIndex aIdx( rPaM.Start()->nNode );
             SwNode* pNd = &aIdx.GetNode();
             do {
-                if( pNd->IsTxtNode() )
-                    static_cast<SwTxtNode*>(pNd)->GCAttr();
+                if( pNd->IsTextNode() )
+                    static_cast<SwTextNode*>(pNd)->GCAttr();
             }
             while( 0 != ( pNd = GetDoc()->GetNodes().GoNext( &aIdx )) &&
                     aIdx <= rEnd );
@@ -81,18 +81,18 @@ void SwEditShell::GCAttr()
 }
 
 /// Set the attribute as new default attribute in the document.
-void SwEditShell::SetDefault( const SfxPoolItem& rFmtHint )
+void SwEditShell::SetDefault( const SfxPoolItem& rFormatHint )
 {
     // 7502: Action-Parenthesis
     StartAllAction();
-    GetDoc()->SetDefault( rFmtHint );
+    GetDoc()->SetDefault( rFormatHint );
     EndAllAction();
 }
 
 /// request the default attribute in this document.
-const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFmtHint ) const
+const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFormatHint ) const
 {
-    return GetDoc()->GetDefault( nFmtHint );
+    return GetDoc()->GetDefault( nFormatHint );
 }
 
 void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, SetAttrMode nFlags )
@@ -102,12 +102,12 @@ void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, SetAttrMode nFlags )
     SwPaM* pCrsr = GetCrsr();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        bool bIsTblMode = IsTableMode();
+        bool bIsTableMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
         {
-            if( rPaM.HasMark() && ( bIsTblMode ||
+            if( rPaM.HasMark() && ( bIsTableMode ||
                 *rPaM.GetPoint() != *rPaM.GetMark() ))
             {
                 GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, rHint, nFlags );
@@ -133,12 +133,12 @@ void SwEditShell::SetAttrSet( const SfxItemSet& rSet, SetAttrMode nFlags, SwPaM*
     StartAllAction();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        bool bIsTblMode = IsTableMode();
+        bool bIsTableMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
         {
-            if( rTmpCrsr.HasMark() && ( bIsTblMode ||
+            if( rTmpCrsr.HasMark() && ( bIsTableMode ||
                 *rTmpCrsr.GetPoint() != *rTmpCrsr.GetMark() ))
             {
                 GetDoc()->getIDocumentContentOperations().InsertItemSet(rTmpCrsr, rSet, nFlags );
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 19b1074c6b51..759cfc84b104 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -78,15 +78,15 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
         // the attributes to get are those from the numbering format.
         if (rCurrentPaM.IsInFrontOfLabel())
         {
-            SwTxtNode * pTxtNd = rCurrentPaM.GetPoint()->nNode.GetNode().GetTxtNode();
+            SwTextNode * pTextNd = rCurrentPaM.GetPoint()->nNode.GetNode().GetTextNode();
 
-            if (pTxtNd)
+            if (pTextNd)
             {
-                SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                SwNumRule * pNumRule = pTextNd->GetNumRule();
 
                 if (pNumRule)
                 {
-                    int nListLevel = pTxtNd->GetActualListLevel();
+                    int nListLevel = pTextNd->GetActualListLevel();
 
                     if (nListLevel < 0)
                         nListLevel = 0;
@@ -94,13 +94,13 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                     if (nListLevel >= MAXLEVEL)
                         nListLevel = MAXLEVEL - 1;
 
-                    const OUString & aCharFmtName =
-                        pNumRule->Get(static_cast<sal_uInt16>(nListLevel)).GetCharFmtName();
-                    SwCharFmt * pCharFmt =
-                        GetDoc()->FindCharFmtByName(aCharFmtName);
+                    const OUString & aCharFormatName =
+                        pNumRule->Get(static_cast<sal_uInt16>(nListLevel)).GetCharFormatName();
+                    SwCharFormat * pCharFormat =
+                        GetDoc()->FindCharFormatByName(aCharFormatName);
 
-                    if (pCharFmt)
-                        rSet.Put(pCharFmt->GetAttrSet());
+                    if (pCharFormat)
+                        rSet.Put(pCharFormat->GetAttrSet());
                 }
             }
 
@@ -137,16 +137,16 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                     const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
                     const sal_Int32 nEnd = (n == nEndNd)
                         ? nEndCnt
-                        : pNd->GetTxtNode()->GetTxt().getLength();
+                        : pNd->GetTextNode()->GetText().getLength();
 
-                    static_cast<SwTxtNode*>(pNd)->GetAttr( *pSet, nStt, nEnd,
+                    static_cast<SwTextNode*>(pNd)->GetAttr( *pSet, nStt, nEnd,
                                                 false, true,
                                                 bMergeIndentValuesOfNumRule );
                 }
                 break;
             case ND_GRFNODE:
             case ND_OLENODE:
-                static_cast<SwCntntNode*>(pNd)->GetAttr( *pSet );
+                static_cast<SwContentNode*>(pNd)->GetAttr( *pSet );
                 break;
 
             default:
@@ -207,10 +207,10 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
             // get the node
             SwNode* pNd = GetDoc()->GetNodes()[ n ];
 
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
                 // get the node (paragraph) attributes
-                static_cast<SwCntntNode*>(pNd)->GetAttr(*pSet);
+                static_cast<SwContentNode*>(pNd)->GetAttr(*pSet);
 
                 if( pSet != &rSet && aSet.Count() )
                 {
@@ -232,12 +232,12 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
     return true;
 }
 
-SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl( ) const
+SwTextFormatColl* SwEditShell::GetCurTextFormatColl( ) const
 {
-    return GetPaMTxtFmtColl( GetCrsr() );
+    return GetPaMTextFormatColl( GetCrsr() );
 }
 
-SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
+SwTextFormatColl* SwEditShell::GetPaMTextFormatColl( SwPaM* pPaM ) const
 {
     // number of nodes the function have explored so far
     sal_uInt16 numberOfLookup = 0;
@@ -265,14 +265,14 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
             if (numberOfLookup >= getMaxLookup())
                 return NULL;
 
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
                 // if it's a text node get its named paragraph format
-                SwTxtFmtColl* pFmt = pNd->GetTxtNode()->GetTxtColl();
+                SwTextFormatColl* pFormat = pNd->GetTextNode()->GetTextColl();
 
                 // if the paragraph format exist stop here and return it
-                if( pFmt != NULL )
-                    return pFmt;
+                if( pFormat != NULL )
+                    return pFormat;
             }
         }
     }
@@ -300,32 +300,32 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
         for( sal_uLong n = nSttNd; n <= nEndNd; ++n )
         {
             SwNode* pNd = GetDoc()->GetNodes()[ n ];
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
-                SwTxtNode* pTxtNd = static_cast< SwTxtNode* >( pNd );
+                SwTextNode* pTextNd = static_cast< SwTextNode* >( pNd );
                 const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
                 const sal_Int32 nEnd = (n == nEndNd)
-                    ? nEndCnt : pTxtNd->GetTxt().getLength();
-                const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTxtNd );
+                    ? nEndCnt : pTextNd->GetText().getLength();
+                const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTextNd );
                 sal_uInt8 nScript = pScriptInfo ? pScriptInfo->ScriptType( nStt ) : css::i18n::ScriptType::WEAK;
                 nWhich = GetWhichOfScript( nWhich, nScript );
 
                 // item from attribute set
-                if( pTxtNd->HasSwAttrSet() )
+                if( pTextNd->HasSwAttrSet() )
                 {
                     pNewPaM = new SwPaM(*pNd, nStt, *pNd, nEnd);
-                    pItem = pTxtNd->GetSwAttrSet().GetItem( nWhich );
+                    pItem = pTextNd->GetSwAttrSet().GetItem( nWhich );
                     vItem.push_back( std::make_pair( pItem, std::unique_ptr<SwPaM>(pNewPaM) ) );
                 }
 
-                if( !pTxtNd->HasHints() )
+                if( !pTextNd->HasHints() )
                     continue;
 
                 // items with limited range
-                const size_t nSize = pTxtNd->GetpSwpHints()->Count();
+                const size_t nSize = pTextNd->GetpSwpHints()->Count();
                 for( size_t m = 0; m < nSize; m++ )
                 {
-                    const SwTxtAttr* pHt = (*pTxtNd->GetpSwpHints())[m];
+                    const SwTextAttr* pHt = (*pTextNd->GetpSwpHints())[m];
                     if( pHt->Which() == RES_TXTATR_AUTOFMT ||
                         pHt->Which() == RES_TXTATR_CHARFMT ||
                         pHt->Which() == RES_TXTATR_INETFMT )
@@ -341,7 +341,7 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
 
                         nScript = pScriptInfo ? pScriptInfo->ScriptType( nStt ) : css::i18n::ScriptType::WEAK;
                         nWhich = GetWhichOfScript( nWhich, nScript );
-                        const SfxItemSet* pAutoSet = CharFmt::GetItemSet( pHt->GetAttr() );
+                        const SfxItemSet* pAutoSet = CharFormat::GetItemSet( pHt->GetAttr() );
                         if( pAutoSet )
                         {
                             SfxItemIter aItemIter( *pAutoSet );
@@ -366,7 +366,7 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
                                 pItem = aItemIter.NextItem();
                             }
                             // default item
-                            if( !pItem && !pTxtNd->HasSwAttrSet() )
+                            if( !pItem && !pTextNd->HasSwAttrSet() )
                             {
                                 pNewPaM = new SwPaM(*pNd, nStt, *pNd, nEnd);
                                 pItem = pAutoSet->GetPool()->GetPoolDefaultItem( nWhich );
@@ -381,27 +381,27 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
     return vItem;
 }
 
-bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
+bool SwEditShell::GetCurFootnote( SwFormatFootnote* pFillFootnote )
 {
     // The cursor must be positioned on the current footnotes anchor:
     SwPaM* pCrsr = GetCrsr();
-    SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    if( !pTextNd )
         return false;
 
-    SwTxtAttr *const pFtn = pTxtNd->GetTxtAttrForCharAt(
+    SwTextAttr *const pFootnote = pTextNd->GetTextAttrForCharAt(
         pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
-    if( pFtn && pFillFtn )
+    if( pFootnote && pFillFootnote )
     {
         // Transfer data from the attribute
-        const SwFmtFtn &rFtn = static_cast<SwTxtFtn*>(pFtn)->GetFtn();
-        pFillFtn->SetNumber( rFtn );
-        pFillFtn->SetEndNote( rFtn.IsEndNote() );
+        const SwFormatFootnote &rFootnote = static_cast<SwTextFootnote*>(pFootnote)->GetFootnote();
+        pFillFootnote->SetNumber( rFootnote );
+        pFillFootnote->SetEndNote( rFootnote.IsEndNote() );
     }
-    return 0 != pFtn;
+    return 0 != pFootnote;
 }
 
-bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
+bool SwEditShell::SetCurFootnote( const SwFormatFootnote& rFillFootnote )
 {
     bool bChgd = false;
     StartAllAction();
@@ -409,7 +409,7 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
     for(SwPaM& rCrsr : GetCrsr()->GetRingContainer())
     {
         bChgd |=
-            mpDoc->SetCurFtn( rCrsr, rFillFtn.GetNumStr(), rFillFtn.GetNumber(), rFillFtn.IsEndNote() );
+            mpDoc->SetCurFootnote( rCrsr, rFillFootnote.GetNumStr(), rFillFootnote.GetNumber(), rFillFootnote.IsEndNote() );
 
     }
 
@@ -417,49 +417,49 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
     return bChgd;
 }
 
-bool SwEditShell::HasFtns( bool bEndNotes ) const
+bool SwEditShell::HasFootnotes( bool bEndNotes ) const
 {
-    const SwFtnIdxs &rIdxs = mpDoc->GetFtnIdxs();
+    const SwFootnoteIdxs &rIdxs = mpDoc->GetFootnoteIdxs();
     for ( auto pIdx : rIdxs )
     {
-        const SwFmtFtn &rFtn = pIdx->GetFtn();
-        if ( bEndNotes == rFtn.IsEndNote() )
+        const SwFormatFootnote &rFootnote = pIdx->GetFootnote();
+        if ( bEndNotes == rFootnote.IsEndNote() )
             return true;
     }
     return false;
 }
 
 /// Give a List of all footnotes and their beginning texts
-size_t SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
+size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes )
 {
     rList.Clear();
 
-    const size_t nFtnCnt = mpDoc->GetFtnIdxs().size();
-    SwTxtFtn* pTxtFtn;
-    for( size_t n = 0; n < nFtnCnt; ++n )
+    const size_t nFootnoteCnt = mpDoc->GetFootnoteIdxs().size();
+    SwTextFootnote* pTextFootnote;
+    for( size_t n = 0; n < nFootnoteCnt; ++n )
     {
-        pTxtFtn = mpDoc->GetFtnIdxs()[ n ];
-        const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-        if ( rFtn.IsEndNote() != bEndNotes )
+        pTextFootnote = mpDoc->GetFootnoteIdxs()[ n ];
+        const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+        if ( rFootnote.IsEndNote() != bEndNotes )
             continue;
 
-        SwNodeIndex* pIdx = pTxtFtn->GetStartNode();
+        SwNodeIndex* pIdx = pTextFootnote->GetStartNode();
         if( pIdx )
         {
             SwNodeIndex aIdx( *pIdx, 1 );
-            SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
-            if( !pTxtNd )
-                pTxtNd = static_cast<SwTxtNode*>(mpDoc->GetNodes().GoNext( &aIdx ));
+            SwTextNode* pTextNd = aIdx.GetNode().GetTextNode();
+            if( !pTextNd )
+                pTextNd = static_cast<SwTextNode*>(mpDoc->GetNodes().GoNext( &aIdx ));
 
-            if( pTxtNd )
+            if( pTextNd )
             {
-                OUString sTxt( rFtn.GetViewNumStr( *mpDoc ));
-                if( !sTxt.isEmpty() )
-                    sTxt += " ";
-                sTxt += pTxtNd->GetExpandTxt( 0, -1 );
+                OUString sText( rFootnote.GetViewNumStr( *mpDoc ));
+                if( !sText.isEmpty() )
+                    sText += " ";
+                sText += pTextNd->GetExpandText( 0, -1 );
 
-                _SeqFldLstElem* pNew = new _SeqFldLstElem( sTxt,
-                                            pTxtFtn->GetSeqRefNo() );
+                _SeqFieldLstElem* pNew = new _SeqFieldLstElem( sText,
+                                            pTextFootnote->GetSeqRefNo() );
                 while( rList.InsertSort( pNew ) )
                     pNew->sDlgEntry += " ";
             }
@@ -488,15 +488,15 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool bModulus ) const
         if( nSttNd > nEndNd )
             std::swap(nSttNd, nEndNd);
 
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         for( sal_uLong n = nSttNd; bRet && n <= nEndNd; ++n )
-            if( 0 != ( pCNd = GetDoc()->GetNodes()[ n ]->GetTxtNode() ))
+            if( 0 != ( pCNd = GetDoc()->GetNodes()[ n ]->GetTextNode() ))
             {
                 const SvxLRSpaceItem& rLS = static_cast<const SvxLRSpaceItem&>(
                                             pCNd->GetAttr( RES_LR_SPACE ));
                 if( bRight )
                 {
-                    long nNext = rLS.GetTxtLeft() + nDefDist;
+                    long nNext = rLS.GetTextLeft() + nDefDist;
                     if( bModulus )
                         nNext = ( nNext / nDefDist ) * nDefDist;
                     SwFrm* pFrm = pCNd->getLayoutFrm( GetLayout() );
@@ -555,7 +555,7 @@ static inline SvtScriptType lcl_SetScriptFlags( sal_uInt16 nType )
     }
 }
 
-static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
+static bool lcl_IsNoEndTextAttrAtPos( const SwTextNode& rTNd, sal_Int32 nPos,
                             SvtScriptType &rScrpt, bool bInSelection, bool bNum )
 {
     bool bRet = false;
@@ -569,7 +569,7 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
         if ( rTNd.IsInList() )
         {
             OSL_ENSURE( rTNd.GetNumRule(),
-                    "<lcl_IsNoEndTxtAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
+                    "<lcl_IsNoEndTextAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
             const SwNumRule* pNumRule = rTNd.GetNumRule();
             if(pNumRule)
             {
@@ -581,11 +581,11 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<sal_uInt16>(nListLevel) );
-                if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() )
+                const SwNumFormat &rNumFormat = pNumRule->Get( static_cast<sal_uInt16>(nListLevel) );
+                if( SVX_NUM_BITMAP != rNumFormat.GetNumberingType() )
                 {
-                    if ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() )
-                        sExp = OUString(rNumFmt.GetBulletChar());
+                    if ( SVX_NUM_CHAR_SPECIAL == rNumFormat.GetNumberingType() )
+                        sExp = OUString(rNumFormat.GetBulletChar());
                     else
                         sExp = rTNd.GetNumString();
                 }
@@ -594,19 +594,19 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
     }
 
     // and fields
-    if (nPos < rTNd.GetTxt().getLength() && CH_TXTATR_BREAKWORD == rTNd.GetTxt()[nPos])
+    if (nPos < rTNd.GetText().getLength() && CH_TXTATR_BREAKWORD == rTNd.GetText()[nPos])
     {
-        const SwTxtAttr* const pAttr = rTNd.GetTxtAttrForCharAt( nPos );
+        const SwTextAttr* const pAttr = rTNd.GetTextAttrForCharAt( nPos );
         if (pAttr)
         {
             bRet = true; // all other than fields can be
                          // defined as weak-script ?
             if ( RES_TXTATR_FIELD == pAttr->Which() )
             {
-                const SwField* const pFld = pAttr->GetFmtFld().GetField();
-                if (pFld)
+                const SwField* const pField = pAttr->GetFormatField().GetField();
+                if (pField)
                 {
-                    sExp += pFld->ExpandField(true);
+                    sExp += pField->ExpandField(true);
                 }
             }
         }
@@ -647,7 +647,7 @@ SvtScriptType SwEditShell::GetScriptType() const
                                     : rPaM.GetMark();
             if( pStt == pEnd || *pStt == *pEnd )
             {
-                const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+                const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
                 if( pTNd )
                 {
                     // try to get SwScriptInfo
@@ -665,16 +665,16 @@ SvtScriptType SwEditShell::GetScriptType() const
 
                     sal_uInt16 nScript;
 
-                    if (!pTNd->GetTxt().isEmpty())
+                    if (!pTNd->GetText().isEmpty())
                     {
                         nScript = pScriptInfo ?
                                   pScriptInfo->ScriptType( nPos ) :
-                                  g_pBreakIt->GetBreakIter()->getScriptType( pTNd->GetTxt(), nPos );
+                                  g_pBreakIt->GetBreakIter()->getScriptType( pTNd->GetText(), nPos );
                     }
                     else
                         nScript = SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage() );
 
-                    if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, false, false ))
+                    if( !lcl_IsNoEndTextAttrAtPos( *pTNd, nPos, nRet, false, false ))
                         nRet |= lcl_SetScriptFlags( nScript );
                 }
             }
@@ -683,10 +683,10 @@ SvtScriptType SwEditShell::GetScriptType() const
                 sal_uLong nEndIdx = pEnd->nNode.GetIndex();
                 SwNodeIndex aIdx( pStt->nNode );
                 for( ; aIdx.GetIndex() <= nEndIdx; ++aIdx )
-                    if( aIdx.GetNode().IsTxtNode() )
+                    if( aIdx.GetNode().IsTextNode() )
                     {
-                        const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
-                        const OUString& rTxt = pTNd->GetTxt();
+                        const SwTextNode* pTNd = aIdx.GetNode().GetTextNode();
+                        const OUString& rText = pTNd->GetText();
 
                         // try to get SwScriptInfo
                         const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTNd );
@@ -696,12 +696,12 @@ SvtScriptType SwEditShell::GetScriptType() const
                                                 : 0;
                         sal_Int32 nEndPos = aIdx == nEndIdx
                                                 ? pEnd->nContent.GetIndex()
-                                                : rTxt.getLength();
+                                                : rText.getLength();
 
-                        OSL_ENSURE( nEndPos <= rTxt.getLength(),
+                        OSL_ENSURE( nEndPos <= rText.getLength(),
                                 "Index outside the range - endless loop!" );
-                        if (nEndPos > rTxt.getLength())
-                            nEndPos = rTxt.getLength();
+                        if (nEndPos > rText.getLength())
+                            nEndPos = rText.getLength();
 
                         sal_uInt16 nScript;
                         while( nChg < nEndPos )
@@ -709,27 +709,27 @@ SvtScriptType SwEditShell::GetScriptType() const
                             nScript = pScriptInfo ?
                                       pScriptInfo->ScriptType( nChg ) :
                                       g_pBreakIt->GetBreakIter()->getScriptType(
-                                                                rTxt, nChg );
+                                                                rText, nChg );
 
-                            if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, true,
-                                      0 == nChg && rTxt.getLength() == nEndPos))
+                            if( !lcl_IsNoEndTextAttrAtPos( *pTNd, nChg, nRet, true,
+                                      0 == nChg && rText.getLength() == nEndPos))
                                 nRet |= lcl_SetScriptFlags( nScript );
 
                             if( (SvtScriptType::LATIN | SvtScriptType::ASIAN |
                                 SvtScriptType::COMPLEX) == nRet )
                                 break;
 
-                            sal_Int32 nFldPos = nChg+1;
+                            sal_Int32 nFieldPos = nChg+1;
 
                             nChg = pScriptInfo ?
                                    pScriptInfo->NextScriptChg( nChg ) :
                                    g_pBreakIt->GetBreakIter()->endOfScript(
-                                                    rTxt, nChg, nScript );
+                                                    rText, nChg, nScript );
 
-                            nFldPos = rTxt.indexOf(
-                                            CH_TXTATR_BREAKWORD, nFldPos);
-                            if ((-1 != nFldPos) && (nFldPos < nChg))
-                                nChg = nFldPos;
+                            nFieldPos = rText.indexOf(
+                                            CH_TXTATR_BREAKWORD, nFieldPos);
+                            if ((-1 != nFieldPos) && (nFieldPos < nChg))
+                                nChg = nFieldPos;
                         }
                         if( (SvtScriptType::LATIN | SvtScriptType::ASIAN |
                                 SvtScriptType::COMPLEX) == nRet )
@@ -751,7 +751,7 @@ sal_uInt16 SwEditShell::GetCurLang() const
 {
     const SwPaM* pCrsr = GetCrsr();
     const SwPosition& rPos = *pCrsr->GetPoint();
-    const SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     sal_uInt16 nLang;
     if( pTNd )
     {
@@ -771,7 +771,7 @@ sal_uInt16 SwEditShell::GetScalingOfSelectedText() const
 {
     const SwPaM* pCrsr = GetCrsr();
     const SwPosition* pStt = pCrsr->Start();
-    const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     OSL_ENSURE( pTNd, "no textnode available" );
 
     sal_uInt16 nScaleWidth;
@@ -783,7 +783,7 @@ sal_uInt16 SwEditShell::GetScalingOfSelectedText() const
         const sal_Int32 nStt = pStt->nContent.GetIndex();
         const sal_Int32 nEnd = pStt->nNode == pEnd->nNode
             ? pEnd->nContent.GetIndex()
-            : pTNd->GetTxt().getLength();
+            : pTNd->GetText().getLength();
         nScaleWidth = pTNd->GetScalingOfSelectedText( nStt, nEnd );
     }
     else
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 48c376f63b7b..04c68f5e0447 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -71,21 +71,21 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
             {
                 // then go to the end of the selection
                 aDelPam.GetPoint()->nNode = rEndNd;
-                aDelPam.Move( fnMoveBackward, fnGoCntnt );
+                aDelPam.Move( fnMoveBackward, fnGoContent );
             }
             // skip protected boxes
-            if( !rNd.IsCntntNode() ||
+            if( !rNd.IsContentNode() ||
                 !rNd.IsInProtectSect() )
             {
                 // delete everything
                 GetDoc()->getIDocumentContentOperations().DeleteAndJoin( aDelPam );
-                SaveTblBoxCntnt( aDelPam.GetPoint() );
+                SaveTableBoxContent( aDelPam.GetPoint() );
             }
 
             if( !pEndSelPos ) // at the end of a selection
                 break;
             aDelPam.DeleteMark();
-            aDelPam.Move( fnMoveForward, fnGoCntnt ); // next box
+            aDelPam.Move( fnMoveForward, fnGoContent ); // next box
         } while( pEndSelPos );
     }
     else
@@ -104,7 +104,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
         }
         // delete everything
         GetDoc()->getIDocumentContentOperations().DeleteAndJoin(*pPam);
-        SaveTblBoxCntnt( pPam->GetPoint() );
+        SaveTableBoxContent( pPam->GetPoint() );
     }
 
     // Selection is not needed anymore
@@ -115,7 +115,7 @@ long SwEditShell::Delete()
 {
     SET_CURR_SHELL( this );
     long nRet = 0;
-    if ( !HasReadonlySel() || CrsrInsideInputFld() )
+    if ( !HasReadonlySel() || CrsrInsideInputField() )
     {
         StartAllAction();
 
@@ -260,7 +260,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
         SwPaM* pCrsr = pDestShell->GetCrsr();
         pCrsr->SetMark();
         pCrsr->GetPoint()->nNode = aSttNdIdx.GetIndex()+1;
-        pCrsr->GetPoint()->nContent.Assign( pCrsr->GetCntntNode(),nSttCntIdx);
+        pCrsr->GetPoint()->nContent.Assign( pCrsr->GetContentNode(),nSttCntIdx);
         pCrsr->Exchange();
     }
     else
@@ -275,9 +275,9 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
     for(SwPaM& rCmp : pDestShell->GetCrsr()->GetRingContainer())
     {
         OSL_ENSURE( rCmp.GetPoint()->nContent.GetIdxReg()
-                    == rCmp.GetCntntNode(), "Point in wrong Node" );
+                    == rCmp.GetContentNode(), "Point in wrong Node" );
         OSL_ENSURE( rCmp.GetMark()->nContent.GetIdxReg()
-                    == rCmp.GetCntntNode(false), "Mark in wrong Node" );
+                    == rCmp.GetContentNode(false), "Mark in wrong Node" );
         bool bTst = *rCmp.GetPoint() == *rCmp.GetMark();
         (void) bTst;
     }
@@ -288,7 +288,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
     pDestShell->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
     pDestShell->EndAllAction();
 
-    pDestShell->SaveTblBoxCntnt( pDestShell->GetCrsr()->GetPoint() );
+    pDestShell->SaveTableBoxContent( pDestShell->GetCrsr()->GetPoint() );
 
     return bRet;
 }
@@ -316,7 +316,7 @@ bool SwEditShell::Replace( const OUString& rNewStr, bool bRegExpRplc )
             {
                 bRet = GetDoc()->getIDocumentContentOperations().ReplaceRange( rPaM, rNewStr, bRegExpRplc )
                     || bRet;
-                SaveTblBoxCntnt( rPaM.GetPoint() );
+                SaveTableBoxContent( rPaM.GetPoint() );
             }
         }
 
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 0f1dd3366d47..b263122a5127 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -32,26 +32,26 @@
 #include <swundo.hxx>
 #include <docary.hxx>
 
-SwTxtFmtColl& SwEditShell::GetDfltTxtFmtColl() const
+SwTextFormatColl& SwEditShell::GetDfltTextFormatColl() const
 {
-    return *static_cast<SwTxtFmtColl*>( (GetDoc()->GetDfltTxtFmtColl()));
+    return *static_cast<SwTextFormatColl*>( (GetDoc()->GetDfltTextFormatColl()));
 }
 
-sal_uInt16 SwEditShell::GetTxtFmtCollCount() const
+sal_uInt16 SwEditShell::GetTextFormatCollCount() const
 {
-    return GetDoc()->GetTxtFmtColls()->size();
+    return GetDoc()->GetTextFormatColls()->size();
 }
 
-SwTxtFmtColl& SwEditShell::GetTxtFmtColl( sal_uInt16 nFmtColl) const
+SwTextFormatColl& SwEditShell::GetTextFormatColl( sal_uInt16 nFormatColl) const
 {
-    return *((*(GetDoc()->GetTxtFmtColls()))[nFmtColl]);
+    return *((*(GetDoc()->GetTextFormatColls()))[nFormatColl]);
 }
 
 // #i62675#
-void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
+void SwEditShell::SetTextFormatColl(SwTextFormatColl *pFormat,
                                 const bool bResetListAttrs)
 {
-    SwTxtFmtColl *pLocal = pFmt? pFmt: (*GetDoc()->GetTxtFmtColls())[0];
+    SwTextFormatColl *pLocal = pFormat? pFormat: (*GetDoc()->GetTextFormatColls())[0];
     StartAllAction();
 
     SwRewriter aRewriter;
@@ -64,16 +64,16 @@ void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
         if ( !rPaM.HasReadonlySel( GetViewOptions()->IsFormView() ) )
         {
             // Change the paragraph style to pLocal and remove all direct paragraph formatting.
-            GetDoc()->SetTxtFmtColl( rPaM, pLocal, true, bResetListAttrs );
+            GetDoc()->SetTextFormatColl( rPaM, pLocal, true, bResetListAttrs );
 
             // If there are hints on the nodes which cover the whole node, then remove those, too.
             SwPaM aPaM(*rPaM.Start(), *rPaM.End());
-            if (SwTxtNode* pEndTxtNode = aPaM.End()->nNode.GetNode().GetTxtNode())
+            if (SwTextNode* pEndTextNode = aPaM.End()->nNode.GetNode().GetTextNode())
             {
                 aPaM.Start()->nContent = 0;
-                aPaM.End()->nContent = pEndTxtNode->GetTxt().getLength();
+                aPaM.End()->nContent = pEndTextNode->GetText().getLength();
             }
-            GetDoc()->RstTxtAttrs(aPaM, /*bInclRefToxMark=*/false, /*bExactRange=*/true);
+            GetDoc()->RstTextAttrs(aPaM, /*bInclRefToxMark=*/false, /*bExactRange=*/true);
         }
 
     }
@@ -81,29 +81,29 @@ void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
     EndAllAction();
 }
 
-SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const OUString& rFmtCollName,
-        SwTxtFmtColl* pParent)
+SwTextFormatColl* SwEditShell::MakeTextFormatColl(const OUString& rFormatCollName,
+        SwTextFormatColl* pParent)
 {
-    SwTxtFmtColl *pColl;
+    SwTextFormatColl *pColl;
     if ( pParent == 0 )
-        pParent = &GetTxtFmtColl(0);
-    if (  (pColl=GetDoc()->MakeTxtFmtColl(rFmtCollName, pParent)) == 0 )
+        pParent = &GetTextFormatColl(0);
+    if (  (pColl=GetDoc()->MakeTextFormatColl(rFormatCollName, pParent)) == 0 )
     {
-        OSL_FAIL( "MakeTxtFmtColl failed" );
+        OSL_FAIL( "MakeTextFormatColl failed" );
     }
     return pColl;
 
 }
 
-void SwEditShell::FillByEx(SwTxtFmtColl* pColl, bool bReset)
+void SwEditShell::FillByEx(SwTextFormatColl* pColl, bool bReset)
 {
     if( bReset )
     {
-        pColl->ResetAllFmtAttr();
+        pColl->ResetAllFormatAttr();
     }
 
     SwPaM * pCrsr = GetCrsr();
-    SwCntntNode * pCnt = pCrsr->GetCntntNode();
+    SwContentNode * pCnt = pCrsr->GetContentNode();
     const SfxItemSet* pSet = pCnt->GetpSwAttrSet();
     if( pSet )
     {
@@ -133,10 +133,10 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, bool bReset)
                 aSet.ClearItem( RES_PARATR_NUMRULE );
 
             if( aSet.Count() )
-                GetDoc()->ChgFmt(*pColl, aSet );
+                GetDoc()->ChgFormat(*pColl, aSet );
         }
         else
-            GetDoc()->ChgFmt(*pColl, *pSet );
+            GetDoc()->ChgFormat(*pColl, *pSet );
     }
 }
 
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 1afc33ca31d2..3bc69b30c123 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -42,19 +42,19 @@
 #include <IDocumentContentOperations.hxx>
 
 /// count field types with a ResId, if 0 count all
-sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const
+sal_uInt16 SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
 
     if(nResId == USHRT_MAX)
     {
         if(!bUsed)
-            return static_cast<sal_uInt16>(pFldTypes->size());
+            return static_cast<sal_uInt16>(pFieldTypes->size());
 
         sal_uInt16 nUsed = 0;
-        for ( const auto pFldType : *pFldTypes )
+        for ( const auto pFieldType : *pFieldTypes )
         {
-            if(IsUsed(*pFldType))
+            if(IsUsed(*pFieldType))
                 nUsed++;
         }
         return nUsed;
@@ -62,32 +62,32 @@ sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const
 
     // all types with the same ResId
     sal_uInt16 nIdx  = 0;
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
         // same ResId -> increment index
-        if(pFldType->Which() == nResId)
+        if(pFieldType->Which() == nResId)
             nIdx++;
     }
     return nIdx;
 }
 
 /// get field types with a ResId, if 0 get all
-SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bUsed ) const
+SwFieldType* SwEditShell::GetFieldType(sal_uInt16 nField, sal_uInt16 nResId, bool bUsed ) const
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
 
-    if(nResId == USHRT_MAX && nFld < pFldTypes->size())
+    if(nResId == USHRT_MAX && nField < pFieldTypes->size())
     {
         if(!bUsed)
-            return (*pFldTypes)[nFld];
+            return (*pFieldTypes)[nField];
 
-        SwFldTypes::size_type nUsed = 0;
-        for ( const auto pFldType : *pFldTypes )
+        SwFieldTypes::size_type nUsed = 0;
+        for ( const auto pFieldType : *pFieldTypes )
         {
-            if(IsUsed(*pFldType))
+            if(IsUsed(*pFieldType))
             {
-                if(nUsed == nFld)
-                    return pFldType;
+                if(nUsed == nField)
+                    return pFieldType;
                 nUsed++;
             }
         }
@@ -95,15 +95,15 @@ SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bU
     }
 
     sal_uInt16 nIdx = 0;
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
         // same ResId -> increment index
-        if(pFldType->Which() == nResId)
+        if(pFieldType->Which() == nResId)
         {
-            if (!bUsed || IsUsed(*pFldType))
+            if (!bUsed || IsUsed(*pFieldType))
             {
-                if(nIdx == nFld)
-                    return pFldType;
+                if(nIdx == nField)
+                    return pFieldType;
                 nIdx++;
             }
         }
@@ -112,50 +112,50 @@ SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bU
 }
 
 /// get first type with given ResId and name
-SwFieldType* SwEditShell::GetFldType(sal_uInt16 nResId, const OUString& rName) const
+SwFieldType* SwEditShell::GetFieldType(sal_uInt16 nResId, const OUString& rName) const
 {
-    return GetDoc()->getIDocumentFieldsAccess().GetFldType( nResId, rName, false );
+    return GetDoc()->getIDocumentFieldsAccess().GetFieldType( nResId, rName, false );
 }
 
 /// delete field type
-void SwEditShell::RemoveFldType(sal_uInt16 nFld, sal_uInt16 nResId)
+void SwEditShell::RemoveFieldType(sal_uInt16 nField, sal_uInt16 nResId)
 {
     if( USHRT_MAX == nResId )
     {
-        GetDoc()->getIDocumentFieldsAccess().RemoveFldType(nFld);
+        GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(nField);
         return;
     }
 
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
     sal_uInt16 nIdx = 0;
-    const SwFldTypes::size_type nSize = pFldTypes->size();
-    for( SwFldTypes::size_type i = 0; i < nSize; ++i )
+    const SwFieldTypes::size_type nSize = pFieldTypes->size();
+    for( SwFieldTypes::size_type i = 0; i < nSize; ++i )
         // Gleiche ResId -> Index erhoehen
-        if( (*pFldTypes)[i]->Which() == nResId && nIdx++ == nFld )
+        if( (*pFieldTypes)[i]->Which() == nResId && nIdx++ == nField )
         {
-            GetDoc()->getIDocumentFieldsAccess().RemoveFldType( i );
+            GetDoc()->getIDocumentFieldsAccess().RemoveFieldType( i );
             return;
         }
 }
 
 /// delete field type based on its name
-void SwEditShell::RemoveFldType(sal_uInt16 nResId, const OUString& rStr)
+void SwEditShell::RemoveFieldType(sal_uInt16 nResId, const OUString& rStr)
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const SwFldTypes::size_type nSize = pFldTypes->size();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const SwFieldTypes::size_type nSize = pFieldTypes->size();
     const CharClass& rCC = GetAppCharClass();
 
     OUString aTmp( rCC.lowercase( rStr ));
 
-    for(SwFldTypes::size_type i = 0; i < nSize; ++i)
+    for(SwFieldTypes::size_type i = 0; i < nSize; ++i)
     {
         // same ResId -> increment index
-        SwFieldType* pFldType = (*pFldTypes)[i];
-        if( pFldType->Which() == nResId )
+        SwFieldType* pFieldType = (*pFieldTypes)[i];
+        if( pFieldType->Which() == nResId )
         {
-            if( aTmp == rCC.lowercase( pFldType->GetName() ) )
+            if( aTmp == rCC.lowercase( pFieldType->GetName() ) )
             {
-                GetDoc()->getIDocumentFieldsAccess().RemoveFldType(i);
+                GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(i);
                 return;
             }
         }
@@ -187,11 +187,11 @@ void SwEditShell::FieldToText( SwFieldType* pType )
 }
 
 /// add a field at the cursor position
-void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
+void SwEditShell::Insert2(SwField& rField, const bool bForceExpandHints)
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    SwFmtFld aFld( rFld );
+    SwFormatField aField( rField );
 
     const SetAttrMode nInsertFlags = (bForceExpandHints)
         ? SetAttrMode::FORCEHINTEXPAND
@@ -199,7 +199,7 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
 
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer()) // for each PaM
     {
-        const bool bSuccess(GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, aFld, nInsertFlags));
+        const bool bSuccess(GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, aField, nInsertFlags));
         OSL_ENSURE( bSuccess, "Doc->Insert(Field) failed");
         (void) bSuccess;
     }
@@ -208,11 +208,11 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
 }
 
 /// Are the PaMs positioned on fields?
-static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
+static SwTextField* lcl_FindInputField( SwDoc* pDoc, SwField& rField )
 {
     // Search field via its address. For input fields this needs to be done in protected fields.
-    SwTxtFld* pTFld = 0;
-    if( RES_INPUTFLD == rFld.Which() )
+    SwTextField* pTField = 0;
+    if( RES_INPUTFLD == rField.Which() )
     {
         const sal_uInt32 nMaxItems =
             pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INPUTFIELD );
@@ -220,15 +220,15 @@ static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
         {
             const SfxPoolItem* pItem = NULL;
             if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_INPUTFIELD, n ) )
-                && static_cast<const SwFmtFld*>(pItem)->GetField() == &rFld )
+                && static_cast<const SwFormatField*>(pItem)->GetField() == &rField )
             {
-                pTFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem))->GetTxtFld();
+                pTField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem))->GetTextField();
                 break;
             }
         }
     }
-    else if( RES_SETEXPFLD == rFld.Which()
-        && static_cast<SwSetExpField&>(rFld).GetInputFlag() )
+    else if( RES_SETEXPFLD == rField.Which()
+        && static_cast<SwSetExpField&>(rField).GetInputFlag() )
     {
         const sal_uInt32 nMaxItems =
             pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_FIELD );
@@ -236,52 +236,52 @@ static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
         {
             const SfxPoolItem* pItem = NULL;
             if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n ) )
-                && static_cast<const SwFmtFld*>(pItem)->GetField() == &rFld )
+                && static_cast<const SwFormatField*>(pItem)->GetField() == &rField )
             {
-                pTFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem))->GetTxtFld();
+                pTField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem))->GetTextField();
                 break;
             }
         }
     }
-    return pTFld;
+    return pTField;
 }
 
-void SwEditShell::UpdateFlds( SwField &rFld )
+void SwEditShell::UpdateFields( SwField &rField )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
     {
         // // If there are no selections so take the value of the current cursor position.
-        SwMsgPoolItem* pMsgHnt = 0;
-        SwRefMarkFldUpdate aRefMkHt( GetOut() );
-        sal_uInt16 nFldWhich = rFld.GetTyp()->Which();
-        if( RES_GETREFFLD == nFldWhich )
-            pMsgHnt = &aRefMkHt;
+        SwMsgPoolItem* pMsgHint = 0;
+        SwRefMarkFieldUpdate aRefMkHt( GetOut() );
+        sal_uInt16 nFieldWhich = rField.GetTyp()->Which();
+        if( RES_GETREFFLD == nFieldWhich )
+            pMsgHint = &aRefMkHt;
 
         SwPaM* pCrsr = GetCrsr();
-        SwTxtFld *pTxtFld;
-        SwFmtFld *pFmtFld;
+        SwTextField *pTextField;
+        SwFormatField *pFormatField;
 
         if ( !pCrsr->IsMultiSelection() && !pCrsr->HasMark())
         {
-            pTxtFld = GetTxtFldAtPos( pCrsr->Start(), true );
+            pTextField = GetTextFieldAtPos( pCrsr->Start(), true );
 
-            if (!pTxtFld) // #i30221#
-                pTxtFld = lcl_FindInputFld( GetDoc(), rFld);
+            if (!pTextField) // #i30221#
+                pTextField = lcl_FindInputField( GetDoc(), rField);
 
-            if (pTxtFld != 0)
-                GetDoc()->getIDocumentFieldsAccess().UpdateFld(pTxtFld, rFld, pMsgHnt, true);
+            if (pTextField != 0)
+                GetDoc()->getIDocumentFieldsAccess().UpdateField(pTextField, rField, pMsgHint, true);
         }
 
         // bOkay (instead of return because of EndAllAction) becomes false,
         // 1) if only one PaM has more than one field or
         // 2) if there are mixed field types
         bool bOkay = true;
-        bool bTblSelBreak = false;
+        bool bTableSelBreak = false;
 
-        SwMsgPoolItem aFldHint( RES_TXTATR_FIELD );  // Search-Hint
-        SwMsgPoolItem aAnnotationFldHint( RES_TXTATR_ANNOTATION );
-        SwMsgPoolItem aInputFldHint( RES_TXTATR_INPUTFIELD );
+        SwMsgPoolItem aFieldHint( RES_TXTATR_FIELD );  // Search-Hint
+        SwMsgPoolItem aAnnotationFieldHint( RES_TXTATR_ANNOTATION );
+        SwMsgPoolItem aInputFieldHint( RES_TXTATR_INPUTFIELD );
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer()) // for each PaM
         {
             if( rPaM.HasMark() && bOkay )    // ... with selection
@@ -298,36 +298,36 @@ void SwEditShell::UpdateFlds( SwField &rFld )
                  * the loop terminates because Start = End.
                  */
 
-                // Search for SwTxtFld ...
+                // Search for SwTextField ...
                 while(  bOkay
                      && pCurStt->nContent != pCurEnd->nContent
-                     && ( aPam.Find( aFldHint, false, fnMoveForward, &aCurPam, true )
-                          || aPam.Find( aAnnotationFldHint, false, fnMoveForward, &aCurPam )
-                          || aPam.Find( aInputFldHint, false, fnMoveForward, &aCurPam ) ) )
+                     && ( aPam.Find( aFieldHint, false, fnMoveForward, &aCurPam, true )
+                          || aPam.Find( aAnnotationFieldHint, false, fnMoveForward, &aCurPam )
+                          || aPam.Find( aInputFieldHint, false, fnMoveForward, &aCurPam ) ) )
                 {
                     // if only one PaM has more than one field  ...
                     if( aPam.Start()->nContent != pCurStt->nContent )
                         bOkay = false;
 
-                    if( 0 != (pTxtFld = GetTxtFldAtPos( pCurStt, true )) )
+                    if( 0 != (pTextField = GetTextFieldAtPos( pCurStt, true )) )
                     {
-                        pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
-                        SwField *pCurFld = pFmtFld->GetField();
+                        pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+                        SwField *pCurField = pFormatField->GetField();
 
                         // if there are mixed field types
-                        if( pCurFld->GetTyp()->Which() !=
-                            rFld.GetTyp()->Which() )
+                        if( pCurField->GetTyp()->Which() !=
+                            rField.GetTyp()->Which() )
                             bOkay = false;
 
-                        bTblSelBreak = GetDoc()->getIDocumentFieldsAccess().UpdateFld(pTxtFld, rFld,
-                                                           pMsgHnt, false);
+                        bTableSelBreak = GetDoc()->getIDocumentFieldsAccess().UpdateField(pTextField, rField,
+                                                           pMsgHint, false);
                     }
                     // The search area is reduced by the found area:
                     ++pCurStt->nContent;
                 }
             }
 
-            if( bTblSelBreak ) // If table section and table formula are updated -> finish
+            if( bTableSelBreak ) // If table section and table formula are updated -> finish
                 break;
 
         }
@@ -364,11 +364,11 @@ void SwEditShell::ChangeDBFields( const std::vector<OUString>& rOldNames,
 }
 
 /// Update all expression fields
-void SwEditShell::UpdateExpFlds(bool bCloseDB)
+void SwEditShell::UpdateExpFields(bool bCloseDB)
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    GetDoc()->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    GetDoc()->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
     if (bCloseDB)
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -388,27 +388,27 @@ SwDBManager* SwEditShell::GetDBManager() const
 }
 
 /// insert field type
-SwFieldType* SwEditShell::InsertFldType(const SwFieldType& rFldType)
+SwFieldType* SwEditShell::InsertFieldType(const SwFieldType& rFieldType)
 {
-    return GetDoc()->getIDocumentFieldsAccess().InsertFldType(rFldType);
+    return GetDoc()->getIDocumentFieldsAccess().InsertFieldType(rFieldType);
 }
 
-void SwEditShell::LockExpFlds()
+void SwEditShell::LockExpFields()
 {
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 }
 
-void SwEditShell::UnlockExpFlds()
+void SwEditShell::UnlockExpFields()
 {
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
 }
 
-void SwEditShell::SetFldUpdateFlags( SwFldUpdateFlags eFlags )
+void SwEditShell::SetFieldUpdateFlags( SwFieldUpdateFlags eFlags )
 {
     getIDocumentSettingAccess()->setFieldUpdateFlags( eFlags );
 }
 
-SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(bool bDocSettings) const
+SwFieldUpdateFlags SwEditShell::GetFieldUpdateFlags(bool bDocSettings) const
 {
     return getIDocumentSettingAccess()->getFieldUpdateFlags( !bDocSettings );
 }
@@ -430,25 +430,25 @@ void SwEditShell::ChangeAuthorityData(const SwAuthEntry* pNewData)
 
 bool SwEditShell::IsAnyDatabaseFieldInDoc()const
 {
-    const SwFldTypes * pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    for(const auto pFldType : *pFldTypes)
+    const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    for(const auto pFieldType : *pFieldTypes)
     {
-        if(IsUsed(*pFldType))
+        if(IsUsed(*pFieldType))
         {
-            switch(pFldType->Which())
+            switch(pFieldType->Which())
             {
                 case RES_DBFLD:
                 case RES_DBNEXTSETFLD:
                 case RES_DBNUMSETFLD:
                 case RES_DBSETNUMBERFLD:
                 {
-                    SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                    SwFmtFld* pFld = aIter.First();
-                    while(pFld)
+                    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                    SwFormatField* pField = aIter.First();
+                    while(pField)
                     {
-                        if(pFld->IsFldInDoc())
+                        if(pField->IsFieldInDoc())
                             return true;
-                        pFld = aIter.Next();
+                        pField = aIter.Next();
                     }
                 }
                 break;
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 52de1dea2de2..74a7ae9204ae 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -37,25 +37,25 @@ using namespace com::sun::star;
 
 bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
 {
-    const SwFldTypes * pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
     uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
     uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext);
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
-        if(IsUsed(*pFldType))
+        if(IsUsed(*pFieldType))
         {
-            switch(pFldType->Which())
+            switch(pFieldType->Which())
             {
                 case RES_DBFLD:
                 {
-                    SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                    SwFmtFld* pFmtFld = aIter.First();
-                    while(pFmtFld)
+                    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                    SwFormatField* pFormatField = aIter.First();
+                    while(pFormatField)
                     {
-                        if(pFmtFld->IsFldInDoc())
+                        if(pFormatField->IsFieldInDoc())
                         {
                             const SwDBData& rData =
-                                    static_cast<SwDBFieldType*>(pFmtFld->GetField()->GetTyp())->GetDBData();
+                                    static_cast<SwDBFieldType*>(pFormatField->GetField()->GetTyp())->GetDBData();
                             try
                             {
                                 return xDBContext->getByName(rData.sDataSource).hasValue();
@@ -66,7 +66,7 @@ bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
                                 return false;
                             }
                         }
-                        pFmtFld = aIter.Next();
+                        pFormatField = aIter.Next();
                     }
                 }
                 break;
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 1c94fb77e469..a8502effbda2 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -29,41 +29,41 @@
 #include "ndtxt.hxx"
 #include "hints.hxx"
 
-sal_uInt16 SwEditShell::GetCharFmtCount() const
+sal_uInt16 SwEditShell::GetCharFormatCount() const
 {
-    return GetDoc()->GetCharFmts()->size();
+    return GetDoc()->GetCharFormats()->size();
 }
 
-SwCharFmt& SwEditShell::GetCharFmt(sal_uInt16 nFmt) const
+SwCharFormat& SwEditShell::GetCharFormat(sal_uInt16 nFormat) const
 {
-    return *((*(GetDoc()->GetCharFmts()))[nFmt]);
+    return *((*(GetDoc()->GetCharFormats()))[nFormat]);
 }
 
-SwCharFmt* SwEditShell::GetCurCharFmt() const
+SwCharFormat* SwEditShell::GetCurCharFormat() const
 {
-    SwCharFmt *pFmt = 0;
+    SwCharFormat *pFormat = 0;
     SfxItemSet aSet( GetDoc()->GetAttrPool(), RES_TXTATR_CHARFMT,
                                                 RES_TXTATR_CHARFMT );
     const SfxPoolItem* pItem;
     if( GetCurAttr( aSet ) && SfxItemState::SET ==
         aSet.GetItemState( RES_TXTATR_CHARFMT, false, &pItem ) )
-        pFmt = static_cast<const SwFmtCharFmt*>(pItem)->GetCharFmt();
+        pFormat = static_cast<const SwFormatCharFormat*>(pItem)->GetCharFormat();
 
-    return pFmt;
+    return pFormat;
 }
 
-void SwEditShell::FillByEx(SwCharFmt* pCharFmt, bool bReset)
+void SwEditShell::FillByEx(SwCharFormat* pCharFormat, bool bReset)
 {
     if ( bReset )
     {
-        pCharFmt->ResetAllFmtAttr();
+        pCharFormat->ResetAllFormatAttr();
     }
 
     SwPaM* pPam = GetCrsr();
-    const SwCntntNode* pCNd = pPam->GetCntntNode();
-    if( pCNd->IsTxtNode() )
+    const SwContentNode* pCNd = pPam->GetContentNode();
+    if( pCNd->IsTextNode() )
     {
-        SwTxtNode const*const pTxtNode(pCNd->GetTxtNode());
+        SwTextNode const*const pTextNode(pCNd->GetTextNode());
         sal_Int32 nStt;
         sal_Int32 nEnd;
         if( pPam->HasMark() )
@@ -90,54 +90,54 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, bool bReset)
                     nStt = 0;
                 }
                 else
-                    nEnd = pTxtNode->GetTxt().getLength();
+                    nEnd = pTextNode->GetText().getLength();
             }
         }
         else
             nStt = nEnd = pPam->GetPoint()->nContent.GetIndex();
 
         SfxItemSet aSet( mpDoc->GetAttrPool(),
-                            pCharFmt->GetAttrSet().GetRanges() );
-        pTxtNode->GetAttr( aSet, nStt, nEnd );
-        pCharFmt->SetFmtAttr( aSet );
+                            pCharFormat->GetAttrSet().GetRanges() );
+        pTextNode->GetAttr( aSet, nStt, nEnd );
+        pCharFormat->SetFormatAttr( aSet );
     }
     else if( pCNd->HasSwAttrSet() )
-        pCharFmt->SetFmtAttr( *pCNd->GetpSwAttrSet() );
+        pCharFormat->SetFormatAttr( *pCNd->GetpSwAttrSet() );
 }
 
-size_t SwEditShell::GetTblFrmFmtCount(bool bUsed) const
+size_t SwEditShell::GetTableFrameFormatCount(bool bUsed) const
 {
-    return GetDoc()->GetTblFrmFmtCount(bUsed);
+    return GetDoc()->GetTableFrameFormatCount(bUsed);
 }
 
-SwFrmFmt& SwEditShell::GetTblFrmFmt(size_t nFmt, bool bUsed ) const
+SwFrameFormat& SwEditShell::GetTableFrameFormat(size_t nFormat, bool bUsed ) const
 {
-    return GetDoc()->GetTblFrmFmt(nFmt, bUsed );
+    return GetDoc()->GetTableFrameFormat(nFormat, bUsed );
 }
 
-OUString SwEditShell::GetUniqueTblName() const
+OUString SwEditShell::GetUniqueTableName() const
 {
-    return GetDoc()->GetUniqueTblName();
+    return GetDoc()->GetUniqueTableName();
 }
 
-SwCharFmt* SwEditShell::MakeCharFmt( const OUString& rName,
-                                    SwCharFmt* pDerivedFrom )
+SwCharFormat* SwEditShell::MakeCharFormat( const OUString& rName,
+                                    SwCharFormat* pDerivedFrom )
 {
     if( !pDerivedFrom )
-        pDerivedFrom = GetDoc()->GetDfltCharFmt();
+        pDerivedFrom = GetDoc()->GetDfltCharFormat();
 
-    return GetDoc()->MakeCharFmt( rName, pDerivedFrom );
+    return GetDoc()->MakeCharFormat( rName, pDerivedFrom );
 }
 
-SwTxtFmtColl* SwEditShell::GetTxtCollFromPool( sal_uInt16 nId )
+SwTextFormatColl* SwEditShell::GetTextCollFromPool( sal_uInt16 nId )
 {
-    return GetDoc()->getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+    return GetDoc()->getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
 }
 
 /// return the requested automatic format - base-class !
-SwFmt* SwEditShell::GetFmtFromPool( sal_uInt16 nId )
+SwFormat* SwEditShell::GetFormatFromPool( sal_uInt16 nId )
 {
-    return GetDoc()->getIDocumentStylePoolAccess().GetFmtFromPool( nId );
+    return GetDoc()->getIDocumentStylePoolAccess().GetFormatFromPool( nId );
 }
 
 SwPageDesc* SwEditShell::GetPageDescFromPool( sal_uInt16 nId )
@@ -150,19 +150,19 @@ bool SwEditShell::IsUsed( const SwModify& rModify ) const
     return mpDoc->IsUsed( rModify );
 }
 
-const SwFlyFrmFmt* SwEditShell::FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp ) const
+const SwFlyFrameFormat* SwEditShell::FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp ) const
 {
     return mpDoc->FindFlyByName(rName, nNdTyp);
 }
 
-SwCharFmt* SwEditShell::FindCharFmtByName( const OUString& rName ) const
+SwCharFormat* SwEditShell::FindCharFormatByName( const OUString& rName ) const
 {
-    return mpDoc->FindCharFmtByName( rName );
+    return mpDoc->FindCharFormatByName( rName );
 }
 
-SwTxtFmtColl* SwEditShell::FindTxtFmtCollByName( const OUString& rName ) const
+SwTextFormatColl* SwEditShell::FindTextFormatCollByName( const OUString& rName ) const
 {
-    return mpDoc->FindTxtFmtCollByName( rName );
+    return mpDoc->FindTextFormatCollByName( rName );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 5666b73e3a8e..a5311bd8bce8 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -60,11 +60,11 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
 
     // then all linked areas on the topmost level
     SwDoc* pMyDoc = GetDoc();
-    const SwSectionFmts& rSectFmts = pMyDoc->GetSections();
+    const SwSectionFormats& rSectFormats = pMyDoc->GetSections();
 
-    for( auto n = rSectFmts.size(); n; )
+    for( auto n = rSectFormats.size(); n; )
     {
-        const SwSection* pSect = rSectFmts[ --n ]->GetGlobalDocSection();
+        const SwSection* pSect = rSectFormats[ --n ]->GetGlobalDocSection();
         if( pSect )
         {
             SwGlblDocContent* pNew;
@@ -95,7 +95,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
         // Search from StartPos until rNew.DocPos for a content node.
         // If one exists then a dummy entry is needed.
         for( ; nSttIdx < rNew.GetDocPos(); ++nSttIdx )
-            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsCntntNode()
+            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
                 || pNd->IsSectionNode() || pNd->IsTableNode() )
             {
                 SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
@@ -116,7 +116,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
     {
         sal_uLong nNdEnd = pMyDoc->GetNodes().GetEndOfContent().GetIndex();
         for( ; nSttIdx < nNdEnd; ++nSttIdx )
-            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsCntntNode()
+            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
                 || pNd->IsSectionNode() || pNd->IsTableNode() )
             {
                 SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
@@ -151,15 +151,15 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
 
     bool bEndUndo = false;
     SwDoc* pMyDoc = GetDoc();
-    SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
-        rPos.nContent.Assign( pTxtNd, 0 );
+    SwTextNode *const pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
+        rPos.nContent.Assign( pTextNd, 0 );
     else
     {
         bEndUndo = true;
         pMyDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
         --rPos.nNode;
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
         pCrsr->SetMark();
     }
 
@@ -192,16 +192,16 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
 
     bool bEndUndo = false;
     SwDoc* pMyDoc = GetDoc();
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if (pTxtNd && pTxtNd->GetTxt().getLength() && rPos.nNode.GetIndex() + 1 !=
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if (pTextNd && pTextNd->GetText().getLength() && rPos.nNode.GetIndex() + 1 !=
         pMyDoc->GetNodes().GetEndOfContent().GetIndex() )
-        rPos.nContent.Assign( pTxtNd, 0 );
+        rPos.nContent.Assign( pTextNd, 0 );
     else
     {
         bEndUndo = true;
         pMyDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
         --rPos.nNode;
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
     }
 
     InsertTableOf( rTOX );
@@ -232,7 +232,7 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos )
     rPos.nContent.Assign( 0, 0 );
 
     SwDoc* pMyDoc = GetDoc();
-    pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+    pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
     EndAllAction();
     return true;
 }
@@ -262,7 +262,7 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
         rPos.nNode = nDelIdx - 1;
         rPos.nContent.Assign( 0, 0 );
 
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
         ++nDelIdx;
     }
 
@@ -291,8 +291,8 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
 
     case GLBLDOC_SECTION:
         {
-            SwSectionFmt* pSectFmt = const_cast<SwSectionFmt*>(rDelPos.GetSection()->GetFmt());
-            pMyDoc->DelSectionFmt( pSectFmt, true );
+            SwSectionFormat* pSectFormat = const_cast<SwSectionFormat*>(rDelPos.GetSection()->GetFormat());
+            pMyDoc->DelSectionFormat( pSectFormat, true );
         }
         break;
     }
@@ -355,7 +355,7 @@ bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
     rCrsrPos.nNode = rPos.GetDocPos();
 
     SwDoc* pMyDoc = GetDoc();
-    SwCntntNode * pCNd = rCrsrPos.nNode.GetNode().GetCntntNode();
+    SwContentNode * pCNd = rCrsrPos.nNode.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = pMyDoc->GetNodes().GoNext( &rCrsrPos.nNode );
 
@@ -377,7 +377,7 @@ SwGlblDocContent::SwGlblDocContent( const SwTOXBaseSection* pTOX )
     eType = GLBLDOC_TOXBASE;
     PTR.pTOX = pTOX;
 
-    const SwSectionNode* pSectNd = pTOX->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = pTOX->GetFormat()->GetSectionNode();
     nDocPos = pSectNd ? pSectNd->GetIndex() : 0;
 }
 
@@ -386,7 +386,7 @@ SwGlblDocContent::SwGlblDocContent( const SwSection* pSect )
     eType = GLBLDOC_SECTION;
     PTR.pSect = pSect;
 
-    const SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = pSect->GetFormat()->GetSectionNode();
     nDocPos = pSectNd ? pSectNd->GetIndex() : 0;
 }
 
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 56475875d8b3..3ef28d49d274 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -45,7 +45,7 @@ void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr
 
 /// convert current selection into text block and add to the text block document, incl. templates
 sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName, const OUString& rShortName,
-                                    bool bSaveRelFile, const OUString* pOnlyTxt )
+                                    bool bSaveRelFile, const OUString* pOnlyText )
 {
     SwDoc* pGDoc = rBlks.GetDoc();
 
@@ -57,8 +57,8 @@ sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName
     }
     rBlks.SetBaseURL( sBase );
 
-    if( pOnlyTxt )
-        return rBlks.PutText( rShortName, rName, *pOnlyTxt );
+    if( pOnlyText )
+        return rBlks.PutText( rShortName, rName, *pOnlyText );
 
     rBlks.ClearDoc();
     if( rBlks.BeginPutDoc( rShortName, rName ) )
@@ -76,7 +76,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
                                     const OUString& rName,
                                     const OUString& rShortName,
                                     bool bSaveRelFile,
-                                    bool bOnlyTxt )
+                                    bool bOnlyText )
 {
     StartAllAction();
 
@@ -92,28 +92,28 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
     rBlock.SetBaseURL( sBase );
     sal_uInt16 nRet = USHRT_MAX;
 
-    if( bOnlyTxt )
+    if( bOnlyText )
     {
         KillPams();
 
         SwPaM* pCrsr = GetCrsr();
 
         SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-        SwCntntNode* pCntntNd = pMyDoc->GetNodes().GoNext( &aStt );
-        const SwNode* pNd = pCntntNd->FindTableNode();
+        SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+        const SwNode* pNd = pContentNd->FindTableNode();
         if( !pNd )
-            pNd = pCntntNd;
+            pNd = pContentNd;
 
         pCrsr->GetPoint()->nNode = *pNd;
-        if( pNd == pCntntNd )
-            pCrsr->GetPoint()->nContent.Assign( pCntntNd, 0 );
+        if( pNd == pContentNd )
+            pCrsr->GetPoint()->nContent.Assign( pContentNd, 0 );
         pCrsr->SetMark();
 
         // then until the end of the Node array
         pCrsr->GetPoint()->nNode = pMyDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-        pCntntNd = pCrsr->GetCntntNode();
-        if( pCntntNd )
-            pCrsr->GetPoint()->nContent.Assign( pCntntNd, pCntntNd->Len() );
+        pContentNd = pCrsr->GetContentNode();
+        if( pContentNd )
+            pCrsr->GetPoint()->nContent.Assign( pContentNd, pContentNd->Len() );
 
         OUString sBuf;
         if( GetSelectedText( sBuf, GETSELTXT_PARABRK_TO_ONLYCR ) && !sBuf.isEmpty() )
@@ -125,21 +125,21 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
         if( rBlock.BeginPutDoc( rShortName, rName ) )
         {
             SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-            SwCntntNode* pCntntNd = pMyDoc->GetNodes().GoNext( &aStt );
-            const SwNode* pNd = pCntntNd->FindTableNode();
-            if( !pNd ) pNd = pCntntNd;
+            SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+            const SwNode* pNd = pContentNd->FindTableNode();
+            if( !pNd ) pNd = pContentNd;
             SwPaM aCpyPam( *pNd );
             aCpyPam.SetMark();
 
             // then until the end of the nodes array
             aCpyPam.GetPoint()->nNode = pMyDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-            pCntntNd = aCpyPam.GetCntntNode();
+            pContentNd = aCpyPam.GetContentNode();
             aCpyPam.GetPoint()->nContent.Assign(
-                   pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0);
+                   pContentNd, (pContentNd) ? pContentNd->Len() : 0);
 
             aStt = pGDoc->GetNodes().GetEndOfExtras();
-            pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
-            SwPosition aInsPos( aStt, SwIndex( pCntntNd ));
+            pContentNd = pGDoc->GetNodes().GoNext( &aStt );
+            SwPosition aInsPos( aStt, SwIndex( pContentNd ));
             pMyDoc->getIDocumentContentOperations().CopyRange( aCpyPam, aInsPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
 
             nRet = rBlock.PutDoc();
@@ -157,7 +157,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
     SwNodes& rNds = pInsDoc->GetNodes();
 
     SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 );
-    SwCntntNode *const pContentNode = aIdx.GetNode().GetCntntNode();
+    SwContentNode *const pContentNode = aIdx.GetNode().GetContentNode();
     SwPosition aPos( aIdx,
         SwIndex(pContentNode, (pContentNode) ? pContentNode->Len() : 0));
 
@@ -171,7 +171,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
     bool bRet = false;
     SET_CURR_SHELL( this );
 
-    pInsDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pInsDoc->getIDocumentFieldsAccess().LockExpFields();
 
     if( IsTableMode() )
     {
@@ -179,26 +179,26 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
         // selected boxes. The sizes are corrected on a percentage basis.
 
         // search boxes using the layout
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSelBoxes aBoxes;
-        GetTblSel( *this, aBoxes );
-        if( !aBoxes.empty() && 0 != (pTblNd = const_cast<SwTableNode*>(aBoxes[0]
+        GetTableSel( *this, aBoxes );
+        if( !aBoxes.empty() && 0 != (pTableNd = const_cast<SwTableNode*>(aBoxes[0]
             ->GetSttNd()->FindTableNode()) ))
         {
             // check if the table name can be copied
-            bool bCpyTblNm = aBoxes.size() == pTblNd->GetTable().GetTabSortBoxes().size();
-            if( bCpyTblNm )
+            bool bCpyTableNm = aBoxes.size() == pTableNd->GetTable().GetTabSortBoxes().size();
+            if( bCpyTableNm )
             {
-                const OUString rTblName = pTblNd->GetTable().GetFrmFmt()->GetName();
-                const SwFrmFmts& rTblFmts = *pInsDoc->GetTblFrmFmts();
-                for( auto n = rTblFmts.size(); n; )
-                    if( rTblFmts[ --n ]->GetName() == rTblName )
+                const OUString rTableName = pTableNd->GetTable().GetFrameFormat()->GetName();
+                const SwFrameFormats& rTableFormats = *pInsDoc->GetTableFrameFormats();
+                for( auto n = rTableFormats.size(); n; )
+                    if( rTableFormats[ --n ]->GetName() == rTableName )
                     {
-                        bCpyTblNm = false;
+                        bCpyTableNm = false;
                         break;
                     }
             }
-            bRet = pInsDoc->InsCopyOfTbl( aPos, aBoxes, 0, bCpyTblNm, false );
+            bRet = pInsDoc->InsCopyOfTable( aPos, aBoxes, 0, bCpyTableNm, false );
         }
         else
             bRet = false;
@@ -214,12 +214,12 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
             {
                 if( !rPaM.HasMark() )
                 {
-                    SwCntntNode *const pNd = rPaM.GetCntntNode();
+                    SwContentNode *const pNd = rPaM.GetContentNode();
                     if (0 != pNd &&
-                        ( bColSel || !pNd->GetTxtNode() ) )
+                        ( bColSel || !pNd->GetTextNode() ) )
                     {
                         rPaM.SetMark();
-                        rPaM.Move( fnMoveForward, fnGoCntnt );
+                        rPaM.Move( fnMoveForward, fnGoContent );
                         bRet = GetDoc()->getIDocumentContentOperations().CopyRange( rPaM, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true )
                             || bRet;
                         rPaM.Exchange();
@@ -246,9 +246,9 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
         }
     }
 
-    pInsDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pInsDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pInsDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pInsDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     // set the saved Node position back to the correct Node
     if( bRet && pSttNd )
@@ -266,7 +266,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
     GetCrsr();  // creates all cursors if needed
     if( IsSelOnePara() )
     {
-        rBuf = GetSelTxt();
+        rBuf = GetSelText();
         if( GETSELTXT_PARABRK_TO_BLANK == nHndlParaBrk )
         {
             rBuf = rBuf.replaceAll(OUString(0x0a), " ");
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 74a7be25ed56..72d76a34b384 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -74,7 +74,7 @@ void SwEditShell::Insert( sal_Unicode c, bool bOnlyCurrCrsr )
         OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
         (void) bSuccess;
 
-        SaveTblBoxCntnt( rPaM.GetPoint() );
+        SaveTableBoxContent( rPaM.GetPoint() );
         if( bOnlyCurrCrsr )
             break;
 
@@ -104,13 +104,13 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
                 GetDoc()->UpdateRsid( rCurrentCrsr, rStr.getLength() );
 
                 // Set paragraph rsid if beginning of paragraph
-                SwTxtNode *const pTxtNode =
-                    rCurrentCrsr.GetPoint()->nNode.GetNode().GetTxtNode();
-                if( pTxtNode && pTxtNode->Len() == 1)
-                    GetDoc()->UpdateParRsid( pTxtNode );
+                SwTextNode *const pTextNode =
+                    rCurrentCrsr.GetPoint()->nNode.GetNode().GetTextNode();
+                if( pTextNode && pTextNode->Len() == 1)
+                    GetDoc()->UpdateParRsid( pTextNode );
             }
 
-            SaveTblBoxCntnt( rCurrentCrsr.GetPoint() );
+            SaveTableBoxContent( rCurrentCrsr.GetPoint() );
 
         }
     }
@@ -123,7 +123,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
     if ( ! bDoNotSetBidiLevel )
     {
         SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
-        if ( rNode.IsTxtNode() )
+        if ( rNode.IsTextNode() )
         {
             SwIndex& rIdx = pTmpCrsr->GetPoint()->nContent;
             sal_Int32 nPos = rIdx.GetIndex();
@@ -131,25 +131,25 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
             if ( nPrevPos )
                 --nPrevPos;
 
-            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( static_cast<SwTxtNode&>(rNode), true );
+            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( static_cast<SwTextNode&>(rNode), true );
 
             sal_uInt8 nLevel = 0;
             if ( ! pSI )
             {
                 // seems to be an empty paragraph.
                 Point aPt;
-                SwCntntFrm* pFrm =
-                        static_cast<SwTxtNode&>(rNode).getLayoutFrm( GetLayout(), &aPt, pTmpCrsr->GetPoint(),
+                SwContentFrm* pFrm =
+                        static_cast<SwTextNode&>(rNode).getLayoutFrm( GetLayout(), &aPt, pTmpCrsr->GetPoint(),
                                                     false );
 
                 SwScriptInfo aScriptInfo;
-                aScriptInfo.InitScriptInfo( static_cast<SwTxtNode&>(rNode), pFrm->IsRightToLeft() );
+                aScriptInfo.InitScriptInfo( static_cast<SwTextNode&>(rNode), pFrm->IsRightToLeft() );
                 nLevel = aScriptInfo.DirType( nPrevPos );
             }
             else
             {
                 if ( COMPLETE_STRING != pSI->GetInvalidityA() )
-                    pSI->InitScriptInfo( static_cast<SwTxtNode&>(rNode) );
+                    pSI->InitScriptInfo( static_cast<SwTextNode&>(rNode) );
                 nLevel = pSI->DirType( nPrevPos );
             }
 
@@ -171,7 +171,7 @@ void SwEditShell::Overwrite(const OUString &rStr)
         {
             OSL_FAIL( "Doc->getIDocumentContentOperations().Overwrite(Str) failed." );
         }
-        SaveTblBoxCntnt( rPaM.GetPoint() );
+        SaveTableBoxContent( rPaM.GetPoint() );
     }
     EndAllAction();
 }
@@ -191,15 +191,15 @@ long SwEditShell::SplitNode( bool bAutoFormat, bool bCheckTableStart )
     GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
 
     if( bAutoFormat )
-        AutoFmtBySplitNode();
+        AutoFormatBySplitNode();
 
-    ClearTblBoxCntnt();
+    ClearTableBoxContent();
 
     EndAllAction();
     return 1L;
 }
 
-bool SwEditShell::AppendTxtNode()
+bool SwEditShell::AppendTextNode()
 {
     bool bRet = false;
     StartAllAction();
@@ -208,12 +208,12 @@ bool SwEditShell::AppendTxtNode()
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
         GetDoc()->ClearBoxNumAttrs( rPaM.GetPoint()->nNode );
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( *rPaM.GetPoint()) || bRet;
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( *rPaM.GetPoint()) || bRet;
     }
 
     GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
 
-    ClearTblBoxCntnt();
+    ClearTableBoxContent();
 
     EndAllAction();
     return bRet;
@@ -270,13 +270,13 @@ sal_uInt16 SwEditShell::GetGraphicType() const
 // GetMark is not set or points to the same graphic
 bool SwEditShell::GetGrfSize(Size& rSz) const
 {
-    SwNoTxtNode* pNoTxtNd;
+    SwNoTextNode* pNoTextNd;
     SwPaM* pCurrentCrsr = GetCrsr();
     if( ( !pCurrentCrsr->HasMark()
          || pCurrentCrsr->GetPoint()->nNode == pCurrentCrsr->GetMark()->nNode )
-         && 0 != ( pNoTxtNd = pCurrentCrsr->GetNode().GetNoTxtNode() ) )
+         && 0 != ( pNoTextNd = pCurrentCrsr->GetNode().GetNoTextNode() ) )
     {
-        rSz = pNoTxtNd->GetTwipSize();
+        rSz = pNoTextNd->GetTwipSize();
         return true;
     }
     return false;
@@ -295,11 +295,11 @@ void SwEditShell::ReRead( const OUString& rGrfName, const OUString& rFltName,
 /// Returns the name and the filter name of a graphic if the pointer is on a graphic.
 /// If a String-pointer is != 0 then return corresponding name.
 void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName,
-                            const SwFlyFrmFmt* pFmt ) const
+                            const SwFlyFrameFormat* pFormat ) const
 {
     OSL_ENSURE( pGrfName || pFltName, "No parameters" );
-    if( pFmt )
-        SwDoc::GetGrfNms( *pFmt, pGrfName, pFltName );
+    if( pFormat )
+        SwDoc::GetGrfNms( *pFormat, pGrfName, pFltName );
     else
     {
         SwGrfNode *pGrfNode = _GetGrfNode();
@@ -310,33 +310,33 @@ void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName,
 
 const tools::PolyPolygon *SwEditShell::GetGraphicPolygon() const
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
     return pNd->HasContour();
 }
 
 void SwEditShell::SetGraphicPolygon( const tools::PolyPolygon *pPoly )
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
     StartAllAction();
     pNd->SetContour( pPoly );
     SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pNd->getLayoutFrm(GetLayout())->GetUpper());
-    const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-    pFly->GetFmt()->NotifyClients( &rSur, &rSur );
+    const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
+    pFly->GetFormat()->NotifyClients( &rSur, &rSur );
     GetDoc()->getIDocumentState().SetModified();
     EndAllAction();
 }
 
 void SwEditShell::ClearAutomaticContour()
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
-    OSL_ENSURE( pNd, "is no NoTxtNode!" );
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
+    OSL_ENSURE( pNd, "is no NoTextNode!" );
     if( pNd->HasAutomaticContour() )
     {
         StartAllAction();
         pNd->SetContour( NULL, false );
         SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pNd->getLayoutFrm(GetLayout())->GetUpper());
-        const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-        pFly->GetFmt()->NotifyClients( &rSur, &rSur );
+        const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
+        pFly->GetFormat()->NotifyClients( &rSur, &rSur );
         GetDoc()->getIDocumentState().SetModified();
         EndAllAction();
     }
@@ -371,7 +371,7 @@ bool SwEditShell::HasOLEObj( const OUString &rName ) const
         ++aIdx;
         SwNode& rNd = aIdx.GetNode();
         if( rNd.IsOLENode() &&
-            rName == static_cast<SwOLENode&>(rNd).GetChartTblName() &&
+            rName == static_cast<SwOLENode&>(rNd).GetChartTableName() &&
             static_cast<SwOLENode&>(rNd).getLayoutFrm( GetLayout() ) )
             return true;
 
@@ -384,7 +384,7 @@ void SwEditShell::SetChartName( const OUString &rName )
 {
     SwOLENode *pONd = GetCrsr()->GetNode().GetOLENode();
     OSL_ENSURE( pONd, "ChartNode not found" );
-    pONd->SetChartTblName( rName );
+    pONd->SetChartTableName( rName );
 }
 
 void SwEditShell::UpdateCharts( const OUString &rName )
@@ -393,16 +393,16 @@ void SwEditShell::UpdateCharts( const OUString &rName )
 }
 
 /// change table name
-void SwEditShell::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
+void SwEditShell::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName )
 {
-    GetDoc()->SetTableName( rTblFmt, rNewName );
+    GetDoc()->SetTableName( rTableFormat, rNewName );
 }
 
 /// request current word
 OUString SwEditShell::GetCurWord()
 {
     const SwPaM& rPaM = *GetCrsr();
-    const SwTxtNode* pNd = rPaM.GetNode().GetTxtNode();
+    const SwTextNode* pNd = rPaM.GetNode().GetTextNode();
     OUString aString = pNd ?
                      pNd->GetCurWord(rPaM.GetPoint()->nContent.GetIndex()) :
                      OUString();
@@ -427,7 +427,7 @@ const SwDocStat& SwEditShell::GetUpdatedDocStat()
 // OPT: eddocinl.cxx
 
 /// get the reference of a given name in the Doc
-const SwFmtRefMark* SwEditShell::GetRefMark( const OUString& rName ) const
+const SwFormatRefMark* SwEditShell::GetRefMark( const OUString& rName ) const
 {
     return GetDoc()->GetRefMark( rName );
 }
@@ -438,7 +438,7 @@ sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const
     return GetDoc()->GetRefMarks( pStrings );
 }
 
-OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
+OUString SwEditShell::GetDropText( const sal_Int32 nChars ) const
 {
     /*
      * pb: made changes for #i74939#
@@ -446,7 +446,7 @@ OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
      * always return a string even though there is a selection
      */
 
-    OUString aTxt;
+    OUString aText;
     SwPaM* pCrsr = GetCrsr();
     if ( IsMultiSelection() )
     {
@@ -473,22 +473,22 @@ OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
         }
     }
 
-    SwTxtNode* pTxtNd = pCrsr->GetNode( !pCrsr->HasMark() ).GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = pCrsr->GetNode( !pCrsr->HasMark() ).GetTextNode();
+    if( pTextNd )
     {
-        sal_Int32 nDropLen = pTxtNd->GetDropLen( nChars );
+        sal_Int32 nDropLen = pTextNd->GetDropLen( nChars );
         if( nDropLen )
-            aTxt = pTxtNd->GetTxt().copy(0, nDropLen);
+            aText = pTextNd->GetText().copy(0, nDropLen);
     }
 
-    return aTxt;
+    return aText;
 }
 
-void SwEditShell::ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM )
+void SwEditShell::ReplaceDropText( const OUString &rStr, SwPaM* pPaM )
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
     if( pCrsr->GetPoint()->nNode == pCrsr->GetMark()->nNode &&
-        pCrsr->GetNode().GetTxtNode()->IsTxtNode() )
+        pCrsr->GetNode().GetTextNode()->IsTextNode() )
     {
         StartAllAction();
 
@@ -511,18 +511,18 @@ OUString SwEditShell::Calculate()
 
     for(SwPaM& rCurrentPaM : GetCrsr()->GetNext()->GetRingContainer())
     {
-        SwTxtNode* pTxtNd = rCurrentPaM.GetNode().GetTxtNode();
-        if(pTxtNd)
+        SwTextNode* pTextNd = rCurrentPaM.GetNode().GetTextNode();
+        if(pTextNd)
         {
             const SwPosition *pStart = rCurrentPaM.Start(), *pEnd = rCurrentPaM.End();
             const sal_Int32 nStt = pStart->nContent.GetIndex();
-            OUString aStr = pTxtNd->GetExpandTxt( nStt, pEnd->nContent.
+            OUString aStr = pTextNd->GetExpandText( nStt, pEnd->nContent.
                                                 GetIndex() - nStt );
 
             aStr = rCC.lowercase( aStr );
 
             sal_Unicode ch;
-            bool bValidFlds = false;
+            bool bValidFields = false;
             sal_Int32 nPos = 0;
 
             while( nPos < aStr.getLength() )
@@ -545,12 +545,12 @@ OUString SwEditShell::Calculate()
                         (::Find( sVar, aCalc.GetVarTable(),TBLSZ) ||
                          aCalc.VarLook( sVar )) )
                     {
-                        if( !bValidFlds )
+                        if( !bValidFields )
                         {
-                            GetDoc()->getIDocumentFieldsAccess().FldsToCalc( aCalc,
+                            GetDoc()->getIDocumentFieldsAccess().FieldsToCalc( aCalc,
                                                   pStart->nNode.GetIndex(),
                                                   pStart->nContent.GetIndex() );
-                            bValidFlds = true;
+                            bValidFields = true;
                         }
                         aFormel += "(" + aCalc.GetStrResult( aCalc.VarLook( sVar )->nValue ) + ")";
                     }
@@ -598,22 +598,22 @@ Graphic SwEditShell::GetIMapGraphic() const
         }
         else
         {
-            SwFlyFrm* pFlyFrm = rNd.GetCntntNode()->getLayoutFrm( GetLayout() )->FindFlyFrm();
+            SwFlyFrm* pFlyFrm = rNd.GetContentNode()->getLayoutFrm( GetLayout() )->FindFlyFrm();
             if(pFlyFrm)
-                aRet = pFlyFrm->GetFmt()->MakeGraphic();
+                aRet = pFlyFrm->GetFormat()->MakeGraphic();
         }
     }
     return aRet;
 }
 
-bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, bool bKeepSelection )
+bool SwEditShell::InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr, bool bKeepSelection )
 {
     // URL and hint text (directly or via selection) necessary
-    if( rFmt.GetValue().isEmpty() || ( rStr.isEmpty() && !HasSelection() ) )
+    if( rFormat.GetValue().isEmpty() || ( rStr.isEmpty() && !HasSelection() ) )
         return false;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_UI_INSERT_URLTXT, NULL);
-    bool bInsTxt = true;
+    bool bInsText = true;
 
     if( !rStr.isEmpty() )
     {
@@ -621,24 +621,24 @@ bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, boo
         if( pCrsr->HasMark() && *pCrsr->GetPoint() != *pCrsr->GetMark() )
         {
             // Selection existent, multi selection?
-            bool bDelTxt = true;
+            bool bDelText = true;
             if( !pCrsr->IsMultiSelection() )
             {
                 // einfach Selection -> Text ueberpruefen
-                const OUString sTxt(comphelper::string::stripEnd(GetSelTxt(), ' '));
-                if( sTxt == rStr )
-                    bDelTxt = bInsTxt = false;
+                const OUString sText(comphelper::string::stripEnd(GetSelText(), ' '));
+                if( sText == rStr )
+                    bDelText = bInsText = false;
             }
-            else if( rFmt.GetValue() == rStr ) // Are Name and URL equal?
-                bDelTxt = bInsTxt = false;
+            else if( rFormat.GetValue() == rStr ) // Are Name and URL equal?
+                bDelText = bInsText = false;
 
-            if( bDelTxt )
+            if( bDelText )
                 Delete();
         }
-        else if( pCrsr->IsMultiSelection() && rFmt.GetValue() == rStr )
-            bInsTxt = false;
+        else if( pCrsr->IsMultiSelection() && rFormat.GetValue() == rStr )
+            bInsText = false;
 
-        if( bInsTxt )
+        if( bInsText )
         {
             Insert2( rStr );
             SetMark();
@@ -646,15 +646,15 @@ bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, boo
         }
     }
     else
-        bInsTxt = false;
+        bInsText = false;
 
-    SetAttrItem( rFmt );
-    if (bInsTxt && !IsCrsrPtAtEnd())
+    SetAttrItem( rFormat );
+    if (bInsText && !IsCrsrPtAtEnd())
         SwapPam();
     if(!bKeepSelection)
         ClearMark();
-    if( bInsTxt )
-        DontExpandFmt();
+    if( bInsText )
+        DontExpandFormat();
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_UI_INSERT_URLTXT, NULL );
     EndAllAction();
     return true;
@@ -664,26 +664,26 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
 {
     rArr.clear();
 
-    const SwTxtNode* pTxtNd;
-    const SwCharFmts* pFmts = GetDoc()->GetCharFmts();
-    for( auto n = pFmts->size(); 1 < n; )
+    const SwTextNode* pTextNd;
+    const SwCharFormats* pFormats = GetDoc()->GetCharFormats();
+    for( auto n = pFormats->size(); 1 < n; )
     {
-        SwIterator<SwTxtINetFmt,SwCharFmt> aIter(*(*pFmts)[--n]);
-        for( SwTxtINetFmt* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+        SwIterator<SwTextINetFormat,SwCharFormat> aIter(*(*pFormats)[--n]);
+        for( SwTextINetFormat* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
         {
-            if( 0 != ( pTxtNd = pFnd->GetpTxtNode()) &&
-                pTxtNd->GetNodes().IsDocNodes() )
+            if( 0 != ( pTextNd = pFnd->GetpTextNode()) &&
+                pTextNd->GetNodes().IsDocNodes() )
             {
-                SwTxtINetFmt& rAttr = *pFnd;
-                OUString sTxt( pTxtNd->GetExpandTxt( rAttr.GetStart(),
+                SwTextINetFormat& rAttr = *pFnd;
+                OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
                                     *rAttr.GetEnd() - rAttr.GetStart() ) );
 
-                sTxt = comphelper::string::remove(sTxt, 0x0a);
-                sTxt = comphelper::string::strip(sTxt, ' ');
+                sText = comphelper::string::remove(sText, 0x0a);
+                sText = comphelper::string::strip(sText, ' ');
 
-                if( !sTxt.isEmpty() )
+                if( !sText.isEmpty() )
                 {
-                    SwGetINetAttr* pNew = new SwGetINetAttr( sTxt, rAttr );
+                    SwGetINetAttr* pNew = new SwGetINetAttr( sText, rAttr );
                     rArr.push_back( pNew );
                 }
             }
@@ -695,17 +695,17 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
 /// latter is needed for drag & drop)
 bool SwEditShell::DelINetAttrWithText()
 {
-    bool bRet = SelectTxtAttr( RES_TXTATR_INETFMT, false );
+    bool bRet = SelectTextAttr( RES_TXTATR_INETFMT, false );
     if( bRet )
         DeleteSel( *GetCrsr() );
     return bRet;
 }
 
 /// Set the DontExpand flag at the text character attributes
-bool SwEditShell::DontExpandFmt()
+bool SwEditShell::DontExpandFormat()
 {
     bool bRet = false;
-    if( !IsTableMode() && GetDoc()->DontExpandFmt( *GetCrsr()->GetPoint() ))
+    if( !IsTableMode() && GetDoc()->DontExpandFormat( *GetCrsr()->GetPoint() ))
     {
         bRet = true;
         CallChgLnk();
@@ -743,7 +743,7 @@ void SwEditShell::SetNumberingRestart()
         sal_uLong nEndNd = pEndPos->nNode.GetIndex();
         if( nCurrNd <= nEndNd )
         {
-            SwCntntFrm* pCntFrm;
+            SwContentFrm* pCntFrm;
             bool bGoOn = true;
             // iterate over all paragraphs
             while( bGoOn )
@@ -752,27 +752,27 @@ void SwEditShell::SetNumberingRestart()
                 switch( pNd->GetNodeType() )
                 {
                 case ND_TEXTNODE:
-                    if( 0 != ( pCntFrm = static_cast<SwTxtNode*>(pNd)->getLayoutFrm( GetLayout() )) )
+                    if( 0 != ( pCntFrm = static_cast<SwTextNode*>(pNd)->getLayoutFrm( GetLayout() )) )
                     {
                         // skip hidden frames - ignore protection!
-                        if( !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+                        if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
                         {
                             // if the node is numbered and the starting value of the numbering equals the
                             // start value of the numbering rule then set this value as hard starting value
 
                             // get the node num
                             // OD 2005-11-09
-                            SwTxtNode* pTxtNd( pNd->GetTxtNode() );
-                            SwNumRule* pNumRule( pTxtNd->GetNumRule() );
+                            SwTextNode* pTextNd( pNd->GetTextNode() );
+                            SwNumRule* pNumRule( pTextNd->GetNumRule() );
 
                             bool bIsNodeNum =
-                               ( pNumRule && pTxtNd->GetNum() &&
-                                 ( pTxtNd->HasNumber() || pTxtNd->HasBullet() ) &&
-                                 pTxtNd->IsCountedInList() &&
-                                 !pTxtNd->IsListRestart() );
+                               ( pNumRule && pTextNd->GetNum() &&
+                                 ( pTextNd->HasNumber() || pTextNd->HasBullet() ) &&
+                                 pTextNd->IsCountedInList() &&
+                                 !pTextNd->IsListRestart() );
                             if (bIsNodeNum)
                             {
-                                int nListLevel = pTxtNd->GetActualListLevel();
+                                int nListLevel = pTextNd->GetActualListLevel();
 
                                 if (nListLevel < 0)
                                     nListLevel = 0;
@@ -780,7 +780,7 @@ void SwEditShell::SetNumberingRestart()
                                 if (nListLevel >= MAXLEVEL)
                                     nListLevel = MAXLEVEL - 1;
 
-                                 bIsNodeNum = pTxtNd->GetNum()->GetNumber() ==
+                                 bIsNodeNum = pTextNd->GetNum()->GetNumber() ==
                                     pNumRule->Get( static_cast<sal_uInt16>(nListLevel) ).GetStart();
                             }
                             if (bIsNodeNum)
@@ -820,8 +820,8 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
     SwPaM* pPam = GetCrsr();
     SwNodeIndex& rPtIdx = pPam->GetPoint()->nNode;
     SwNodeIndex aStart( rPtIdx );
-    SwCntntNode* pCNd;
-    SwCntntFrm *pCntFrm = 0;
+    SwContentNode* pCNd;
+    SwContentFrm *pCntFrm = 0;
     sal_uLong nTmpPos;
 
     if( !bActPos )
@@ -831,13 +831,13 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
         aStart = nTmpPos + 1;
     else
     {
-        if( 0 != ( pCNd = pPam->GetCntntNode() ) &&
+        if( 0 != ( pCNd = pPam->GetContentNode() ) &&
             0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) )
         {
             const SwStartNode *pTmp;
             if( pCntFrm->IsInFly() )                        // Fly
                 pTmp = pCNd->FindFlyStartNode();
-            else if( pCntFrm->IsInFtn() )                   // Footnote
+            else if( pCntFrm->IsInFootnote() )                   // Footnote
                 pTmp = pCNd->FindFootnoteStartNode();
             else
             {                                               // Footer/Header
@@ -860,11 +860,11 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
     while( 0 != ( pCNd = GetDoc()->GetNodes().GoNextSection(
                 &aStart, true, false )) && ( !bActPos || aStart <= rPtIdx ) )
     {
-        if( 0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) && pCntFrm->IsTxtFrm() )
+        if( 0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) && pCntFrm->IsTextFrm() )
         {
             const sal_Int32 nActPos = bActPos && aStart == rPtIdx ?
                 pPam->GetPoint()->nContent.GetIndex() : COMPLETE_STRING;
-            nRet = nRet + static_cast<SwTxtFrm*>(pCntFrm)->GetLineCount( nActPos );
+            nRet = nRet + static_cast<SwTextFrm*>(pCntFrm)->GetLineCount( nActPos );
         }
     }
     return nRet;
@@ -886,16 +886,16 @@ long SwEditShell::MergeDoc( const SwDoc& rDoc )
     return nRet;
 }
 
-const SwFtnInfo& SwEditShell::GetFtnInfo() const
+const SwFootnoteInfo& SwEditShell::GetFootnoteInfo() const
 {
-    return GetDoc()->GetFtnInfo();
+    return GetDoc()->GetFootnoteInfo();
 }
 
-void SwEditShell::SetFtnInfo(const SwFtnInfo& rInfo)
+void SwEditShell::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
 {
     StartAllAction();
     SET_CURR_SHELL( this );
-    GetDoc()->SetFtnInfo(rInfo);
+    GetDoc()->SetFootnoteInfo(rInfo);
     CallChgLnk();
     EndAllAction();
 }
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 5b1c2d993700..0371f88528d3 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -178,8 +178,8 @@ static SwHyphIter*  pHyphIter = 0;
 
 // With that we save a GetFrm() in Hyphenate.
 // Caution: There are external declaration to these pointers in txtedt.cxx!
-const SwTxtNode *pLinguNode;
-      SwTxtFrm  *pLinguFrm;
+const SwTextNode *pLinguNode;
+      SwTextFrm  *pLinguFrm;
 
 SwLinguIter::SwLinguIter()
     : pSh(0)
@@ -214,7 +214,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
         bSetCurr = 0 != GetCurr();
         nCrsrCnt = pSh->GetCrsrCnt();
         if( pSh->IsTableMode() )
-            pSh->TblCrsrToCursor();
+            pSh->TableCrsrToCursor();
 
         pSh->Push();
         sal_uInt16 n;
@@ -530,7 +530,7 @@ void SwHyphIter::DelSoftHyph( SwPaM &rPam )
     const SwPosition* pStt = rPam.Start();
     const sal_Int32 nStart = pStt->nContent.GetIndex();
     const sal_Int32 nEnd   = rPam.End()->nContent.GetIndex();
-    SwTxtNode *pNode = pStt->nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = pStt->nNode.GetNode().GetTextNode();
     pNode->DelSoftHyph( nStart, nEnd );
 }
 
@@ -721,8 +721,8 @@ uno::Any SwEditShell::SpellContinue(
  *    - add nLastHyphLen onto SelectionStart
  *    - iterate over all selected areas
  *      - pDoc->Hyphenate() iterates over all Nodes of a selection
- *          - pTxtNode->Hyphenate() calls SwTxtFrm::Hyphenate of the EditShell
- *              - SwTxtFrm:Hyphenate() iterates over all rows of the Pam
+ *          - pTextNode->Hyphenate() calls SwTextFrm::Hyphenate of the EditShell
+ *              - SwTextFrm:Hyphenate() iterates over all rows of the Pam
  *                  - LineIter::Hyphenate() sets the Hyphenator and the Pam based on
  *                    the to be separated word.
  *    - Returns true if there is a hyphenation and false if the Pam is processed.
@@ -831,10 +831,10 @@ uno::Reference< XSpellAlternatives >
     SwPosition aPos( *pCrsr->GetPoint() );
      Point aPt( *pPt );
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwWrongList *pWrong;
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pWrong = pNode->GetWrong()) &&
         !pNode->IsInProtectSect() )
     {
@@ -842,7 +842,7 @@ uno::Reference< XSpellAlternatives >
         sal_Int32 nLen = 1;
         if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) )
         {
-            const OUString aText(pNode->GetTxt().copy(nBegin, nLen));
+            const OUString aText(pNode->GetText().copy(nBegin, nLen));
             OUString aWord( aText );
             aWord = comphelper::string::remove(aWord, CH_TXTATR_BREAKWORD);
             aWord = comphelper::string::remove(aWord, CH_TXTATR_INWORD);
@@ -912,13 +912,13 @@ uno::Reference< XSpellAlternatives >
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
                 aState.bRealWidth = true;
-                SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-                SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
+                SwContentNode* pContentNode = pCrsr->GetContentNode();
+                SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
-                pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+                pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
                 rContent = nWordEnd - 1;
                 SwRect aEndRect;
-                pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+                pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
                 Pop(false);
             }
@@ -943,10 +943,10 @@ bool SwEditShell::GetGrammarCorrection(
     SwPosition aPos( *pCrsr->GetPoint() );
     Point aPt( *pPt );
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwGrammarMarkUp *pWrong;
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pWrong = pNode->GetGrammarCheck()) &&
         !pNode->IsInProtectSect() )
     {
@@ -954,7 +954,7 @@ bool SwEditShell::GetGrammarCorrection(
         sal_Int32 nLen = 1;
         if (pWrong->InWrongWord(nBegin, nLen))
         {
-            const OUString aText(pNode->GetTxt().copy(nBegin, nLen));
+            const OUString aText(pNode->GetText().copy(nBegin, nLen));
 
             uno::Reference< linguistic2::XProofreadingIterator >  xGCIterator( mpDoc->GetGCIterator() );
             if (xGCIterator.is())
@@ -1036,13 +1036,13 @@ bool SwEditShell::GetGrammarCorrection(
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
                 aState.bRealWidth = true;
-                SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-                SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
+                SwContentNode* pContentNode = pCrsr->GetContentNode();
+                SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
-                pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+                pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
                 rContent = nWordEnd - 1;
                 SwRect aEndRect;
-                pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+                pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
                 Pop(false);
             }
@@ -1262,21 +1262,21 @@ static SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh)
     {
         SwPaM *pCrsr = pSh->GetCrsr();
         const SwPosition* pStartPos = pCrsr->Start();
-        const SwTxtNode* pTxtNode = pCrsr->GetNode().GetTxtNode();
+        const SwTextNode* pTextNode = pCrsr->GetNode().GetTextNode();
 
-        sal_uInt16 nAct = pDoc->getIDocumentRedlineAccess().GetRedlinePos( *pTxtNode, USHRT_MAX );
+        sal_uInt16 nAct = pDoc->getIDocumentRedlineAccess().GetRedlinePos( *pTextNode, USHRT_MAX );
         const sal_Int32 nStartIndex = pStartPos->nContent.GetIndex();
-        for ( ; nAct < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); nAct++ )
+        for ( ; nAct < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
         {
-            const SwRangeRedline* pRed = pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
+            const SwRangeRedline* pRed = pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
 
-            if ( pRed->Start()->nNode > pTxtNode->GetIndex() )
+            if ( pRed->Start()->nNode > pTextNode->GetIndex() )
                 break;
 
             if( nsRedlineType_t::REDLINE_DELETE == pRed->GetType() )
             {
                 sal_Int32 nStart_, nEnd_;
-                pRed->CalcStartEnd( pTxtNode->GetIndex(), nStart_, nEnd_ );
+                pRed->CalcStartEnd( pTextNode->GetIndex(), nStart_, nEnd_ );
                 sal_Int32 nStart = nStart_;
                 sal_Int32 nEnd = nEnd_;
                 if(nStart >= nStartIndex || nEnd >= nStartIndex)
@@ -1427,7 +1427,7 @@ bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCh
         pMySh->GoEndSentence();
         if( bGrammarErrorFound )
         {
-            const ModelToViewHelper aConversionMap(static_cast<SwTxtNode&>(pCrsr->GetNode()));
+            const ModelToViewHelper aConversionMap(static_cast<SwTextNode&>(pCrsr->GetNode()));
             OUString aExpandText = aConversionMap.getViewText();
             sal_Int32 nSentenceEnd =
                 aConversionMap.ConvertToViewPosition( aGrammarResult.nBehindEndOfSentencePosition );
@@ -1437,7 +1437,7 @@ bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCh
             if( pCrsr->End()->nContent.GetIndex() < nSentenceEnd )
             {
                 pCrsr->End()->nContent.Assign(
-                    pCrsr->End()->nNode.GetNode().GetCntntNode(), nSentenceEnd);
+                    pCrsr->End()->nNode.GetNode().GetContentNode(), nSentenceEnd);
             }
         }
 
@@ -1622,7 +1622,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
             // iterate over the text to find changes in language
             // set the mark equal to the point
             *pCrsr->GetMark() = aStart;
-            SwTxtNode* pTxtNode = pCrsr->GetNode().GetTxtNode();
+            SwTextNode* pTextNode = pCrsr->GetNode().GetTextNode();
             LanguageType eStartLanguage = lcl_GetLanguage(*GetSh());
             SpellContentPosition  aNextRedline = lcl_FindNextDeletedRedline(
                         rDeletedRedlines, aStart.nContent.GetIndex() );
@@ -1631,7 +1631,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                 // select until the end of the current redline
                 const sal_Int32 nEnd = aEnd.nContent.GetIndex() < aNextRedline.nRight ?
                             aEnd.nContent.GetIndex() : aNextRedline.nRight;
-                pCrsr->GetPoint()->nContent.Assign( pTxtNode, nEnd );
+                pCrsr->GetPoint()->nContent.Assign( pTextNode, nEnd );
                 CreatePortion(xAlt, pGrammarResult, false, true);
                 aStart = *pCrsr->End();
                 // search for next redline
@@ -1647,13 +1647,13 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                 bool bField = false;
                 // read the character at the current position to check if it's a field
                 sal_Unicode const cChar =
-                    pTxtNode->GetTxt()[pCrsr->GetMark()->nContent.GetIndex()];
+                    pTextNode->GetText()[pCrsr->GetMark()->nContent.GetIndex()];
                 if( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar)
                 {
-                    const SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrForCharAt(
+                    const SwTextAttr* pTextAttr = pTextNode->GetTextAttrForCharAt(
                         pCrsr->GetMark()->nContent.GetIndex() );
-                    const sal_uInt16 nWhich = pTxtAttr
-                        ? pTxtAttr->Which()
+                    const sal_uInt16 nWhich = pTextAttr
+                        ? pTextAttr->Which()
                         : static_cast<sal_uInt16>(RES_TXTATR_END);
                     switch (nWhich)
                     {
@@ -1708,7 +1708,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                     // select until the end of the current redline
                     const sal_Int32 nEnd = aEnd.nContent.GetIndex() < aNextRedline.nRight ?
                                 aEnd.nContent.GetIndex() : aNextRedline.nRight;
-                    pCrsr->GetPoint()->nContent.Assign( pTxtNode, nEnd );
+                    pCrsr->GetPoint()->nContent.Assign( pTextNode, nEnd );
                     CreatePortion(xAlt, pGrammarResult, false, true);
                     aStart = *pCrsr->End();
                     // search for next redline
@@ -1726,7 +1726,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
 
 void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
 {
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwWrongList *pWrong;
     SwNodeIndex aIdx = rErrorPosition.Start()->nNode;
     SwNodeIndex aEndIdx = rErrorPosition.Start()->nNode;
@@ -1734,7 +1734,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
     sal_Int32 nEnd = COMPLETE_STRING;
     while( aIdx <= aEndIdx )
     {
-        pNode = aIdx.GetNode().GetTxtNode();
+        pNode = aIdx.GetNode().GetTextNode();
         if( pNode ) {
             if( aIdx == aEndIdx )
                 nEnd = rErrorPosition.End()->nContent.GetIndex();
@@ -1744,7 +1744,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
             pWrong = pNode->GetWrong();
             if( pWrong )
                 pWrong->RemoveEntry( nStart, nEnd );
-            SwTxtFrm::repaintTextFrames( *pNode );
+            SwTextFrm::repaintTextFrames( *pNode );
         }
         ++aIdx;
         nStart = 0;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 2cb0d45c9c66..847747b4709f 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -100,10 +100,10 @@ SwPaM& SwPamRanges::SetPam( size_type nArrPos, SwPaM& rPam )
     OSL_ASSERT( nArrPos < Count() );
     const SwPamRange& rTmp = (*this)[ nArrPos ];
     rPam.GetPoint()->nNode = rTmp.nStart;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
     rPam.SetMark();
     rPam.GetPoint()->nNode = rTmp.nEnd;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
     return rPam;
 }
 
@@ -150,9 +150,9 @@ bool SwEditShell::NoNum()
 bool SwEditShell::SelectionHasNumber() const
 {
     bool bResult = HasNumber();
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+    if (!bResult && pTextNd && pTextNd->Len()==0 && !pTextNd->GetNumRule()) {
         SwPamRanges aRangeArr( *GetCrsr() );
         SwPaM aPam( *GetCrsr()->GetPoint() );
         for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n )
@@ -167,15 +167,15 @@ bool SwEditShell::SelectionHasNumber() const
                 }
                 for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++)
                 {
-                    pTxtNd = mpDoc->GetNodes()[nPos]->GetTxtNode();
-                    if (pTxtNd && pTxtNd->Len()!=0)
+                    pTextNd = mpDoc->GetNodes()[nPos]->GetTextNode();
+                    if (pTextNd && pTextNd->Len()!=0)
                     {
-                        bResult = pTxtNd->HasNumber();
+                        bResult = pTextNd->HasNumber();
 
                         // #b6340308# special case: outline numbered, not counted paragraph
                         if ( bResult &&
-                            pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
-                            !pTxtNd->IsCountedInList() )
+                            pTextNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
+                            !pTextNd->IsCountedInList() )
                         {
                             bResult = false;
                         }
@@ -196,9 +196,9 @@ bool SwEditShell::SelectionHasNumber() const
 bool SwEditShell::SelectionHasBullet() const
 {
     bool bResult = HasBullet();
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+    if (!bResult && pTextNd && pTextNd->Len()==0 && !pTextNd->GetNumRule()) {
         SwPamRanges aRangeArr( *GetCrsr() );
         SwPaM aPam( *GetCrsr()->GetPoint() );
         for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n )
@@ -213,10 +213,10 @@ bool SwEditShell::SelectionHasBullet() const
                 }
                 for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++)
                 {
-                    pTxtNd = mpDoc->GetNodes()[nPos]->GetTxtNode();
-                    if (pTxtNd && pTxtNd->Len()!=0)
+                    pTextNd = mpDoc->GetNodes()[nPos]->GetTextNode();
+                    if (pTextNd && pTextNd->Len()!=0)
                     {
-                        bResult = pTxtNd->HasBullet();
+                        bResult = pTextNd->HasBullet();
 
                         if (!bResult) {
                             break;
@@ -235,17 +235,17 @@ bool SwEditShell::HasNumber() const
 {
     bool bResult = false;
 
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        bResult = pTxtNd->HasNumber();
+        bResult = pTextNd->HasNumber();
 
         // special case: outline numbered, not counted paragraph
         if ( bResult &&
-             pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
-             !pTxtNd->IsCountedInList() )
+             pTextNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
+             !pTextNd->IsCountedInList() )
         {
             bResult = false;
         }
@@ -258,12 +258,12 @@ bool SwEditShell::HasBullet() const
 {
     bool bResult = false;
 
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        bResult = pTxtNd->HasBullet();
+        bResult = pTextNd->HasBullet();
     }
 
     return bResult;
@@ -344,8 +344,8 @@ void SwEditShell::ChangeIndentOfAllListLevels( const short nDiff )
     if ( pCurNumRule != NULL )
     {
         SwNumRule aRule(*pCurNumRule);
-        const SwNumFmt& aRootNumFmt(aRule.Get(0));
-        if( nDiff > 0 || aRootNumFmt.GetIndentAt() + nDiff > 0) // fdo#42708
+        const SwNumFormat& aRootNumFormat(aRule.Get(0));
+        if( nDiff > 0 || aRootNumFormat.GetIndentAt() + nDiff > 0) // fdo#42708
         {
             // #i90078#
             aRule.ChangeIndent( nDiff );
@@ -373,11 +373,11 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
         }
         else
         {
-            const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-            if ( pTxtNode != NULL
-                 && pTxtNode->GetActualListLevel() >= 0 )
+            const SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+            if ( pTextNode != NULL
+                 && pTextNode->GetActualListLevel() >= 0 )
             {
-                aRule.SetIndent( nIndent, static_cast< sal_uInt16 >( pTxtNode->GetActualListLevel() ) );
+                aRule.SetIndent( nIndent, static_cast< sal_uInt16 >( pTextNode->GetActualListLevel() ) );
             }
         }
 
@@ -413,9 +413,9 @@ int SwEditShell::GetCurrentParaOutlineLevel( ) const
     int nLevel = 0;
 
     SwPaM* pCrsr = GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    if( pTxtNd )
-        nLevel = pTxtNd->GetAttrOutlineLevel();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    if( pTextNd )
+        nLevel = pTextNd->GetAttrOutlineLevel();
     return nLevel;
 }
 
@@ -465,15 +465,15 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
                         ( pNd = GetDoc()->GetNodes()[ nIdx ])->IsSectionNode() ||
                         ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode())))
                         --nIdx;
-                    if( GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() )
+                    if( GetDoc()->GetNodes()[ nIdx ]->IsTextNode() )
                         nOffset = nIdx - nStt;
                 }
             }
             else             // move down
             {
-                const SwNumRule* pOrig = aCrsr.GetNode(false).GetTxtNode()->GetNumRule();
-                if( aCrsr.GetNode().IsTxtNode() &&
-                    pOrig == aCrsr.GetNode().GetTxtNode()->GetNumRule() )
+                const SwNumRule* pOrig = aCrsr.GetNode(false).GetTextNode()->GetNumRule();
+                if( aCrsr.GetNode().IsTextNode() &&
+                    pOrig == aCrsr.GetNode().GetTextNode()->GetNumRule() )
                 {
                     sal_uLong nStt = aCrsr.GetPoint()->nNode.GetIndex(), nIdx = nStt+1;
 
@@ -483,8 +483,8 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
 
                         if (pNd->IsSectionNode() ||
                             ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode()) ||
-                            ( pNd->IsTxtNode() && pOrig == static_cast<const SwTxtNode*>(pNd)->GetNumRule() &&
-                              static_cast<const SwTxtNode*>(pNd)->GetActualListLevel() > nUpperLevel ))
+                            ( pNd->IsTextNode() && pOrig == static_cast<const SwTextNode*>(pNd)->GetNumRule() &&
+                              static_cast<const SwTextNode*>(pNd)->GetActualListLevel() > nUpperLevel ))
                         {
                             ++nIdx;
                         }
@@ -495,7 +495,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
                         }
                     }
 
-                    if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() )
+                    if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTextNode() )
                         nOffset = 1;
                     else
                         nOffset = nIdx - nStt;
@@ -558,7 +558,7 @@ bool SwEditShell::IsProtectedOutlinePara() const
 {
     bool bRet = false;
     const SwNode& rNd = GetCrsr()->Start()->nNode.GetNode();
-    if( rNd.IsTxtNode() )
+    if( rNd.IsTextNode() )
     {
         const SwOutlineNodes& rOutlNd = GetDoc()->GetNodes().GetOutLineNds();
         SwNodePtr pNd = const_cast<SwNodePtr>(&rNd);
@@ -572,7 +572,7 @@ bool SwEditShell::IsProtectedOutlinePara() const
         {
             SwNodePtr pTmpNd = rOutlNd[ nPos ];
 
-            int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
+            int nTmpLvl = pTmpNd->GetTextNode()->GetAttrOutlineLevel();
 
             OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,
                     "<SwEditShell::IsProtectedOutlinePara()>" );
@@ -653,10 +653,10 @@ bool SwEditShell::IsNoNum( bool bChkStart ) const
          && !HasSelection()
          && ( !bChkStart || IsSttPara() ) )
     {
-        const SwTxtNode* pTxtNd = GetCrsr()->GetNode().GetTxtNode();
-        if ( pTxtNd != NULL )
+        const SwTextNode* pTextNd = GetCrsr()->GetNode().GetTextNode();
+        if ( pTextNd != NULL )
         {
-            bResult =  !pTxtNd->IsCountedInList();
+            bResult =  !pTextNd->IsCountedInList();
         }
     }
 
@@ -669,19 +669,19 @@ sal_uInt8 SwEditShell::GetNumLevel() const
     sal_uInt8 nLevel = MAXLEVEL;
 
     SwPaM* pCrsr = GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
 
-    OSL_ENSURE( pTxtNd, "GetNumLevel() without text node" );
-    if ( pTxtNd == NULL )
+    OSL_ENSURE( pTextNd, "GetNumLevel() without text node" );
+    if ( pTextNd == NULL )
         return nLevel;
 
-    const SwNumRule* pRule = pTxtNd->GetNumRule();
+    const SwNumRule* pRule = pTextNd->GetNumRule();
     if ( pRule != NULL )
     {
-        const int nListLevelOfTxtNode( pTxtNd->GetActualListLevel() );
-        if ( nListLevelOfTxtNode >= 0 )
+        const int nListLevelOfTextNode( pTextNd->GetActualListLevel() );
+        if ( nListLevelOfTextNode >= 0 )
         {
-            nLevel = static_cast<sal_uInt8>( nListLevelOfTxtNode );
+            nLevel = static_cast<sal_uInt8>( nListLevelOfTextNode );
         }
     }
 
@@ -780,10 +780,10 @@ OUString SwEditShell::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoN
     return GetDoc()->GetUniqueNumRuleName( pChkStr, bAutoNum );
 }
 
-void SwEditShell::ChgNumRuleFmts( const SwNumRule& rRule )
+void SwEditShell::ChgNumRuleFormats( const SwNumRule& rRule )
 {
     StartAllAction();
-    GetDoc()->ChgNumRuleFmts( rRule );
+    GetDoc()->ChgNumRuleFormats( rRule );
     EndAllAction();
 }
 
@@ -817,8 +817,8 @@ void SwEditShell::SetNumRuleStart( bool bFlag, SwPaM* pPaM )
 bool SwEditShell::IsNumRuleStart( SwPaM* pPaM ) const
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( );
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    return pTxtNd && pTxtNd->IsListRestart();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    return pTextNd && pTextNd->IsListRestart();
 }
 
 void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM )
@@ -844,13 +844,13 @@ void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM )
 sal_uInt16 SwEditShell::GetNodeNumStart( SwPaM* pPaM ) const
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
     // correction: check, if list restart value is set at text node and
-    // use new method <SwTxtNode::GetAttrListRestartValue()>.
+    // use new method <SwTextNode::GetAttrListRestartValue()>.
     // return USHRT_MAX, if no list restart value is found.
-    if ( pTxtNd && pTxtNd->HasAttrListRestartValue() )
+    if ( pTextNd && pTextNd->HasAttrListRestartValue() )
     {
-        return static_cast<sal_uInt16>(pTxtNd->GetAttrListRestartValue());
+        return static_cast<sal_uInt16>(pTextNd->GetAttrListRestartValue());
     }
     return USHRT_MAX;
 }
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index c5bc2a46acaf..47be00cacd46 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -49,12 +49,12 @@ bool SwEditShell::IsRedlineOn() const
 
 sal_uInt16 SwEditShell::GetRedlineCount() const
 {
-    return GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl().size();
+    return GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().size();
 }
 
 const SwRangeRedline& SwEditShell::GetRedline( sal_uInt16 nPos ) const
 {
-    return *GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl()[ nPos ];
+    return *GetDoc()->getIDocumentRedlineAccess().GetRedlineTable()[ nPos ];
 }
 
 static void lcl_InvalidateAll( SwViewShell* pSh )
@@ -143,10 +143,10 @@ void SwEditShell::UpdateRedlineAttr()
  */
 sal_uInt16 SwEditShell::FindRedlineOfData( const SwRedlineData& rData ) const
 {
-    const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 
-    for( sal_uInt16 i = 0, nCnt = rTbl.size(); i < nCnt; ++i )
-        if( &rTbl[ i ]->GetRedlineData() == &rData )
+    for( sal_uInt16 i = 0, nCnt = rTable.size(); i < nCnt; ++i )
+        if( &rTable[ i ]->GetRedlineData() == &rData )
             return i;
     return USHRT_MAX;
 }
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 6dadbaa05a83..f508e1e5dc0d 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -88,7 +88,7 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
         SwPosition aPos( *GetCrsr()->GetPoint() );
         Point aPt( *pPt );
         GetLayout()->GetCrsrOfst( &aPos, aPt );
-        SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
         pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
     }
     else
@@ -100,7 +100,7 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
     {
         SwSectionFrm* pSect = pFrm->FindSctFrm();
         OSL_ENSURE( pSect, "GetAnySection: Where's my Sect?" );
-        if( pSect->IsInFtn() && pSect->GetUpper()->IsInSct() )
+        if( pSect->IsInFootnote() && pSect->GetUpper()->IsInSct() )
         {
             pSect = pSect->GetUpper()->FindSctFrm();
             OSL_ENSURE( pSect, "GetAnySection: Where's my SectFrm?" );
@@ -110,24 +110,24 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
     return NULL;
 }
 
-size_t SwEditShell::GetSectionFmtCount() const
+size_t SwEditShell::GetSectionFormatCount() const
 {
     return GetDoc()->GetSections().size();
 }
 
 bool SwEditShell::IsAnySectionInDoc( bool bChkReadOnly, bool bChkHidden, bool bChkTOX ) const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
 
-    for( const SwSectionFmt* pFmt : rFmts )
+    for( const SwSectionFormat* pFormat : rFormats )
     {
         SectionType eTmpType;
-        if( pFmt->IsInNodesArr() &&
+        if( pFormat->IsInNodesArr() &&
             (bChkTOX  ||
-                ( (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                ( (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                   && TOX_HEADER_SECTION != eTmpType ) ) )
         {
-            const SwSection& rSect = *pFmt->GetSection();
+            const SwSection& rSect = *pFormat->GetSection();
             if( (!bChkReadOnly && !bChkHidden ) ||
                 (bChkReadOnly && rSect.IsProtectFlag() ) ||
                 (bChkHidden && rSect.IsHiddenFlag() ) )
@@ -137,21 +137,21 @@ bool SwEditShell::IsAnySectionInDoc( bool bChkReadOnly, bool bChkHidden, bool bC
     return false;
 }
 
-size_t SwEditShell::GetSectionFmtPos( const SwSectionFmt& rFmt ) const
+size_t SwEditShell::GetSectionFormatPos( const SwSectionFormat& rFormat ) const
 {
-    SwSectionFmt* pFmt = const_cast<SwSectionFmt*>(&rFmt);
-    return GetDoc()->GetSections().GetPos( pFmt );
+    SwSectionFormat* pFormat = const_cast<SwSectionFormat*>(&rFormat);
+    return GetDoc()->GetSections().GetPos( pFormat );
 }
 
-const SwSectionFmt& SwEditShell::GetSectionFmt(size_t nFmt) const
+const SwSectionFormat& SwEditShell::GetSectionFormat(size_t nFormat) const
 {
-    return *GetDoc()->GetSections()[ nFmt ];
+    return *GetDoc()->GetSections()[ nFormat ];
 }
 
-void SwEditShell::DelSectionFmt(size_t nFmt)
+void SwEditShell::DelSectionFormat(size_t nFormat)
 {
     StartAllAction();
-    GetDoc()->DelSectionFmt( GetDoc()->GetSections()[ nFmt ] );
+    GetDoc()->DelSectionFormat( GetDoc()->GetSections()[ nFormat ] );
     // Call the AttrChangeNotify on the UI page.
     CallChgLnk();
     EndAllAction();
@@ -173,10 +173,10 @@ OUString SwEditShell::GetUniqueSectionName( const OUString* pChkStr ) const
 }
 
 void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
-                                    SwSectionFmt* pSectFmt )
+                                    SwSectionFormat* pSectFormat )
 {
-    if( pSectFmt )
-        _SetSectionAttr( *pSectFmt, rSet );
+    if( pSectFormat )
+        _SetSectionAttr( *pSectFormat, rSet );
     else
     {
         // for all section in the selection
@@ -192,10 +192,10 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
             if( pSttSectNd || pEndSectNd )
             {
                 if( pSttSectNd )
-                    _SetSectionAttr( *pSttSectNd->GetSection().GetFmt(),
+                    _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(),
                                     rSet );
                 if( pEndSectNd && pSttSectNd != pEndSectNd )
-                    _SetSectionAttr( *pEndSectNd->GetSection().GetFmt(),
+                    _SetSectionAttr( *pEndSectNd->GetSection().GetFormat(),
                                     rSet );
 
                 if( pSttSectNd && pEndSectNd )
@@ -215,7 +215,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
                             || ( aSIdx.GetNode().IsEndNode() &&
                                 0 != ( pSttSectNd = aSIdx.GetNode().
                                     StartOfSectionNode()->GetSectionNode())) )
-                            _SetSectionAttr( *pSttSectNd->GetSection().GetFmt(),
+                            _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(),
                                             rSet );
                         ++aSIdx;
                     }
@@ -226,7 +226,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
     }
 }
 
-void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt,
+void SwEditShell::_SetSectionAttr( SwSectionFormat& rSectFormat,
                                     const SfxItemSet& rSet )
 {
     StartAllAction();
@@ -234,10 +234,10 @@ void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt,
     {
         SfxItemSet aSet(rSet);
         aSet.ClearItem(RES_CNTNT);
-        GetDoc()->SetAttr( aSet, rSectFmt );
+        GetDoc()->SetAttr( aSet, rSectFormat );
     }
     else
-        GetDoc()->SetAttr( rSet, rSectFmt );
+        GetDoc()->SetAttr( rSet, rSectFormat );
 
     // Call the AttrChangeNotify on the UI page.
     CallChgLnk();
@@ -256,10 +256,10 @@ sal_uInt16 SwEditShell::GetFullSelectedSectionCount() const
 
         const SwPosition* pStt = rPaM.Start(),
                         * pEnd = rPaM.End();
-        const SwCntntNode* pCNd;
+        const SwContentNode* pCNd;
         // check the selection, if Start at Node begin and End at Node end
         if( pStt->nContent.GetIndex() ||
-            ( 0 == ( pCNd = pEnd->nNode.GetNode().GetCntntNode() )) ||
+            ( 0 == ( pCNd = pEnd->nNode.GetNode().GetContentNode() )) ||
             pCNd->Len() != pEnd->nContent.GetIndex() )
         {
             nRet = 0;
@@ -351,7 +351,7 @@ static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
         // - we're at or just before a start node
         // - there are only start nodes between the current and pInnermostNode
         SwNodeIndex aBegin( pCurrentPos->nNode );
-        if( rCurrentNode.IsCntntNode() &&
+        if( rCurrentNode.IsContentNode() &&
             (pCurrentPos->nContent.GetIndex() == 0))
             --aBegin;
         while( (aBegin != pInnermostNode->GetIndex()) &&
@@ -364,9 +364,9 @@ static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
         // - there are only end nodes between the current node and
         //   pInnermostNode's end node
         SwNodeIndex aEnd( pCurrentPos->nNode );
-        if( rCurrentNode.IsCntntNode() &&
+        if( rCurrentNode.IsContentNode() &&
             ( pCurrentPos->nContent.GetIndex() ==
-              rCurrentNode.GetCntntNode()->Len() ) )
+              rCurrentNode.GetContentNode()->Len() ) )
             ++aEnd;
         while( (aEnd != pInnermostNode->EndOfSectionNode()->GetIndex()) &&
                aEnd.GetNode().IsEndNode() )
@@ -415,7 +415,7 @@ bool SwEditShell::DoSpecialInsert()
         SwPosition aInsertPos( aInsertIndex );
 
         // insert a new text node, and set the cursor
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aInsertPos );
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aInsertPos );
         *pCursorPos = aInsertPos;
 
         // call AttrChangeNotify for the UI
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 39693a8923d6..d6c8ec33d14c 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -90,10 +90,10 @@ bool ConvertTableToText( const SwTableNode *pConstTableNode, sal_Unicode cCh )
 }
 //End for bug #i119954#
 
-const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTableOpts,
                                          sal_uInt16 nRows, sal_uInt16 nCols,
                                          sal_Int16 eAdj,
-                                         const SwTableAutoFmt* pTAFmt )
+                                         const SwTableAutoFormat* pTAFormat )
 {
     StartAllAction();
     SwPosition* pPos = GetCrsr()->GetPoint();
@@ -107,9 +107,9 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
 
     // If called from a shell the adjust item is propagated
     // from pPos to the new content nodes in the table.
-    const SwTable *pTable = GetDoc()->InsertTable( rInsTblOpts, *pPos,
+    const SwTable *pTable = GetDoc()->InsertTable( rInsTableOpts, *pPos,
                                                    nRows, nCols,
-                                                   eAdj, pTAFmt,
+                                                   eAdj, pTAFormat,
                                                    0, true );
     if( bEndUndo )
         EndUndo( UNDO_END );
@@ -118,10 +118,10 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
     return *pTable;
 }
 
-bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
+bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTableOpts,
                                sal_Unicode cCh,
                                sal_Int16 eAdj,
-                               const SwTableAutoFmt* pTAFmt )
+                               const SwTableAutoFormat* pTAFormat )
 {
     SwWait aWait( *GetDoc()->GetDocShell(), true );
     bool bRet = false;
@@ -129,8 +129,8 @@ bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
         if( rPaM.HasMark() )
-            bRet |= 0 != GetDoc()->TextToTable( rInsTblOpts, rPaM, cCh,
-                                                eAdj, pTAFmt );
+            bRet |= 0 != GetDoc()->TextToTable( rInsTableOpts, rPaM, cCh,
+                                                eAdj, pTAFormat );
     }
     EndAllAction();
     return bRet;
@@ -141,26 +141,26 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
     SwWait aWait( *GetDoc()->GetDocShell(), true );
     bool bRet = false;
     SwPaM* pCrsr = GetCrsr();
-    const SwTableNode* pTblNd =
-            GetDoc()->IsIdxInTbl( pCrsr->GetPoint()->nNode );
+    const SwTableNode* pTableNd =
+            GetDoc()->IsIdxInTable( pCrsr->GetPoint()->nNode );
     if( IsTableMode() )
     {
         ClearMark();
         pCrsr = GetCrsr();
     }
-    else if( !pTblNd || pCrsr->GetNext() != pCrsr )
+    else if( !pTableNd || pCrsr->GetNext() != pCrsr )
         return bRet;
 
     // TL_CHART2:
     // tell the charts about the table to be deleted and have them use their own data
-    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &pTblNd->GetTable() );
+    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &pTableNd->GetTable() );
 
     StartAllAction();
 
     // move current Cursor out of the listing area
-    SwNodeIndex aTabIdx( *pTblNd );
+    SwNodeIndex aTabIdx( *pTableNd );
     pCrsr->DeleteMark();
-    pCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
+    pCrsr->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
     pCrsr->GetPoint()->nContent.Assign( 0, 0 );
     // move sPoint and Mark out of the area!
     pCrsr->SetMark();
@@ -168,14 +168,14 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
 
     //Modified for bug #i119954# Application crashed if undo/redo covert nest table to text
     StartUndo();
-    bRet = ConvertTableToText( pTblNd, cCh );
+    bRet = ConvertTableToText( pTableNd, cCh );
     EndUndo();
     //End  for bug #i119954#
     pCrsr->GetPoint()->nNode = aTabIdx;
 
-    SwCntntNode* pCNd = pCrsr->GetCntntNode();
+    SwContentNode* pCNd = pCrsr->GetContentNode();
     if( !pCNd )
-        pCrsr->Move( fnMoveForward, fnGoCntnt );
+        pCrsr->Move( fnMoveForward, fnGoContent );
     else
         pCrsr->GetPoint()->nContent.Assign( pCNd, 0 );
 
@@ -198,7 +198,7 @@ bool SwEditShell::IsTextToTableAvailable() const
             if( nStt > nEnd )   { sal_uLong n = nStt; nStt = nEnd; nEnd = n; }
 
             for( ; nStt <= nEnd; ++nStt )
-                if( !GetDoc()->GetNodes()[ nStt ]->IsTxtNode() )
+                if( !GetDoc()->GetNodes()[ nStt ]->IsTextNode() )
                 {
                     bOnlyText = false;
                     break;
@@ -212,7 +212,7 @@ bool SwEditShell::IsTextToTableAvailable() const
     return bOnlyText;
 }
 
-void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
+void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTableOpts,
                                   SwDDEFieldType* pDDEType,
                                   sal_uInt16 nRows, sal_uInt16 nCols,
                                   sal_Int16 eAdj )
@@ -228,15 +228,15 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
         GetDoc()->getIDocumentContentOperations().SplitNode( *pPos, false );
     }
 
-    const SwInsertTableOptions aInsTblOpts( rInsTblOpts.mnInsMode | tabopts::DEFAULT_BORDER,
-                                            rInsTblOpts.mnRowsToRepeat );
-    SwTable* pTbl = const_cast<SwTable*>(GetDoc()->InsertTable( aInsTblOpts, *pPos,
+    const SwInsertTableOptions aInsTableOpts( rInsTableOpts.mnInsMode | tabopts::DEFAULT_BORDER,
+                                            rInsTableOpts.mnRowsToRepeat );
+    SwTable* pTable = const_cast<SwTable*>(GetDoc()->InsertTable( aInsTableOpts, *pPos,
                                                      nRows, nCols, eAdj ));
 
-    SwTableNode* pTblNode = const_cast<SwTableNode*>(pTbl->GetTabSortBoxes()[ 0 ]->
+    SwTableNode* pTableNode = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]->
                                                 GetSttNd()->FindTableNode());
-    SwDDETable* pDDETbl = new SwDDETable( *pTbl, pDDEType );
-    pTblNode->SetNewTable( pDDETbl );       // setze die DDE-Tabelle
+    SwDDETable* pDDETable = new SwDDETable( *pTable, pDDEType );
+    pTableNode->SetNewTable( pDDETable );       // setze die DDE-Tabelle
 
     if( bEndUndo )
         EndUndo( UNDO_END );
@@ -247,17 +247,17 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
 /** update fields of a listing */
 void SwEditShell::UpdateTable()
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
+    const SwTableNode* pTableNd = IsCrsrInTable();
 
     // Keine Arme keine Kekse
-    if( pTblNd )
+    if( pTableNd )
     {
         StartAllAction();
         if( DoesUndo() )
             StartUndo();
-        EndAllTblBoxEdit();
-        SwTableFmlUpdate aTblUpdate( &pTblNd->GetTable() );
-        GetDoc()->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+        EndAllTableBoxEdit();
+        SwTableFormulaUpdate aTableUpdate( &pTableNd->GetTable() );
+        GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
         if( DoesUndo() )
             EndUndo();
         EndAllAction();
@@ -266,24 +266,24 @@ void SwEditShell::UpdateTable()
 
 // get/set Change Mode
 
-TblChgMode SwEditShell::GetTblChgMode() const
+TableChgMode SwEditShell::GetTableChgMode() const
 {
-    TblChgMode eMode;
-    const SwTableNode* pTblNd = IsCrsrInTbl();
-    if( pTblNd )
-        eMode = pTblNd->GetTable().GetTblChgMode();
+    TableChgMode eMode;
+    const SwTableNode* pTableNd = IsCrsrInTable();
+    if( pTableNd )
+        eMode = pTableNd->GetTable().GetTableChgMode();
     else
-        eMode = GetTblChgDefaultMode();
+        eMode = GetTableChgDefaultMode();
     return eMode;
 }
 
-void SwEditShell::SetTblChgMode( TblChgMode eMode )
+void SwEditShell::SetTableChgMode( TableChgMode eMode )
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
+    const SwTableNode* pTableNd = IsCrsrInTable();
 
-    if( pTblNd )
+    if( pTableNd )
     {
-        const_cast<SwTable&>(pTblNd->GetTable()).SetTblChgMode( eMode );
+        const_cast<SwTable&>(pTableNd->GetTable()).SetTableChgMode( eMode );
         if( !GetDoc()->getIDocumentState().IsModified() )   // Bug 57028
         {
             GetDoc()->GetIDocumentUndoRedo().SetUndoNoResetModified();
@@ -292,11 +292,11 @@ void SwEditShell::SetTblChgMode( TblChgMode eMode )
     }
 }
 
-bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
+bool SwEditShell::GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const
 {
     SwSelBoxes aBoxes;
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
         do {
@@ -315,30 +315,30 @@ bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
     for (size_t n = 0; n < aBoxes.size(); ++n)
     {
         const SwTableBox* pSelBox = aBoxes[ n ];
-        const SwTableBoxFmt* pTblFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
+        const SwTableBoxFormat* pTableFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
         if( !n )
         {
             // Convert formulae into external presentation
-            const SwTable& rTbl = pSelBox->GetSttNd()->FindTableNode()->GetTable();
+            const SwTable& rTable = pSelBox->GetSttNd()->FindTableNode()->GetTable();
 
-            SwTableFmlUpdate aTblUpdate( &rTbl );
-            aTblUpdate.eFlags = TBL_BOXNAME;
-            static_cast<SwDoc*>(GetDoc())->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+            SwTableFormulaUpdate aTableUpdate( &rTable );
+            aTableUpdate.eFlags = TBL_BOXNAME;
+            static_cast<SwDoc*>(GetDoc())->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 
-            rSet.Put( pTblFmt->GetAttrSet() );
+            rSet.Put( pTableFormat->GetAttrSet() );
         }
         else
-            rSet.MergeValues( pTblFmt->GetAttrSet() );
+            rSet.MergeValues( pTableFormat->GetAttrSet() );
     }
     return 0 != rSet.Count();
 }
 
-void SwEditShell::SetTblBoxFormulaAttrs( const SfxItemSet& rSet )
+void SwEditShell::SetTableBoxFormulaAttrs( const SfxItemSet& rSet )
 {
     SET_CURR_SHELL( this );
     SwSelBoxes aBoxes;
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
         do {
@@ -356,13 +356,13 @@ void SwEditShell::SetTblBoxFormulaAttrs( const SfxItemSet& rSet )
 
     // When setting a formula, do not check further!
     if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA ))
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
     for (size_t n = 0; n < aBoxes.size(); ++n)
     {
-        GetDoc()->SetTblBoxFormulaAttrs( *aBoxes[ n ], rSet );
+        GetDoc()->SetTableBoxFormulaAttrs( *aBoxes[ n ], rSet );
     }
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
     EndAllAction();
@@ -386,26 +386,26 @@ bool SwEditShell::IsTableBoxTextFormat() const
     if( !pBox )
         return false;
 
-    sal_uInt32 nFmt = 0;
+    sal_uInt32 nFormat = 0;
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == pBox->GetFrmFmt()->GetAttrSet().GetItemState(
+    if( SfxItemState::SET == pBox->GetFrameFormat()->GetAttrSet().GetItemState(
         RES_BOXATR_FORMAT, true, &pItem ))
     {
-        nFmt = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-        return GetDoc()->GetNumberFormatter()->IsTextFormat( nFmt ) ||
-                static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmt;
+        nFormat = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+        return GetDoc()->GetNumberFormatter()->IsTextFormat( nFormat ) ||
+                static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFormat;
     }
 
-    sal_uLong nNd = pBox->IsValidNumTxtNd();
+    sal_uLong nNd = pBox->IsValidNumTextNd();
     if( ULONG_MAX == nNd )
         return true;
 
-    const OUString& rTxt = GetDoc()->GetNodes()[ nNd ]->GetTxtNode()->GetTxt();
-    if( rTxt.isEmpty() )
+    const OUString& rText = GetDoc()->GetNodes()[ nNd ]->GetTextNode()->GetText();
+    if( rText.isEmpty() )
         return false;
 
     double fVal;
-    return !GetDoc()->GetNumberFormatter()->IsNumberFormat( rTxt, nFmt, fVal );
+    return !GetDoc()->GetNumberFormatter()->IsNumberFormat( rText, nFormat, fVal );
 }
 
 OUString SwEditShell::GetTableBoxText() const
@@ -424,8 +424,8 @@ OUString SwEditShell::GetTableBoxText() const
         }
 
         sal_uLong nNd;
-        if( pBox && ULONG_MAX != ( nNd = pBox->IsValidNumTxtNd() ) )
-            sRet = GetDoc()->GetNodes()[ nNd ]->GetTxtNode()->GetTxt();
+        if( pBox && ULONG_MAX != ( nNd = pBox->IsValidNumTextNd() ) )
+            sRet = GetDoc()->GetNodes()[ nNd ]->GetTextNode()->GetText();
     }
     return sRet;
 }
@@ -470,22 +470,22 @@ bool SwEditShell::CanMergeTable( bool bWithPrev, bool* pChkNxtPrv ) const
 {
     bool bRet = false;
     const SwPaM *pCrsr = GetCrsr();
-    const SwTableNode* pTblNd = pCrsr->GetNode().FindTableNode();
-    if( pTblNd && !pTblNd->GetTable().ISA( SwDDETable ))
+    const SwTableNode* pTableNd = pCrsr->GetNode().FindTableNode();
+    if( pTableNd && !pTableNd->GetTable().ISA( SwDDETable ))
     {
-        bool bNew = pTblNd->GetTable().IsNewModel();
+        bool bNew = pTableNd->GetTable().IsNewModel();
         const SwNodes& rNds = GetDoc()->GetNodes();
         if( pChkNxtPrv )
         {
-            const SwTableNode* pChkNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+            const SwTableNode* pChkNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
             if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
                 bNew == pChkNd->GetTable().IsNewModel() &&
                 // Consider table in table case
-                pChkNd->EndOfSectionIndex() == pTblNd->GetIndex() - 1 )
+                pChkNd->EndOfSectionIndex() == pTableNd->GetIndex() - 1 )
                 *pChkNxtPrv = true, bRet = true;        // using Prev is possible
             else
             {
-                pChkNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+                pChkNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
                 if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
                     bNew == pChkNd->GetTable().IsNewModel() )
                     *pChkNxtPrv = false, bRet = true;   // using Next is possible
@@ -493,20 +493,20 @@ bool SwEditShell::CanMergeTable( bool bWithPrev, bool* pChkNxtPrv ) const
         }
         else
         {
-            const SwTableNode* pTmpTblNd = 0;
+            const SwTableNode* pTmpTableNd = 0;
 
             if( bWithPrev )
             {
-                pTmpTblNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+                pTmpTableNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
                 // Consider table in table case
-                if ( pTmpTblNd && pTmpTblNd->EndOfSectionIndex() != pTblNd->GetIndex() - 1 )
-                    pTmpTblNd = 0;
+                if ( pTmpTableNd && pTmpTableNd->EndOfSectionIndex() != pTableNd->GetIndex() - 1 )
+                    pTmpTableNd = 0;
             }
             else
-                pTmpTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+                pTmpTableNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
 
-            bRet = pTmpTblNd && !pTmpTblNd->GetTable().ISA( SwDDETable ) &&
-                   bNew == pTmpTblNd->GetTable().IsNewModel();
+            bRet = pTmpTableNd && !pTmpTableNd->GetTable().ISA( SwDDETable ) &&
+                   bNew == pTmpTableNd->GetTable().IsNewModel();
         }
     }
     return bRet;
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 879285db36ff..7babb2d3a588 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -111,7 +111,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly)
 
     SwSectionData aSectionData(rTOXSect);
     aSectionData.SetProtectFlag(bReadonly);
-    UpdateSection( GetSectionFmtPos( *rTOXSect.GetFmt()  ), aSectionData, 0 );
+    UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat()  ), aSectionData, 0 );
 }
 
 const SwTOXBase*    SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
@@ -161,7 +161,7 @@ bool SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
     OSL_ENSURE( rTOX.ISA( SwTOXBaseSection ),  "no TOXBaseSection!" );
     SwTOXBaseSection* pTOX = const_cast<SwTOXBaseSection*>(static_cast<const SwTOXBaseSection*>(&rTOX));
     OSL_ENSURE(pTOX, "no current listing");
-    if( pTOX && 0 != pTOX->GetFmt()->GetSectionNode() )
+    if( pTOX && 0 != pTOX->GetFormat()->GetSectionNode() )
     {
         SwDoc* pMyDoc = GetDoc();
         SwDocShell* pDocSh = pMyDoc->GetDocShell();
@@ -223,13 +223,13 @@ sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rA
 
 sal_uInt16 SwEditShell::GetTOXCount() const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
     sal_uInt16 nRet = 0;
-    for( auto n = rFmts.size(); n; )
+    for( auto n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() )
+            pSect->GetFormat()->GetSectionNode() )
             ++nRet;
     }
     return nRet;
@@ -237,13 +237,13 @@ sal_uInt16 SwEditShell::GetTOXCount() const
 
 const SwTOXBase* SwEditShell::GetTOX( sal_uInt16 nPos ) const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
     sal_uInt16 nCnt {0};
-    for( const SwSectionFmt *pFmt : rFmts )
+    for( const SwSectionFormat *pFormat : rFormats )
     {
-        const SwSection* pSect = pFmt->GetSection();
+        const SwSection* pSect = pFormat->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() &&
+            pSect->GetFormat()->GetSectionNode() &&
             nCnt++ == nPos )
         {
             OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
@@ -295,7 +295,7 @@ void SwEditShell::ApplyAutoMark()
         SwTOXMark::InsertTOXMarks( aMarks, *pTOXType );
         for( SwTOXMark* pMark : aMarks )
         {
-            if(pMark->IsAutoGenerated() && pMark->GetTxtTOXMark())
+            if(pMark->IsAutoGenerated() && pMark->GetTextTOXMark())
                 // mba: test iteration; objects are deleted in iteration
                 DeleteTOXMark(pMark);
         }
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index f657c0609c4f..3a3944e01b29 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -53,15 +53,15 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
         return;
     }
 
-    SwFrmFmt * pSelFmt(0);
+    SwFrameFormat * pSelFormat(0);
     SdrMarkList * pMarkList(0);
-    rContext.GetSelections(pSelFmt, pMarkList);
+    rContext.GetSelections(pSelFormat, pMarkList);
 
-    if (pSelFmt) // select frame
+    if (pSelFormat) // select frame
     {
-        if (RES_DRAWFRMFMT == pSelFmt->Which())
+        if (RES_DRAWFRMFMT == pSelFormat->Which())
         {
-            SdrObject* pSObj = pSelFmt->FindSdrObject();
+            SdrObject* pSObj = pSelFormat->FindSdrObject();
             static_cast<SwFEShell*>(this)->SelectObj(
                     pSObj->GetCurrentBoundRect().Center() );
         }
@@ -69,14 +69,14 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
         {
             Point aPt;
             SwFlyFrm *const pFly =
-                static_cast<SwFlyFrmFmt*>(pSelFmt)->GetFrm(& aPt, false);
+                static_cast<SwFlyFrameFormat*>(pSelFormat)->GetFrm(& aPt, false);
             if (pFly)
             {
                 // fdo#36681: Invalidate the content and layout to refresh
                 // the picture anchoring properly
                 SwPageFrm* pPageFrm = pFly->FindPageFrmOfAnchor();
                 pPageFrm->InvalidateFlyLayout();
-                pPageFrm->InvalidateCntnt();
+                pPageFrm->InvalidateContent();
 
                 static_cast<SwFEShell*>(this)->SelectFlyFrm(*pFly, true);
             }
@@ -121,7 +121,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
         Push();
 
         // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"!
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
         const RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode();
 
@@ -146,7 +146,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
         GetDoc()->getIDocumentRedlineAccess().CompressRedlines();
 
         // automatic detection of the new "Box"
-        SaveTblBoxCntnt();
+        SaveTableBoxContent();
     }
     EndAllAction();
 
@@ -177,7 +177,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
         Push();
 
         // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"!
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
         RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode();
 
@@ -198,7 +198,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
         GetDoc()->getIDocumentRedlineAccess().CompressRedlines();
 
         // automatic detection of the new "Box"
-        SaveTblBoxCntnt();
+        SaveTableBoxContent();
     }
 
     EndAllAction();
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 8320085184ab..2303e07a3a45 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -128,7 +128,7 @@ sal_uInt16 SwEditShell::GetCntType() const
 bool SwEditShell::HasOtherCnt() const
 
 {
-    if ( !GetDoc()->GetSpzFrmFmts()->empty() )
+    if ( !GetDoc()->GetSpzFrameFormats()->empty() )
         return true;
 
     const SwNodes &rNds = GetDoc()->GetNodes();
@@ -169,10 +169,10 @@ SwMvContext::~SwMvContext()
     m_rShell.EndCrsrMove();
 }
 
-SwFrmFmt *SwEditShell::GetTableFmt() // fastest test on a table
+SwFrameFormat *SwEditShell::GetTableFormat() // fastest test on a table
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
-    return pTblNd ? (SwFrmFmt*)pTblNd->GetTable().GetFrmFmt() : 0;
+    const SwTableNode* pTableNd = IsCrsrInTable();
+    return pTableNd ? (SwFrameFormat*)pTableNd->GetTable().GetFrameFormat() : 0;
 }
 
 // TODO: Why is this called 3x for a new document?
@@ -242,16 +242,16 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, bool bInsert,
     StartAllAction();
 
     SwPaM* pCrsr = getShellCrsr( true );
-    SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode* pTNd = pCrsr->GetNode().GetTextNode();
 
     SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, cChar );
     // FIXME: this _must_ be called with reference to the actual node text!
-    OUString const& rNodeText(pTNd->GetTxt());
+    OUString const& rNodeText(pTNd->GetText());
     rACorr.DoAutoCorrect( aSwAutoCorrDoc,
                     rNodeText, pCrsr->GetPoint()->nContent.GetIndex(),
                     cChar, bInsert, GetWin() );
     if( cChar )
-        SaveTblBoxCntnt( pCrsr->GetPoint() );
+        SaveTableBoxContent( pCrsr->GetPoint() );
     EndAllAction();
 }
 
@@ -267,12 +267,12 @@ bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord )
     bool bRet;
     SwPaM* pCrsr = getShellCrsr( true );
     const sal_Int32 nPos = pCrsr->GetPoint()->nContent.GetIndex();
-    SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode* pTNd = pCrsr->GetNode().GetTextNode();
     if( pTNd && nPos )
     {
         SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, 0 );
         bRet = rACorr.GetPrevAutoCorrWord( aSwAutoCorrDoc,
-                                            pTNd->GetTxt(), nPos, rWord );
+                                            pTNd->GetText(), nPos, rWord );
     }
     else
         bRet = false;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 2671f08c0035..ec4f7c4ae7d2 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -240,38 +240,38 @@ sal_uInt16  SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
     if(m_SequArr.empty())
     {
         SwTOXSortTabBases aSortArr;
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
 
         SwTOXInternational aIntl(m_eLanguage, 0, m_sSortAlgorithm);
 
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
-            const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-            if(!pTxtFld || !pTxtFld->GetpTxtNode())
+            const SwTextField* pTextField = pFormatField->GetTextField();
+            if(!pTextField || !pTextField->GetpTextNode())
             {
 #if OSL_DEBUG_LEVEL > 0
-                if(nHandle == static_cast<SwAuthorityField*>(pFmtFld->GetField())->GetHandle())
+                if(nHandle == static_cast<SwAuthorityField*>(pFormatField->GetField())->GetHandle())
                     bCurrentFieldWithoutTextNode = true;
 #endif
                 continue;
             }
-            const SwTxtNode& rFldTxtNode = pTxtFld->GetTxtNode();
-            SwPosition aFldPos(rFldTxtNode);
-            SwDoc& rDoc = *const_cast<SwDoc*>(rFldTxtNode.GetDoc());
-            SwCntntFrm *pFrm = rFldTxtNode.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
-            const SwTxtNode* pTxtNode = 0;
+            const SwTextNode& rFieldTextNode = pTextField->GetTextNode();
+            SwPosition aFieldPos(rFieldTextNode);
+            SwDoc& rDoc = *const_cast<SwDoc*>(rFieldTextNode.GetDoc());
+            SwContentFrm *pFrm = rFieldTextNode.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
+            const SwTextNode* pTextNode = 0;
             if(pFrm && !pFrm->IsInDocBody())
-                pTxtNode = GetBodyTxtNode( rDoc, aFldPos, *pFrm );
+                pTextNode = GetBodyTextNode( rDoc, aFieldPos, *pFrm );
             //if no text node could be found or the field is in the document
             //body the directly available text node will be used
-            if(!pTxtNode)
-                pTxtNode = &rFldTxtNode;
-            if (!pTxtNode->GetTxt().isEmpty() &&
-                pTxtNode->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
-                pTxtNode->GetNodes().IsDocNodes() )
+            if(!pTextNode)
+                pTextNode = &rFieldTextNode;
+            if (!pTextNode->GetText().isEmpty() &&
+                pTextNode->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+                pTextNode->GetNodes().IsDocNodes() )
             {
-                SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode,
-                                                            *pFmtFld, aIntl );
+                SwTOXAuthority* pNew = new SwTOXAuthority( *pTextNode,
+                                                            *pFormatField, aIntl );
 
                 for(SwTOXSortTabBases::size_type i = 0; i < aSortArr.size(); ++i)
                 {
@@ -310,9 +310,9 @@ sal_uInt16  SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
         for(const auto *pBase : aSortArr)
         {
             const SwTOXSortTabBase& rBase = *pBase;
-            SwFmtFld& rFmtFld = const_cast<SwTOXAuthority&>(static_cast<const SwTOXAuthority&>(rBase)).GetFldFmt();
-            SwAuthorityField* pAFld = static_cast<SwAuthorityField*>(rFmtFld.GetField());
-            m_SequArr.push_back(pAFld->GetHandle());
+            SwFormatField& rFormatField = const_cast<SwTOXAuthority&>(static_cast<const SwTOXAuthority&>(rBase)).GetFieldFormat();
+            SwAuthorityField* pAField = static_cast<SwAuthorityField*>(rFormatField.GetField());
+            m_SequArr.push_back(pAField->GetHandle());
         }
         for (SwTOXSortTabBases::const_iterator it = aSortArr.begin(); it != aSortArr.end(); ++it)
             delete *it;
@@ -525,7 +525,7 @@ OUString SwAuthorityField::ConditionalExpand(ToxAuthorityField eField) const
 
     if( pAuthType->IsSequence() )
     {
-       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFldsLocked())
+       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
            m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
        if( m_nTempSequencePos >= 0 )
            sRet += OUString::number( m_nTempSequencePos );
@@ -549,7 +549,7 @@ OUString SwAuthorityField::ExpandCitation(ToxAuthorityField eField) const
 
     if( pAuthType->IsSequence() )
     {
-       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFldsLocked())
+       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
            m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
        if( m_nTempSequencePos >= 0 )
            sRet += OUString::number( m_nTempSequencePos );
@@ -693,10 +693,10 @@ bool    SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
     return false;
 }
 
-SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
+SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFieldTyp )
 {
     SwAuthorityFieldType* pSrcTyp = static_cast<SwAuthorityFieldType*>(GetTyp()),
-                        * pDstTyp = static_cast<SwAuthorityFieldType*>(pFldTyp);
+                        * pDstTyp = static_cast<SwAuthorityFieldType*>(pFieldTyp);
     if( pSrcTyp != pDstTyp )
     {
 
@@ -705,7 +705,7 @@ SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
         pSrcTyp->RemoveField( m_nHandle );
         m_nHandle = pDstTyp->GetHandle( nHdlPos );
         pDstTyp->AddField( m_nHandle );
-        SwField::ChgTyp( pFldTyp );
+        SwField::ChgTyp( pFieldTyp );
     }
     return pSrcTyp;
 }
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 4e203494f29f..1010f0032b8e 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -56,11 +56,11 @@ enum
 
 static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
 static sal_Int32 lcl_GetLongBoxNum( OUString& rStr );
-static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
+static const SwTableBox* lcl_RelToBox( const SwTable& rTable,
                                        const SwTableBox* pRefBox,
                                        const OUString& sGetName);
-static OUString lcl_BoxNmToRel( const SwTable& rTbl,
-                                const SwTableNode& rTblNd,
+static OUString lcl_BoxNmToRel( const SwTable& rTable,
+                                const SwTableNode& rTableNd,
                                 const OUString& sRefBoxNm,
                                 const OUString& sGetStr,
                                 bool bExtrnlNm);
@@ -71,7 +71,7 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl,
  * formula then calculate it, if it starts with a field then get the value.
  * All other conditions return 0 (and an error?).
  */
-double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
+double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
 {
     double nRet = 0;
 
@@ -87,7 +87,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
     if( rCalcPara.IncStackCnt() )
         return nRet;
 
-    rCalcPara.SetLastTblBox( this );
+    rCalcPara.SetLastTableBox( this );
 
     // Does it create a recursion?
     SwTableBox* pBox = const_cast<SwTableBox*>(this);
@@ -95,96 +95,96 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
         return nRet;            // already on the stack: error
 
     // re-start with this box
-    rCalcPara.SetLastTblBox( this );
+    rCalcPara.SetLastTableBox( this );
 
     rCalcPara.pBoxStk->insert( pBox );      // add
     do {        // Middle-Check-Loop, so that we can jump from here. Used so that the box pointer
                 // will be removed from stack at the end.
-        SwDoc* pDoc = GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == GetFrmFmt()->GetItemState(
+        if( SfxItemState::SET == GetFrameFormat()->GetItemState(
                                 RES_BOXATR_FORMULA, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
-            if( !static_cast<const SwTblBoxFormula*>(pItem)->IsValid() )
+            if( !static_cast<const SwTableBoxFormula*>(pItem)->IsValid() )
             {
                 // calculate
-                const SwTable* pTmp = rCalcPara.pTbl;
-                rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable();
-                const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->Calc( rCalcPara, nRet );
+                const SwTable* pTmp = rCalcPara.pTable;
+                rCalcPara.pTable = &pBox->GetSttNd()->FindTableNode()->GetTable();
+                const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->Calc( rCalcPara, nRet );
 
                 if( !rCalcPara.IsStackOverflow() )
                 {
-                    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+                    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
                     SfxItemSet aTmp( pDoc->GetAttrPool(),
                                         RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
-                    aTmp.Put( SwTblBoxValue( nRet ) );
-                    if( SfxItemState::SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
-                        aTmp.Put( SwTblBoxNumFormat( 0 ));
-                    pFmt->SetFmtAttr( aTmp );
+                    aTmp.Put( SwTableBoxValue( nRet ) );
+                    if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT ))
+                        aTmp.Put( SwTableBoxNumFormat( 0 ));
+                    pFormat->SetFormatAttr( aTmp );
                 }
-                rCalcPara.pTbl = pTmp;
+                rCalcPara.pTable = pTmp;
             }
             else
-                nRet = GetFrmFmt()->GetTblBoxValue().GetValue();
+                nRet = GetFrameFormat()->GetTableBoxValue().GetValue();
             break;
         }
-        else if( SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+        else if( SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                                 RES_BOXATR_VALUE, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
-            nRet = static_cast<const SwTblBoxValue*>(pItem)->GetValue();
+            nRet = static_cast<const SwTableBoxValue*>(pItem)->GetValue();
             break;
         }
 
-        SwTxtNode* pTxtNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTxtNode();
-        if( !pTxtNd )
+        SwTextNode* pTextNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTextNode();
+        if( !pTextNd )
             break;
 
         sal_Int32 nSttPos = 0;
-        OUString sTxt = pTxtNd->GetTxt();
-        while ( nSttPos < sTxt.getLength() && ( sTxt[nSttPos]==' ' || sTxt[nSttPos]=='\t' ) )
+        OUString sText = pTextNd->GetText();
+        while ( nSttPos < sText.getLength() && ( sText[nSttPos]==' ' || sText[nSttPos]=='\t' ) )
             ++nSttPos;
 
         // if there is a calculation field at position 1, get the value of it
-        const bool bOK = nSttPos<sTxt.getLength();
-        const sal_Unicode Char = bOK ? sTxt[nSttPos] : 0;
+        const bool bOK = nSttPos<sText.getLength();
+        const sal_Unicode Char = bOK ? sText[nSttPos] : 0;
         if ( bOK && (Char==CH_TXTATR_BREAKWORD || Char==CH_TXTATR_INWORD) )
         {
-            SwTxtFld * const pTxtFld =
-                static_txtattr_cast<SwTxtFld*>(pTxtNd->GetTxtAttrForCharAt(nSttPos, RES_TXTATR_FIELD));
-            if ( pTxtFld == NULL )
+            SwTextField * const pTextField =
+                static_txtattr_cast<SwTextField*>(pTextNd->GetTextAttrForCharAt(nSttPos, RES_TXTATR_FIELD));
+            if ( pTextField == NULL )
                 break;
 
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
 
-            const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-            switch ( pFld->GetTyp()->Which() )
+            const SwField* pField = pTextField->GetFormatField().GetField();
+            switch ( pField->GetTyp()->Which() )
             {
             case RES_SETEXPFLD:
-                nRet = static_cast<const SwSetExpField*>(pFld)->GetValue();
+                nRet = static_cast<const SwSetExpField*>(pField)->GetValue();
                 break;
             case RES_USERFLD:
-                nRet = static_cast<const SwUserField*>(pFld)->GetValue();
+                nRet = static_cast<const SwUserField*>(pField)->GetValue();
                 break;
             case RES_TABLEFLD:
                 {
-                    SwTblField* pTblFld = const_cast<SwTblField*>(static_cast<const SwTblField*>(pFld));
-                    if( !pTblFld->IsValid() )
+                    SwTableField* pTableField = const_cast<SwTableField*>(static_cast<const SwTableField*>(pField));
+                    if( !pTableField->IsValid() )
                     {
                         // use the right table!
-                        const SwTable* pTmp = rCalcPara.pTbl;
-                        rCalcPara.pTbl = &pTxtNd->FindTableNode()->GetTable();
-                        pTblFld->CalcField( rCalcPara );
-                        rCalcPara.pTbl = pTmp;
+                        const SwTable* pTmp = rCalcPara.pTable;
+                        rCalcPara.pTable = &pTextNd->FindTableNode()->GetTable();
+                        pTableField->CalcField( rCalcPara );
+                        rCalcPara.pTable = pTmp;
                     }
-                    nRet = pTblFld->GetValue();
+                    nRet = pTableField->GetValue();
                 }
                 break;
 
             case RES_DATETIMEFLD:
-                nRet = static_cast<const SwDateTimeField*>( pFld )->GetValue();
+                nRet = static_cast<const SwDateTimeField*>( pField )->GetValue();
                 break;
 
             case RES_JUMPEDITFLD:
@@ -193,18 +193,18 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
                 break;
 
             default:
-                nRet = rCalcPara.rCalc.Calculate( pFld->ExpandField(true) ).GetDouble();
+                nRet = rCalcPara.rCalc.Calculate( pField->ExpandField(true) ).GetDouble();
             }
         }
-        else if ( nSttPos < sTxt.getLength()
+        else if ( nSttPos < sText.getLength()
                   && Char == CH_TXT_ATR_INPUTFIELDSTART )
         {
-            const SwTxtInputFld * pTxtInputFld =
-                dynamic_cast< const SwTxtInputFld* >(
-                    pTxtNd->GetTxtAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTxtNode::DEFAULT ) );
-            if ( pTxtInputFld == NULL )
+            const SwTextInputField * pTextInputField =
+                dynamic_cast< const SwTextInputField* >(
+                    pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTextNode::DEFAULT ) );
+            if ( pTextInputField == NULL )
                 break;
-            nRet = rCalcPara.rCalc.Calculate( pTxtInputFld->GetFieldContent() ).GetDouble();
+            nRet = rCalcPara.rCalc.Calculate( pTextInputField->GetFieldContent() ).GetDouble();
         }
         else
         {
@@ -212,24 +212,24 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
 
             double aNum = 0.0;
-            sTxt = bOK ? sTxt.copy( nSttPos ) : OUString();
-            sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+            sText = bOK ? sText.copy( nSttPos ) : OUString();
+            sal_uInt32 nFormatIndex = GetFrameFormat()->GetTableBoxNumFormat().GetValue();
 
-            SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
+            SvNumberFormatter* pNumFormatr = pDoc->GetNumberFormatter();
 
-            if( static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmtIndex )
-                nFmtIndex = 0;
+            if( static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFormatIndex )
+                nFormatIndex = 0;
             // JP 22.04.98: Bug 49659 - special treatment for percentages
-            else if( !sTxt.isEmpty() &&
-                    css::util::NumberFormat::PERCENT == pNumFmtr->GetType( nFmtIndex ))
+            else if( !sText.isEmpty() &&
+                    css::util::NumberFormat::PERCENT == pNumFormatr->GetType( nFormatIndex ))
             {
-                sal_uInt32 nTmpFmt = 0;
-                if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
-                    css::util::NumberFormat::NUMBER == pNumFmtr->GetType( nTmpFmt ))
-                    sTxt += OUString('%');
+                sal_uInt32 nTmpFormat = 0;
+                if( pNumFormatr->IsNumberFormat( sText, nTmpFormat, aNum ) &&
+                    css::util::NumberFormat::NUMBER == pNumFormatr->GetType( nTmpFormat ))
+                    sText += OUString('%');
             }
 
-            if( pNumFmtr->IsNumberFormat( sTxt, nFmtIndex, aNum ))
+            if( pNumFormatr->IsNumberFormat( sText, nFormatIndex, aNum ))
                 nRet = aNum;
         }
         // ?? otherwise it is an error
@@ -250,19 +250,19 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
 
 // structure needed for calculation of tables
 
-SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable )
-    : pLastTblBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
-    rCalc( rCalculator ), pTbl( &rTable )
+SwTableCalcPara::SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable )
+    : pLastTableBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
+    rCalc( rCalculator ), pTable( &rTable )
 {
     pBoxStk = new SwTableSortBoxes;
 }
 
-SwTblCalcPara::~SwTblCalcPara()
+SwTableCalcPara::~SwTableCalcPara()
 {
     delete pBoxStk;
 }
 
-bool SwTblCalcPara::CalcWithStackOverflow()
+bool SwTableCalcPara::CalcWithStackOverflow()
 {
     // If a stack overflow was detected, redo with last box.
     sal_uInt16 nSaveMaxSize = nMaxSize;
@@ -271,7 +271,7 @@ bool SwTblCalcPara::CalcWithStackOverflow()
     sal_uInt16 nCnt = 0;
     SwTableBoxes aStackOverflows;
     do {
-        SwTableBox* pBox = const_cast<SwTableBox*>(pLastTblBox);
+        SwTableBox* pBox = const_cast<SwTableBox*>(pLastTableBox);
         nStackCnt = 0;
         rCalc.SetCalcError( CALC_NOERR );
         aStackOverflows.insert( aStackOverflows.begin() + nCnt++, pBox );
@@ -310,10 +310,10 @@ SwTableFormula::~SwTableFormula()
 {
 }
 
-void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::_MakeFormula( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
-    SwTblCalcPara* pCalcPara = static_cast<SwTblCalcPara*>(pPara);
+    SwTableCalcPara* pCalcPara = static_cast<SwTableCalcPara*>(pPara);
     if( pCalcPara->rCalc.IsCalcError() )        // stop if there is already an error set
         return;
 
@@ -326,14 +326,14 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
         pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() )
             pEndBox = 0;
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
     SwTableBox* pSttBox = reinterpret_cast<SwTableBox*>(
                             sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
+    if( rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() )
         pSttBox = 0;
 
     rNewStr += " ";
@@ -348,14 +348,14 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
         for (size_t n = 0; n < aBoxes.size() &&
                            !pCalcPara->rCalc.IsCalcError(); ++n)
         {
-            const SwTableBox* pTblBox = aBoxes[n];
-            if ( pTblBox->getRowSpan() >= 1 )
+            const SwTableBox* pTableBox = aBoxes[n];
+            if ( pTableBox->getRowSpan() >= 1 )
             {
                 if( bDelim )
                     rNewStr += OUString(cListDelim);
                 bDelim = true;
                 rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pTblBox->GetValue( *pCalcPara ), false );
+                            pTableBox->GetValue( *pCalcPara ), false );
             }
         }
         rNewStr += ")";
@@ -375,20 +375,20 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += " ";
 }
 
-void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::RelNmsToBoxNms( const SwTable& rTable, OUString& rNewStr,
             OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // relative name w.r.t. box name (external presentation)
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Feld steht in keinem TextNode" );
-    const SwTableBox *pBox = rTbl.GetTblBox(
+    const SwTableBox *pBox = rTable.GetTableBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
     rNewStr += OUString(rFirstBox[0]); // get label for the box
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        const SwTableBox *pRelLastBox = lcl_RelToBox( rTbl, pBox, *pLastBox );
+        const SwTableBox *pRelLastBox = lcl_RelToBox( rTable, pBox, *pLastBox );
         if ( pRelLastBox )
             rNewStr += pRelLastBox->GetName();
         else
@@ -397,7 +397,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTbl, pBox, rFirstBox );
+    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTable, pBox, rFirstBox );
 
     if (pRelFirstBox)
         rNewStr += pRelFirstBox->GetName();
@@ -408,20 +408,20 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTable, OUString& rNewStr,
             OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // relative name w.r.t. box name (internal presentation)
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Field not placed in any Node" );
-    const SwTableBox *pBox = rTbl.GetTblBox(
+    const SwTableBox *pBox = rTable.GetTableBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
     rNewStr += OUString(rFirstBox[0]); // get label for the box
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        const SwTableBox *pRelLastBox = lcl_RelToBox( rTbl, pBox, *pLastBox );
+        const SwTableBox *pRelLastBox = lcl_RelToBox( rTable, pBox, *pLastBox );
         if ( pRelLastBox )
             rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pRelLastBox));
         else
@@ -430,7 +430,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTbl, pBox, rFirstBox );
+    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTable, pBox, rFirstBox );
     if ( pRelFirstBox )
         rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pRelFirstBox));
     else
@@ -440,18 +440,18 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::BoxNmsToRelNm( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // box name (external presentation) w.r.t. relative name
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Field not placed in any Node" );
-    const SwTableNode* pTblNd = pNd->FindTableNode();
+    const SwTableNode* pTableNd = pNd->FindTableNode();
 
     OUString sRefBoxNm;
-    if( &pTblNd->GetTable() == &rTbl )
+    if( &pTableNd->GetTable() == &rTable )
     {
-        const SwTableBox *pBox = rTbl.GetTblBox(
+        const SwTableBox *pBox = rTable.GetTableBox(
                 pNd->FindTableBoxStartNode()->GetIndex() );
         OSL_ENSURE( pBox, "Field not placed in any Table" );
         sRefBoxNm = pBox->GetName();
@@ -461,20 +461,20 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, OUString& rNewStr,
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, *pLastBox,
+        rNewStr += lcl_BoxNmToRel( rTable, *pTableNd, sRefBoxNm, *pLastBox,
                                 m_eNmType == EXTRNL_NAME );
         rNewStr += ":";
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, rFirstBox,
+    rNewStr += lcl_BoxNmToRel( rTable, *pTableNd, sRefBoxNm, rFirstBox,
                             m_eNmType == EXTRNL_NAME );
 
     // get label for the box
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::PtrToBoxNms( const SwTable& rTable, OUString& rNewStr,
                         OUString& rFirstBox, OUString* pLastBox, void* ) const
 {
     // area in these parentheses?
@@ -487,7 +487,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
         pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pBox ) != rTable.GetTabSortBoxes().end() )
             rNewStr += pBox->GetName();
         else
             rNewStr += "?";
@@ -497,7 +497,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
 
     pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
+    if( rTable.GetTabSortBoxes().find( pBox ) != rTable.GetTabSortBoxes().end() )
         rNewStr += pBox->GetName();
     else
         rNewStr += "?";
@@ -506,7 +506,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::BoxNmsToPtr( const SwTable& rTable, OUString& rNewStr,
                         OUString& rFirstBox, OUString* pLastBox, void* ) const
 {
     // area in these parentheses?
@@ -516,30 +516,30 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        pBox = rTbl.GetTblBox( *pLastBox );
+        pBox = rTable.GetTableBox( *pLastBox );
         rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pBox))
                 +  ":";
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    pBox = rTbl.GetTblBox( rFirstBox );
+    pBox = rTable.GetTableBox( rFirstBox );
     rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pBox))
             +  OUString(rFirstBox[ rFirstBox.getLength()-1 ]); // get label for the box
 }
 
 /// create external formula (for UI)
-void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
+void SwTableFormula::PtrToBoxNm( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
     switch (m_eNmType)
     {
     case INTRNL_NAME:
-        if( pTbl )
+        if( pTable )
             fnFormula = &SwTableFormula::PtrToBoxNms;
         break;
     case REL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::RelNmsToBoxNms;
             pNd = GetNodeOfFormula();
@@ -548,23 +548,23 @@ void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
     case EXTRNL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = EXTRNL_NAME;
 }
 
 /// create internal formula (in CORE)
-void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
+void SwTableFormula::BoxNmToPtr( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
     switch (m_eNmType)
     {
     case EXTRNL_NAME:
-        if( pTbl )
+        if( pTable )
             fnFormula = &SwTableFormula::BoxNmsToPtr;
         break;
     case REL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::RelBoxNmsToPtr;
             pNd = GetNodeOfFormula();
@@ -573,12 +573,12 @@ void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
     case INTRNL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = INTRNL_NAME;
 }
 
 /// create relative formula (for copy)
-void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
+void SwTableFormula::ToRelBoxNm( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
@@ -586,7 +586,7 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
     {
     case INTRNL_NAME:
     case EXTRNL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::BoxNmsToRelNm;
             pNd = GetNodeOfFormula();
@@ -595,22 +595,22 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
     case REL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = REL_NAME;
 }
 
-OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
+OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTable,
                                     void* pPara ) const
 {
     OUString aStr;
-    sal_Int32 nFml = 0;
+    sal_Int32 nFormula = 0;
     sal_Int32 nEnd = 0;
 
     do {
         // If the formula is preceded by a name, use this table!
-        const SwTable* pTbl = &rTbl;
+        const SwTable* pTable = &rTable;
 
-        sal_Int32 nStt = m_sFormula.indexOf( '<', nFml );
+        sal_Int32 nStt = m_sFormula.indexOf( '<', nFormula );
         if ( nStt>=0 )
         {
             while ( nStt>=0 )
@@ -633,12 +633,12 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
         if (nStt<0 || nEnd<0 )
         {
             // set the rest and finish
-            aStr += m_sFormula.copy(nFml);
+            aStr += m_sFormula.copy(nFormula);
             break;
         }
 
         // write beginning
-        aStr += m_sFormula.copy(nFml, nStt - nFml);
+        aStr += m_sFormula.copy(nFormula, nStt - nFormula);
 
         if (fnFormula)
         {
@@ -652,27 +652,27 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
                 (nSeparator = m_sFormula.indexOf( '.', nStt ))>=0
                 && nSeparator < nEnd )
             {
-                OUString sTblNm( m_sFormula.copy( nStt, nEnd - nStt ));
+                OUString sTableNm( m_sFormula.copy( nStt, nEnd - nStt ));
 
                 // If there are dots in the name, then they appear in pairs (e.g. A1.1.1)!
-                if( (comphelper::string::getTokenCount(sTblNm, '.') - 1) & 1 )
+                if( (comphelper::string::getTokenCount(sTableNm, '.') - 1) & 1 )
                 {
-                    sTblNm = sTblNm.copy( 0, nSeparator - nStt );
+                    sTableNm = sTableNm.copy( 0, nSeparator - nStt );
 
                     // when creating a formula the table name is unwanted
                     if( fnFormula != (FnScanFormula)&SwTableFormula::_MakeFormula )
-                        aStr += sTblNm;
+                        aStr += sTableNm;
                     nStt = nSeparator;
 
-                    sTblNm = sTblNm.copy( 1 );   // delete separator
-                    if( sTblNm != rTbl.GetFrmFmt()->GetName() )
+                    sTableNm = sTableNm.copy( 1 );   // delete separator
+                    if( sTableNm != rTable.GetFrameFormat()->GetName() )
                     {
                         // then search for table
                         const SwTable* pFnd = FindTable(
-                                                *rTbl.GetFrmFmt()->GetDoc(),
-                                                sTblNm );
+                                                *rTable.GetFrameFormat()->GetDoc(),
+                                                sTableNm );
                         if( pFnd )
-                            pTbl = pFnd;
+                            pTable = pFnd;
                         // ??
                         OSL_ENSURE( pFnd, "No table found. What now?" );
                     }
@@ -686,34 +686,34 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
             {
                 // without opening parenthesis
                 OUString aFirstBox( m_sFormula.copy( nStt+1, nSeparator - nStt - 1 ));
-                (this->*fnFormula)( *pTbl, aStr, sBox, &aFirstBox, pPara );
+                (this->*fnFormula)( *pTable, aStr, sBox, &aFirstBox, pPara );
             }
             else
-                (this->*fnFormula)( *pTbl, aStr, sBox, 0, pPara );
+                (this->*fnFormula)( *pTable, aStr, sBox, 0, pPara );
         }
 
-        nFml = nEnd+1;
+        nFormula = nEnd+1;
     } while( true );
     return aStr;
 }
 
 const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
 {
-    const SwFrmFmts& rTblFmts = *rDoc.GetTblFrmFmts();
-    const SwTable* pTmpTbl = 0, *pRet = 0;
-    for( auto nFmtCnt = rTblFmts.size(); nFmtCnt; )
+    const SwFrameFormats& rTableFormats = *rDoc.GetTableFrameFormats();
+    const SwTable* pTmpTable = 0, *pRet = 0;
+    for( auto nFormatCnt = rTableFormats.size(); nFormatCnt; )
     {
-        SwFrmFmt* pFmt = rTblFmts[ --nFmtCnt ];
+        SwFrameFormat* pFormat = rTableFormats[ --nFormatCnt ];
         // if we are called from Sw3Writer, a number is dependent on the format name
         SwTableBox* pFBox;
-        if ( rNm.equals(pFmt->GetName().getToken(0, 0x0a)) &&
-            0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-            0 != (pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+        if ( rNm.equals(pFormat->GetName().getToken(0, 0x0a)) &&
+            0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+            0 != (pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
             pFBox->GetSttNd() &&
             pFBox->GetSttNd()->GetNodes().IsDocNodes() )
         {
             // a table in the normal NodesArr
-            pRet = pTmpTbl;
+            pRet = pTmpTable;
             break;
         }
     }
@@ -723,7 +723,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
 static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
 {
     SwNodeIndex aIdx( *rBox.GetSttNd() );
-    SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
+    SwContentNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
     OSL_ENSURE( pCNd, "Box has no TextNode" );
     Point aPt;      // get the first frame of the layout - table headline
     return pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, NULL, false );
@@ -746,7 +746,7 @@ static sal_Int32 lcl_GetLongBoxNum( OUString& rStr )
     return nRet;
 }
 
-static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
+static const SwTableBox* lcl_RelToBox( const SwTable& rTable,
                                     const SwTableBox* pRefBox,
                                     const OUString& _sGetName )
 {
@@ -762,7 +762,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
 
         sGetName = sGetName.copy( 1 );
 
-        const SwTableLines* pLines = &rTbl.GetTabLines();
+        const SwTableLines* pLines = &rTable.GetTabLines();
         const SwTableBoxes* pBoxes;
         const SwTableLine* pLine;
 
@@ -775,7 +775,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
             pLine = pBox->GetUpper();
         }
         sal_uInt16 nSttBox = pLine->GetTabBoxes().GetPos( pBox );
-        sal_uInt16 nSttLine = rTbl.GetTabLines().GetPos( pLine );
+        sal_uInt16 nSttLine = rTable.GetTabLines().GetPos( pLine );
 
         const sal_Int32 nBoxOffset = lcl_GetLongBoxNum( sGetName ) + nSttBox;
         const sal_Int32 nLineOffset = lcl_GetLongBoxNum( sGetName ) + nSttLine;
@@ -827,12 +827,12 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
     else
     {
         // otherwise it is an absolute external presentation
-        pBox = rTbl.GetTblBox( sGetName );
+        pBox = rTable.GetTableBox( sGetName );
     }
     return pBox;
 }
 
-static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
+static OUString lcl_BoxNmToRel( const SwTable& rTable, const SwTableNode& rTableNd,
                                 const OUString& _sRefBoxNm, const OUString& _sTmp, bool bExtrnlNm )
 {
     OUString sTmp = _sTmp;
@@ -841,13 +841,13 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
     {
         // convert into external presentation
         SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.toInt64()));
-        if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pBox ) == rTable.GetTabSortBoxes().end() )
             return OUString('?');
         sTmp = pBox->GetName();
     }
 
     // If the formula is spanning over a table then keep external presentation
-    if( &rTbl == &rTblNd.GetTable() )
+    if( &rTable == &rTableNd.GetTable() )
     {
         long nBox = SwTable::_GetBoxNum( sTmp, true );
         nBox -= SwTable::_GetBoxNum( sRefBoxNm, true );
@@ -871,16 +871,16 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
     return sTmp;
 }
 
-void SwTableFormula::GetBoxesOfFormula( const SwTable& rTbl,
+void SwTableFormula::GetBoxesOfFormula( const SwTable& rTable,
                                         SwSelBoxes& rBoxes )
 {
     rBoxes.clear();
 
-    BoxNmToPtr( &rTbl );
-    ScanString( &SwTableFormula::_GetFmlBoxes, rTbl, &rBoxes );
+    BoxNmToPtr( &rTable );
+    ScanString( &SwTableFormula::_GetFormulaBoxes, rTable, &rBoxes );
 }
 
-void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, OUString& ,
+void SwTableFormula::_GetFormulaBoxes( const SwTable& rTable, OUString& ,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     SwSelBoxes* pBoxes = static_cast<SwSelBoxes*>(pPara);
@@ -893,14 +893,14 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, OUString& ,
         pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() )
             pEndBox = 0;
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
     SwTableBox *pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( !pSttBox || rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
+    if( !pSttBox || rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() )
         return;
 
     if ( pEndBox ) // area?
@@ -926,19 +926,19 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
     if( !pStt || !pEnd )
         return ;                        // no valid selection
 
-    GetTblSel( pStt, pEnd, rBoxes, 0 );
+    GetTableSel( pStt, pEnd, rBoxes, 0 );
 
-    const SwTable* pTbl = pStt->FindTabFrm()->GetTable();
+    const SwTable* pTable = pStt->FindTabFrm()->GetTable();
 
     // filter headline boxes
-    if( pTbl->GetRowsToRepeat() > 0 )
+    if( pTable->GetRowsToRepeat() > 0 )
     {
         do {    // middle-check loop
             const SwTableLine* pLine = rSttBox.GetUpper();
             while( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTbl->IsHeadline( *pLine ) )
+            if( pTable->IsHeadline( *pLine ) )
                 break;      // headline in this area!
 
             // maybe start and end are swapped
@@ -946,7 +946,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
             while ( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTbl->IsHeadline( *pLine ) )
+            if( pTable->IsHeadline( *pLine ) )
                 break;      // headline in this area!
 
             const SwTabFrm *pStartTable = pStt->FindTabFrm();
@@ -962,7 +962,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
                 while( pLine->GetUpper() )
                     pLine = pLine->GetUpper()->GetUpper();
 
-                if( pTbl->IsHeadline( *pLine ) )
+                if( pTable->IsHeadline( *pLine ) )
                     rBoxes.erase( rBoxes.begin() + n-- );
             }
         } while( false );
@@ -970,7 +970,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
 }
 
 /// Are all boxes valid that are referenced by the formula?
-void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, OUString& ,
+void SwTableFormula::_HasValidBoxes( const SwTable& rTable, OUString& ,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     bool* pBValid = static_cast<bool*>(pPara);
@@ -995,25 +995,25 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, OUString& ,
             {
                 const SwNode* pNd = GetNodeOfFormula();
                 const SwTableBox* pBox = !pNd ? 0
-                                               : const_cast<SwTableBox *>(rTbl.GetTblBox(
+                                               : const_cast<SwTableBox *>(rTable.GetTableBox(
                                     pNd->FindTableBoxStartNode()->GetIndex() ));
                 if( pLastBox )
-                    pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( rTbl, pBox, *pLastBox ));
-                pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( rTbl, pBox, rFirstBox ));
+                    pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( rTable, pBox, *pLastBox ));
+                pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( rTable, pBox, rFirstBox ));
             }
             break;
 
         case EXTRNL_NAME:
             if( pLastBox )
-                pEndBox = const_cast<SwTableBox*>(rTbl.GetTblBox( *pLastBox ));
-            pSttBox = const_cast<SwTableBox*>(rTbl.GetTblBox( rFirstBox ));
+                pEndBox = const_cast<SwTableBox*>(rTable.GetTableBox( *pLastBox ));
+            pSttBox = const_cast<SwTableBox*>(rTable.GetTableBox( rFirstBox ));
             break;
         }
 
         // Are these valid pointers?
         if( ( pLastBox &&
-              ( !pEndBox || rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() ) ) ||
-            ( !pSttBox || rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() ) )
+              ( !pEndBox || rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() ) ) ||
+            ( !pSttBox || rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() ) )
                 *pBValid = false;
     }
 }
@@ -1028,7 +1028,7 @@ bool SwTableFormula::HasValidBoxes() const
     return bRet;
 }
 
-sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox )
+sal_uInt16 SwTableFormula::GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox )
 {
     sal_uInt16 nRet = USHRT_MAX;
     if( pBox )
@@ -1036,57 +1036,57 @@ sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox*
         const SwTableLine* pLn = pBox->GetUpper();
         while( pLn->GetUpper() )
             pLn = pLn->GetUpper()->GetUpper();
-        nRet = rTbl.GetTabLines().GetPos( pLn );
+        nRet = rTable.GetTabLines().GetPos( pLn );
     }
     return nRet;
 }
 
-void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
-    SwTableFmlUpdate& rTblUpd = *static_cast<SwTableFmlUpdate*>(pPara);
+    SwTableFormulaUpdate& rTableUpd = *static_cast<SwTableFormulaUpdate*>(pPara);
 
     rNewStr += OUString(rFirstBox[0]);     // get label for the box
     rFirstBox = rFirstBox.copy(1);
 
-    OUString sTblNm;
-    const SwTable* pTbl = &rTbl;
+    OUString sTableNm;
+    const SwTable* pTable = &rTable;
 
-    OUString* pTblNmBox = pLastBox ? pLastBox : &rFirstBox;
+    OUString* pTableNmBox = pLastBox ? pLastBox : &rFirstBox;
 
-    const sal_Int32 nLastBoxLen = pTblNmBox->getLength();
-    const sal_Int32 nSeparator = pTblNmBox->indexOf('.');
+    const sal_Int32 nLastBoxLen = pTableNmBox->getLength();
+    const sal_Int32 nSeparator = pTableNmBox->indexOf('.');
     if ( nSeparator>=0 &&
         // If there are dots in the name, than these appear in pairs (e.g. A1.1.1)!
-        (comphelper::string::getTokenCount(*pTblNmBox, '.') - 1) & 1 )
+        (comphelper::string::getTokenCount(*pTableNmBox, '.') - 1) & 1 )
     {
-        sTblNm = pTblNmBox->copy( 0, nSeparator );
-        *pTblNmBox = pTblNmBox->copy( nSeparator + 1); // remove dot
-        const SwTable* pFnd = FindTable( *rTbl.GetFrmFmt()->GetDoc(), sTblNm );
+        sTableNm = pTableNmBox->copy( 0, nSeparator );
+        *pTableNmBox = pTableNmBox->copy( nSeparator + 1); // remove dot
+        const SwTable* pFnd = FindTable( *rTable.GetFrameFormat()->GetDoc(), sTableNm );
         if( pFnd )
-            pTbl = pFnd;
+            pTable = pFnd;
 
-        if( TBL_MERGETBL == rTblUpd.eFlags )
+        if( TBL_MERGETBL == rTableUpd.eFlags )
         {
             if( pFnd )
             {
-                if( pFnd == rTblUpd.DATA.pDelTbl )
+                if( pFnd == rTableUpd.DATA.pDelTable )
                 {
-                    if( rTblUpd.pTbl != &rTbl ) // not the current one
-                        rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + "."; // set new table name
-                    rTblUpd.bModified = true;
+                    if( rTableUpd.pTable != &rTable ) // not the current one
+                        rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + "."; // set new table name
+                    rTableUpd.bModified = true;
                 }
-                else if( pFnd != rTblUpd.pTbl ||
-                    ( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
-                    rNewStr += sTblNm + "."; // keep table name
+                else if( pFnd != rTableUpd.pTable ||
+                    ( rTableUpd.pTable != &rTable && &rTable != rTableUpd.DATA.pDelTable))
+                    rNewStr += sTableNm + "."; // keep table name
                 else
-                    rTblUpd.bModified = true;
+                    rTableUpd.bModified = true;
             }
             else
-                rNewStr += sTblNm + ".";     // keep table name
+                rNewStr += sTableNm + ".";     // keep table name
         }
     }
-    if( pTblNmBox == pLastBox )
+    if( pTableNmBox == pLastBox )
         rFirstBox = rFirstBox.copy( nLastBoxLen + 1 );
 
     SwTableBox* pSttBox = 0, *pEndBox = 0;
@@ -1101,82 +1101,82 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
     case REL_NAME:
         {
             const SwNode* pNd = GetNodeOfFormula();
-            const SwTableBox* pBox = pNd ? pTbl->GetTblBox(
+            const SwTableBox* pBox = pNd ? pTable->GetTableBox(
                             pNd->FindTableBoxStartNode()->GetIndex() ) : 0;
             if( pLastBox )
-                pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTbl, pBox, *pLastBox ));
-            pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTbl, pBox, rFirstBox ));
+                pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTable, pBox, *pLastBox ));
+            pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTable, pBox, rFirstBox ));
         }
         break;
 
     case EXTRNL_NAME:
         if( pLastBox )
-            pEndBox = const_cast<SwTableBox*>(pTbl->GetTblBox( *pLastBox ));
-        pSttBox = const_cast<SwTableBox*>(pTbl->GetTblBox( rFirstBox ));
+            pEndBox = const_cast<SwTableBox*>(pTable->GetTableBox( *pLastBox ));
+        pSttBox = const_cast<SwTableBox*>(pTable->GetTableBox( rFirstBox ));
         break;
     }
 
-    if( pLastBox && pTbl->GetTabSortBoxes().find( pEndBox ) == pTbl->GetTabSortBoxes().end() )
+    if( pLastBox && pTable->GetTabSortBoxes().find( pEndBox ) == pTable->GetTabSortBoxes().end() )
         pEndBox = 0;
-    if( pTbl->GetTabSortBoxes().find( pSttBox ) == pTbl->GetTabSortBoxes().end() )
+    if( pTable->GetTabSortBoxes().find( pSttBox ) == pTable->GetTabSortBoxes().end() )
         pSttBox = 0;
 
-    if( TBL_SPLITTBL == rTblUpd.eFlags )
+    if( TBL_SPLITTBL == rTableUpd.eFlags )
     {
         // Where are the boxes - in the old or in the new table?
-        bool bInNewTbl = false;
+        bool bInNewTable = false;
         if( pLastBox )
         {
             // It is the "first" box in this selection. It determines if the formula is placed in
             // the new or the old table.
-            sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pEndBox ),
-                    nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
+            sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTable( *pTable, pEndBox ),
+                    nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
 
             if( USHRT_MAX != nSttLnPos && USHRT_MAX != nEndLnPos &&
-                ((rTblUpd.nSplitLine <= nSttLnPos) ==
-                (rTblUpd.nSplitLine <= nEndLnPos)) )
+                ((rTableUpd.nSplitLine <= nSttLnPos) ==
+                (rTableUpd.nSplitLine <= nEndLnPos)) )
             {
                 // stay in same table
-                bInNewTbl = rTblUpd.nSplitLine <= nEndLnPos &&
-                                    pTbl == rTblUpd.pTbl;
+                bInNewTable = rTableUpd.nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.pTable;
             }
             else
             {
                 // this is definitely an invalid formula, also mark as modified for Undo
-                rTblUpd.bModified = true;
+                rTableUpd.bModified = true;
                 if( pEndBox )
-                    bInNewTbl = USHRT_MAX != nEndLnPos &&
-                                    rTblUpd.nSplitLine <= nEndLnPos &&
-                                    pTbl == rTblUpd.pTbl;
+                    bInNewTable = USHRT_MAX != nEndLnPos &&
+                                    rTableUpd.nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.pTable;
             }
         }
         else
         {
-            sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
+            sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
             // Put it in the new table?
-            bInNewTbl = USHRT_MAX != nSttLnPos &&
-                            rTblUpd.nSplitLine <= nSttLnPos &&
-                            pTbl == rTblUpd.pTbl;
+            bInNewTable = USHRT_MAX != nSttLnPos &&
+                            rTableUpd.nSplitLine <= nSttLnPos &&
+                            pTable == rTableUpd.pTable;
         }
 
         // formula goes into new table
-        if( rTblUpd.bBehindSplitLine )
+        if( rTableUpd.bBehindSplitLine )
         {
-            if( !bInNewTbl )
+            if( !bInNewTable )
             {
-                rTblUpd.bModified = true;
-                rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + ".";
+                rTableUpd.bModified = true;
+                rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + ".";
             }
-            else if( !sTblNm.isEmpty() )
-                rNewStr += sTblNm + ".";
+            else if( !sTableNm.isEmpty() )
+                rNewStr += sTableNm + ".";
         }
-        else if( bInNewTbl )
+        else if( bInNewTable )
         {
-            rTblUpd.bModified = true;
-            rNewStr += *rTblUpd.DATA.pNewTblNm + ".";
+            rTableUpd.bModified = true;
+            rNewStr += *rTableUpd.DATA.pNewTableNm + ".";
         }
-        else if( !sTblNm.isEmpty() )
-            rNewStr += sTblNm + ".";
+        else if( !sTableNm.isEmpty() )
+            rNewStr += sTableNm + ".";
     }
 
     if( pLastBox )
@@ -1187,16 +1187,16 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
 }
 
 /// Create external formula but remember that the formula is placed in a split/merged table
-void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd )
+void SwTableFormula::ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd )
 {
-    const SwTable* pTbl;
+    const SwTable* pTable;
     const SwNode* pNd = GetNodeOfFormula();
     if( pNd && 0 != ( pNd = pNd->FindTableNode() ))
-        pTbl = &static_cast<const SwTableNode*>(pNd)->GetTable();
+        pTable = &static_cast<const SwTableNode*>(pNd)->GetTable();
     else
-        pTbl = rTblUpd.pTbl;
+        pTable = rTableUpd.pTable;
 
-    m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTbl, (void*)&rTblUpd );
+    m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTable, (void*)&rTableUpd );
     m_eNmType = INTRNL_NAME;
 }
 
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 8f6d2d9f00e8..a6e898424cc8 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -63,8 +63,8 @@ SwFieldType* SwChapterFieldType::Copy() const
 
 // chapter field
 
-SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt), nLevel( 0 )
+SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat), nLevel( 0 )
 {}
 
 OUString SwChapterField::Expand() const
@@ -99,41 +99,41 @@ SwField* SwChapterField::Copy() const
 
 // #i53420#
 void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
-                                      const SwCntntNode* pCntntNode,
+                                      const SwContentNode* pContentNode,
                                       bool bSrchNum )
 {
     OSL_ENSURE( pFrm, "In which frame am I?" );
-    SwDoc* pDoc = const_cast<SwDoc*>(pCntntNode->GetDoc());
+    SwDoc* pDoc = const_cast<SwDoc*>(pContentNode->GetDoc());
 
-    const SwTxtNode* pTxtNode = dynamic_cast<const SwTxtNode*>(pCntntNode);
-    if ( !pTxtNode || !pFrm->IsInDocBody() )
+    const SwTextNode* pTextNode = dynamic_cast<const SwTextNode*>(pContentNode);
+    if ( !pTextNode || !pFrm->IsInDocBody() )
     {
         SwPosition aDummyPos( pDoc->GetNodes().GetEndOfContent() );
-        pTxtNode = GetBodyTxtNode( *pDoc, aDummyPos, *pFrm );
+        pTextNode = GetBodyTextNode( *pDoc, aDummyPos, *pFrm );
     }
 
-    if ( pTxtNode )
+    if ( pTextNode )
     {
-        ChangeExpansion( *pTxtNode, bSrchNum );
+        ChangeExpansion( *pTextNode, bSrchNum );
     }
 }
 
-void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
+void SwChapterField::ChangeExpansion(const SwTextNode &rTextNd, bool bSrchNum)
 {
     sNumber.clear();
     sTitle.clear();
     sPost.clear();
     sPre.clear();
 
-    SwDoc* pDoc = const_cast<SwDoc*>(rTxtNd.GetDoc());
-    const SwTxtNode *pTxtNd = rTxtNd.FindOutlineNodeOfLevel( nLevel );
-    if( pTxtNd )
+    SwDoc* pDoc = const_cast<SwDoc*>(rTextNd.GetDoc());
+    const SwTextNode *pTextNd = rTextNd.FindOutlineNodeOfLevel( nLevel );
+    if( pTextNd )
     {
         if( bSrchNum )
         {
-            const SwTxtNode* pONd = pTxtNd;
+            const SwTextNode* pONd = pTextNd;
             do {
-                if( pONd && pONd->GetTxtColl() )
+                if( pONd && pONd->GetTextColl() )
                 {
                     sal_uInt8 nPrevLvl = nLevel;
 
@@ -146,13 +146,13 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
                     else if( SVX_NUM_NUMBER_NONE != pDoc->GetOutlineNumRule()
                             ->Get( nLevel ).GetNumberingType() )
                     {
-                        pTxtNd = pONd;
+                        pTextNd = pONd;
                         break;
                     }
 
                     if( !nLevel-- )
                         break;
-                    pONd = pTxtNd->FindOutlineNodeOfLevel( nLevel );
+                    pONd = pTextNd->FindOutlineNodeOfLevel( nLevel );
                 }
                 else
                     break;
@@ -161,25 +161,25 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
 
         // get the number without Pre-/Post-fixstrings
 
-        if ( pTxtNd->IsOutline() )
+        if ( pTextNd->IsOutline() )
         {
             // correction of refactoring done by cws swnumtree:
             // retrieve numbering string without prefix and suffix strings
             // as stated in the above german comment.
-            sNumber = pTxtNd->GetNumString( false );
+            sNumber = pTextNd->GetNumString( false );
 
-            SwNumRule* pRule( pTxtNd->GetNumRule() );
-            if ( pTxtNd->IsCountedInList() && pRule )
+            SwNumRule* pRule( pTextNd->GetNumRule() );
+            if ( pTextNd->IsCountedInList() && pRule )
             {
-                int nListLevel = pTxtNd->GetActualListLevel();
+                int nListLevel = pTextNd->GetActualListLevel();
                 if (nListLevel < 0)
                     nListLevel = 0;
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                const SwNumFmt& rNFmt = pRule->Get(nListLevel);
-                sPost = rNFmt.GetSuffix();
-                sPre = rNFmt.GetPrefix();
+                const SwNumFormat& rNFormat = pRule->Get(nListLevel);
+                sPost = rNFormat.GetSuffix();
+                sPre = rNFormat.GetPrefix();
             }
         }
         else
@@ -187,7 +187,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
             sNumber = "??";
         }
 
-        sTitle = removeControlChars(pTxtNd->GetExpandTxt(0, -1, false, false, false, false));
+        sTitle = removeControlChars(pTextNd->GetExpandText(0, -1, false, false, false, false));
 
     }
 }
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a971af328459..fa8969e1b7e0 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -89,11 +89,11 @@ void SwDBFieldType::ReleaseRef()
 
     if (--nRefCnt <= 0)
     {
-        size_t nPos = GetDoc()->getIDocumentFieldsAccess().GetFldTypes()->GetPos(this);
+        size_t nPos = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes()->GetPos(this);
 
         if (nPos != SIZE_MAX)
         {
-            GetDoc()->getIDocumentFieldsAccess().RemoveFldType(nPos);
+            GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(nPos);
             delete this;
         }
     }
@@ -138,19 +138,19 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
             if( sTmp != sColumn )
             {
                 sColumn = sTmp;
-                SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-                SwFmtFld* pFmtFld = aIter.First();
-                while(pFmtFld)
+                SwIterator<SwFormatField,SwFieldType> aIter( *this );
+                SwFormatField* pFormatField = aIter.First();
+                while(pFormatField)
                 {
                     // field in Undo?
-                    SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
-                    if(pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+                    SwTextField *pTextField = pFormatField->GetTextField();
+                    if(pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
                     {
-                        SwDBField* pDBField = static_cast<SwDBField*>(pFmtFld->GetField());
+                        SwDBField* pDBField = static_cast<SwDBField*>(pFormatField->GetField());
                         pDBField->ClearInitialized();
                         pDBField->InitContent();
                     }
-                    pFmtFld = aIter.Next();
+                    pFormatField = aIter.Next();
                 }
             }
         }
@@ -166,10 +166,10 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 
 // database field
 
-SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
-    :   SwValueField(pTyp, nFmt),
+SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFormat)
+    :   SwValueField(pTyp, nFormat),
         nSubType(0),
-        bIsInBodyTxt(true),
+        bIsInBodyText(true),
         bValidValue(false),
         bInitialized(false)
 {
@@ -218,7 +218,7 @@ SwField* SwDBField::Copy() const
 {
     SwDBField *pTmp = new SwDBField(static_cast<SwDBFieldType*>(GetTyp()), GetFormat());
     pTmp->aContent      = aContent;
-    pTmp->bIsInBodyTxt  = bIsInBodyTxt;
+    pTmp->bIsInBodyText  = bIsInBodyText;
     pTmp->bValidValue   = bValidValue;
     pTmp->bInitialized  = bInitialized;
     pTmp->nSubType      = nSubType;
@@ -263,7 +263,7 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
     return pOld;
 }
 
-bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt,
+bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
                              double &aNumber, sal_Int32 nColumnType, SwDBField *pField )
 {
     bool bValidValue = false;
@@ -293,7 +293,7 @@ bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString
             else
                 aNumber = aVal.GetDouble();
 
-            if (nFmt && nFmt != SAL_MAX_UINT32 && !pDocFormatter->IsTextFormat(nFmt))
+            if (nFormat && nFormat != SAL_MAX_UINT32 && !pDocFormatter->IsTextFormat(nFormat))
                 bValidValue = true; // because of bug #60339 not for all strings
         }
         else
@@ -322,7 +322,7 @@ void SwDBField::Evaluate()
     if(!pMgr || !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true))
         return ;
 
-    sal_uInt32 nFmt = 0;
+    sal_uInt32 nFormat = 0;
 
     // search corresponding column name
     OUString aColNm( static_cast<SwDBFieldType*>(GetTyp())->GetColumnName() );
@@ -330,14 +330,14 @@ void SwDBField::Evaluate()
     SvNumberFormatter* pDocFormatter = GetDoc()->GetNumberFormatter();
     pMgr->GetMergeColumnCnt(aColNm, GetLanguage(), aContent, &nValue);
     if( !( nSubType & nsSwExtendedSubType::SUB_OWN_FMT ) )
-        SetFormat( nFmt = pMgr->GetColumnFmt( aTmpData.sDataSource, aTmpData.sCommand,
+        SetFormat( nFormat = pMgr->GetColumnFormat( aTmpData.sDataSource, aTmpData.sCommand,
                                         aColNm, pDocFormatter, GetLanguage() ));
 
     sal_Int32 nColumnType = nValue == DBL_MAX
         ? 0
         : pMgr->GetColumnType(aTmpData.sDataSource, aTmpData.sCommand, aColNm);
 
-    bValidValue = FormatValue( pDocFormatter, aContent, nFmt, nValue, nColumnType, this );
+    bValidValue = FormatValue( pDocFormatter, aContent, nFormat, nValue, nColumnType, this );
 
     if( DBL_MAX != nValue )
         aContent = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(nValue, GetFormat(), GetLanguage());
@@ -410,18 +410,18 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         //invalidate text node
         if(GetTyp())
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
-            SwFmtFld* pFmtFld = aIter.First();
-            while(pFmtFld)
+            SwIterator<SwFormatField,SwFieldType> aIter( *GetTyp() );
+            SwFormatField* pFormatField = aIter.First();
+            while(pFormatField)
             {
-                SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
-                if(pTxtFld && static_cast<SwDBField*>(pFmtFld->GetField()) == this )
+                SwTextField *pTextField = pFormatField->GetTextField();
+                if(pTextField && static_cast<SwDBField*>(pFormatField->GetField()) == this )
                 {
                     //notify the change
-                    pTxtFld->NotifyContentChange(*pFmtFld);
+                    pTextField->NotifyContentChange(*pFormatField);
                     break;
                 }
-                pFmtFld = aIter.Next();
+                pFormatField = aIter.Next();
             }
         }
     }
@@ -447,8 +447,8 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 
 // base class for all further database fields
 
-SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt) :
-    SwField(pTyp, nFmt),
+SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat) :
+    SwField(pTyp, nFormat),
     aDBData(rDBData),
     nSubType(0)
 {
@@ -763,8 +763,8 @@ SwFieldType* SwDBNameFieldType::Copy() const
 
 // name of the connected database
 
-SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt)
-    : SwDBNameInfField(pTyp, rDBData, nFmt)
+SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat)
+    : SwDBNameInfField(pTyp, rDBData, nFormat)
 {}
 
 OUString SwDBNameField::Expand() const
@@ -808,8 +808,8 @@ SwFieldType* SwDBSetNumberFieldType::Copy() const
 
 SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp,
                                        const SwDBData& rDBData,
-                                       sal_uLong nFmt)
-    : SwDBNameInfField(pTyp, rDBData, nFmt), nNumber(0)
+                                       sal_uLong nFormat)
+    : SwDBNameInfField(pTyp, rDBData, nFormat), nNumber(0)
 {}
 
 OUString SwDBSetNumberField::Expand() const
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 376f7ac2d7c4..de9d8274cb3f 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -41,11 +41,11 @@ using namespace ::com::sun::star;
 
 class SwIntrnlRefLink : public SwBaseLink
 {
-    SwDDEFieldType& rFldType;
+    SwDDEFieldType& rFieldType;
 public:
-    SwIntrnlRefLink( SwDDEFieldType& rType, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFmt )
-        : SwBaseLink( nUpdateType, nFmt ),
-        rFldType( rType )
+    SwIntrnlRefLink( SwDDEFieldType& rType, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFormat )
+        : SwBaseLink( nUpdateType, nFormat ),
+        rFieldType( rType )
     {}
 
     virtual void Closed() SAL_OVERRIDE;
@@ -82,9 +82,9 @@ public:
             if( bDel )
                 sStr = sStr.copy( 0, n );
 
-            rFldType.SetExpansion( sStr );
+            rFieldType.SetExpansion( sStr );
             // set Expansion first! (otherwise this flag will be deleted)
-            rFldType.SetCRLFDelFlag( bDel );
+            rFieldType.SetCRLFDelFlag( bDel );
         }
         break;
 
@@ -93,25 +93,25 @@ public:
         return SUCCESS;
     }
 
-    OSL_ENSURE( rFldType.GetDoc(), "no pDoc" );
+    OSL_ENSURE( rFieldType.GetDoc(), "no pDoc" );
 
     // no dependencies left?
-    if( rFldType.HasWriterListeners() && !rFldType.IsModifyLocked() && !ChkNoDataFlag() )
+    if( rFieldType.HasWriterListeners() && !rFieldType.IsModifyLocked() && !ChkNoDataFlag() )
     {
-        SwViewShell* pSh = rFldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
-        SwEditShell* pESh = rFldType.GetDoc()->GetEditShell();
+        SwViewShell* pSh = rFieldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+        SwEditShell* pESh = rFieldType.GetDoc()->GetEditShell();
 
         // Search for fields. If no valid found, disconnect.
         SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
         bool bCallModify = false;
-        rFldType.LockModify();
+        rFieldType.LockModify();
 
-        SwIterator<SwClient,SwFieldType> aIter(rFldType);
+        SwIterator<SwClient,SwFieldType> aIter(rFieldType);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
         {
             // a DDE table or a DDE field attribute in the text
-            if( !pLast->IsA( TYPE( SwFmtFld ) ) ||
-                static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
+            if( !pLast->IsA( TYPE( SwFormatField ) ) ||
+                static_cast<SwFormatField*>(pLast)->GetTextField() )
             {
                 if( !bCallModify )
                 {
@@ -125,7 +125,7 @@ public:
             }
         }
 
-        rFldType.UnlockModify();
+        rFieldType.UnlockModify();
 
         if( bCallModify )
         {
@@ -144,15 +144,15 @@ public:
 
 void SwIntrnlRefLink::Closed()
 {
-    if( rFldType.GetDoc() && !rFldType.GetDoc()->IsInDtor() )
+    if( rFieldType.GetDoc() && !rFieldType.GetDoc()->IsInDtor() )
     {
         // advise goes, convert all fields into text?
-        SwViewShell* pSh = rFldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
-        SwEditShell* pESh = rFldType.GetDoc()->GetEditShell();
+        SwViewShell* pSh = rFieldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+        SwEditShell* pESh = rFieldType.GetDoc()->GetEditShell();
         if( pESh )
         {
             pESh->StartAllAction();
-            pESh->FieldToText( &rFldType );
+            pESh->FieldToText( &rFieldType );
             pESh->EndAllAction();
         }
         else
@@ -169,20 +169,20 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
 {
     // here, any anchor of the normal NodesArray should be sufficient
     const SwNode* pNd = 0;
-    SwIterator<SwClient,SwFieldType> aIter(rFldType);
+    SwIterator<SwClient,SwFieldType> aIter(rFieldType);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
         // a DDE table or a DDE field attribute in the text
-        if( !pLast->IsA( TYPE( SwFmtFld ) ))
+        if( !pLast->IsA( TYPE( SwFormatField ) ))
         {
             SwDepend* pDep = static_cast<SwDepend*>(pLast);
-            SwDDETable* pDDETbl = static_cast<SwDDETable*>(pDep->GetToTell());
-            pNd = pDDETbl->GetTabSortBoxes()[0]->GetSttNd();
+            SwDDETable* pDDETable = static_cast<SwDDETable*>(pDep->GetToTell());
+            pNd = pDDETable->GetTabSortBoxes()[0]->GetSttNd();
         }
-        else if( static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
-            pNd = static_cast<SwFmtFld*>(pLast)->GetTxtFld()->GetpTxtNode();
+        else if( static_cast<SwFormatField*>(pLast)->GetTextField() )
+            pNd = static_cast<SwFormatField*>(pLast)->GetTextField()->GetpTextNode();
 
-        if( pNd && &rFldType.GetDoc()->GetNodes() == &pNd->GetNodes() )
+        if( pNd && &rFieldType.GetDoc()->GetNodes() == &pNd->GetNodes() )
             break;
         pNd = 0;
     }
@@ -193,32 +193,32 @@ bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
                                 sal_Int32 nStt, sal_Int32 nEnd ) const
 {
     // here, any anchor of the normal NodesArray should be sufficient
-    SwNodes* pNds = &rFldType.GetDoc()->GetNodes();
-    SwIterator<SwClient,SwFieldType> aIter(rFldType);
+    SwNodes* pNds = &rFieldType.GetDoc()->GetNodes();
+    SwIterator<SwClient,SwFieldType> aIter(rFieldType);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
         // a DDE table or a DDE field attribute in the text
-        if( !pLast->IsA( TYPE( SwFmtFld ) ))
+        if( !pLast->IsA( TYPE( SwFormatField ) ))
         {
             SwDepend* pDep = static_cast<SwDepend*>(pLast);
-            SwDDETable* pDDETbl = static_cast<SwDDETable*>(pDep->GetToTell());
-            const SwTableNode* pTblNd = pDDETbl->GetTabSortBoxes()[0]->
+            SwDDETable* pDDETable = static_cast<SwDDETable*>(pDep->GetToTell());
+            const SwTableNode* pTableNd = pDDETable->GetTabSortBoxes()[0]->
                             GetSttNd()->FindTableNode();
-            if( pTblNd->GetNodes().IsDocNodes() &&
-                nSttNd < pTblNd->EndOfSectionIndex() &&
-                nEndNd > pTblNd->GetIndex() )
+            if( pTableNd->GetNodes().IsDocNodes() &&
+                nSttNd < pTableNd->EndOfSectionIndex() &&
+                nEndNd > pTableNd->GetIndex() )
                 return true;
         }
-        else if( static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
+        else if( static_cast<SwFormatField*>(pLast)->GetTextField() )
         {
-            const SwTxtFld* pTFld = static_cast<SwFmtFld*>(pLast)->GetTxtFld();
-            const SwTxtNode* pNd = pTFld->GetpTxtNode();
+            const SwTextField* pTField = static_cast<SwFormatField*>(pLast)->GetTextField();
+            const SwTextNode* pNd = pTField->GetpTextNode();
             if( pNd && pNds == &pNd->GetNodes() )
             {
                 sal_uLong nNdPos = pNd->GetIndex();
                 if( nSttNd <= nNdPos && nNdPos <= nEndNd &&
-                    ( nNdPos != nSttNd || pTFld->GetStart() >= nStt ) &&
-                    ( nNdPos != nEndNd || pTFld->GetStart() < nEnd ))
+                    ( nNdPos != nSttNd || pTField->GetStart() >= nStt ) &&
+                    ( nNdPos != nEndNd || pTField->GetStart() < nEnd ))
                     return true;
             }
         }
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 268f248b1140..b4823e6a61e2 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -64,17 +64,17 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate
 
 SwDDETable::~SwDDETable()
 {
-    SwDDEFieldType* pFldTyp = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    SwDDEFieldType* pFieldTyp = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
     if( !pDoc->IsInDtor() && !aLines.empty() &&
         GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
-        pFldTyp->DecRefCnt();
+        pFieldTyp->DecRefCnt();
 
     // If it is the last dependent of the "deleted field" than delete it finally
-    if( pFldTyp->IsDeleted() && pFldTyp->HasOnlyOneListener() )
+    if( pFieldTyp->IsDeleted() && pFieldTyp->HasOnlyOneListener() )
     {
-        pFldTyp->Remove( &aDepend );
-        delete pFldTyp;
+        pFieldTyp->Remove( &aDepend );
+        delete pFieldTyp;
     }
 }
 
@@ -97,7 +97,7 @@ void SwDDETable::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 
 void SwDDETable::ChangeContent()
 {
-    OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
+    OSL_ENSURE( GetFrameFormat(), "No FrameFormat" );
 
     // Is this the correct NodesArray? (because of UNDO)
     if( aLines.empty() )
@@ -106,7 +106,7 @@ void SwDDETable::ChangeContent()
     if( !GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
         return;
 
-    // access to DDEFldType
+    // access to DDEFieldType
     SwDDEFieldType* pDDEType = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
 
     OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
@@ -122,26 +122,26 @@ void SwDDETable::ChangeContent()
             SwTableBox* pBox = pLine->GetTabBoxes()[ i ];
             OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
             SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
-            SwTxtNode* pTxtNode = aNdIdx.GetNode().GetTxtNode();
-            OSL_ENSURE( pTxtNode, "No Node" );
-            SwIndex aCntIdx( pTxtNode, 0 );
-            pTxtNode->EraseText( aCntIdx );
-            pTxtNode->InsertText( aLine.getToken( 0, '\t', nLineTokenPos ), aCntIdx );
-
-            SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-            pBoxFmt->LockModify();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-            pBoxFmt->UnlockModify();
+            SwTextNode* pTextNode = aNdIdx.GetNode().GetTextNode();
+            OSL_ENSURE( pTextNode, "No Node" );
+            SwIndex aCntIdx( pTextNode, 0 );
+            pTextNode->EraseText( aCntIdx );
+            pTextNode->InsertText( aLine.getToken( 0, '\t', nLineTokenPos ), aCntIdx );
+
+            SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+            pBoxFormat->LockModify();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+            pBoxFormat->UnlockModify();
         }
     }
 
-    const IDocumentSettingAccess* pIDSA = GetFrmFmt()->getIDocumentSettingAccess();
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    const IDocumentSettingAccess* pIDSA = GetFrameFormat()->getIDocumentSettingAccess();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
     if( AUTOUPD_FIELD_AND_CHARTS == pIDSA->getFieldUpdateFlags(true) )
         pDoc->getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
 }
 
-SwDDEFieldType* SwDDETable::GetDDEFldType()
+SwDDEFieldType* SwDDETable::GetDDEFieldType()
 {
     return static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
 }
@@ -149,8 +149,8 @@ SwDDEFieldType* SwDDETable::GetDDEFldType()
 bool SwDDETable::NoDDETable()
 {
     // search table node
-    OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    OSL_ENSURE( GetFrameFormat(), "No FrameFormat" );
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
     // Is this the correct NodesArray? (because of UNDO)
     if( aLines.empty() )
@@ -160,23 +160,23 @@ bool SwDDETable::NoDDETable()
     if( !pNd->GetNodes().IsDocNodes() )
         return false;
 
-    SwTableNode* pTblNd = pNd->FindTableNode();
-    OSL_ENSURE( pTblNd, "Where is the table?");
+    SwTableNode* pTableNd = pNd->FindTableNode();
+    OSL_ENSURE( pTableNd, "Where is the table?");
 
-    SwTable* pNewTbl = new SwTable( *this );
+    SwTable* pNewTable = new SwTable( *this );
 
     // copy the table data
-    pNewTbl->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move content boxes
+    pNewTable->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move content boxes
     GetTabSortBoxes().clear();
 
-    pNewTbl->GetTabLines().insert( pNewTbl->GetTabLines().begin(),
+    pNewTable->GetTabLines().insert( pNewTable->GetTabLines().begin(),
                                    GetTabLines().begin(), GetTabLines().end() ); // move lines
     GetTabLines().clear();
 
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
         static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn())->DecRefCnt();
 
-    pTblNd->SetNewTable( pNewTbl );       // replace table
+    pTableNd->SetNewTable( pNewTable );       // replace table
 
     return true;
 }
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 75139a9753cc..6c7b4d5e3363 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -111,20 +111,20 @@ SwPageNumberFieldType::SwPageNumberFieldType()
 {
 }
 
-OUString SwPageNumberFieldType::Expand( sal_uInt32 nFmt, short nOff,
+OUString SwPageNumberFieldType::Expand( sal_uInt32 nFormat, short nOff,
          sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage,
          const OUString& rUserStr ) const
 {
-    sal_uInt32 nTmpFmt = (SVX_NUM_PAGEDESC == nFmt) ? (sal_uInt32)nNumberingType : nFmt;
+    sal_uInt32 nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? (sal_uInt32)nNumberingType : nFormat;
     int const nTmp = nPageNumber + nOff;
 
-    if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFmt || (!bVirtuell && nTmp > nMaxPage))
+    if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFormat || (!bVirtuell && nTmp > nMaxPage))
         return OUString();
 
-    if( SVX_NUM_CHAR_SPECIAL == nTmpFmt )
+    if( SVX_NUM_CHAR_SPECIAL == nTmpFormat )
         return rUserStr;
 
-    return FormatNumber( nTmp, nTmpFmt );
+    return FormatNumber( nTmp, nTmpFormat );
 }
 
 SwFieldType* SwPageNumberFieldType::Copy() const
@@ -139,10 +139,10 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 
 void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
                                             bool bVirt,
-                                            const sal_Int16* pNumFmt )
+                                            const sal_Int16* pNumFormat )
 {
-    if( pNumFmt )
-        nNumberingType = *pNumFmt;
+    if( pNumFormat )
+        nNumberingType = *pNumFormat;
 
     bVirtuell = false;
     if (bVirt && pDoc)
@@ -152,19 +152,19 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
         sal_uInt32 nMaxItems = rPool.GetItemCount2( RES_PAGEDESC );
         for( sal_uInt32 n = 0; n < nMaxItems; ++n )
         {
-            const SwFmtPageDesc *pDesc;
-            if( 0 != (pDesc = static_cast<const SwFmtPageDesc*>(rPool.GetItem2( RES_PAGEDESC, n )) )
+            const SwFormatPageDesc *pDesc;
+            if( 0 != (pDesc = static_cast<const SwFormatPageDesc*>(rPool.GetItem2( RES_PAGEDESC, n )) )
                 && pDesc->GetNumOffset() && pDesc->GetDefinedIn() )
             {
-                const SwCntntNode* pNd = PTR_CAST( SwCntntNode, pDesc->GetDefinedIn() );
+                const SwContentNode* pNd = PTR_CAST( SwContentNode, pDesc->GetDefinedIn() );
                 if( pNd )
                 {
-                    if ( SwIterator<SwFrm,SwCntntNode>(*pNd).First() )
+                    if ( SwIterator<SwFrm,SwContentNode>(*pNd).First() )
                         bVirtuell = true;
                 }
-                else if( pDesc->GetDefinedIn()->ISA( SwFmt ))
+                else if( pDesc->GetDefinedIn()->ISA( SwFormat ))
                 {
-                    SwAutoFmtGetDocNode aGetHt( &pDoc->GetNodes() );
+                    SwAutoFormatGetDocNode aGetHt( &pDoc->GetNodes() );
                     bVirtuell = !pDesc->GetDefinedIn()->GetInfo( aGetHt );
                     break;
                 }
@@ -174,9 +174,9 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
 }
 
 SwPageNumberField::SwPageNumberField(SwPageNumberFieldType* pTyp,
-          sal_uInt16 nSub, sal_uInt32 nFmt, short nOff,
+          sal_uInt16 nSub, sal_uInt32 nFormat, short nOff,
           sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage)
-    : SwField(pTyp, nFmt), nSubType(nSub), nOffset(nOff)
+    : SwField(pTyp, nFormat), nSubType(nSub), nOffset(nOff)
     , m_nPageNumber(nPageNumber)
     , m_nMaxPage(nMaxPage)
 {
@@ -192,26 +192,26 @@ void SwPageNumberField::ChangeExpansion(sal_uInt16 const nPageNumber,
 OUString SwPageNumberField::Expand() const
 {
     OUString sRet;
-    SwPageNumberFieldType* pFldType = static_cast<SwPageNumberFieldType*>(GetTyp());
+    SwPageNumberFieldType* pFieldType = static_cast<SwPageNumberFieldType*>(GetTyp());
 
     if( PG_NEXT == nSubType && 1 != nOffset )
     {
-        sRet = pFldType->Expand(GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
         if (!sRet.isEmpty())
         {
-            sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+            sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
         }
     }
     else if( PG_PREV == nSubType && -1 != nOffset )
     {
-        sRet = pFldType->Expand(GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
         if (!sRet.isEmpty())
         {
-            sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+            sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
         }
     }
     else
-        sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
     return sRet;
 }
 
@@ -321,10 +321,10 @@ SwAuthorFieldType::SwAuthorFieldType()
 {
 }
 
-OUString SwAuthorFieldType::Expand(sal_uLong nFmt)
+OUString SwAuthorFieldType::Expand(sal_uLong nFormat)
 {
     SvtUserOptions&  rOpt = SW_MOD()->GetUserOptions();
-    if((nFmt & 0xff) == AF_NAME)
+    if((nFormat & 0xff) == AF_NAME)
         return rOpt.GetFullName();
 
     return rOpt.GetID();
@@ -335,8 +335,8 @@ SwFieldType* SwAuthorFieldType::Copy() const
     return new SwAuthorFieldType;
 }
 
-SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {
     aContent = SwAuthorFieldType::Expand(GetFormat());
 }
@@ -411,14 +411,14 @@ SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument)
     pDoc = pDocument;
 }
 
-OUString SwFileNameFieldType::Expand(sal_uLong nFmt) const
+OUString SwFileNameFieldType::Expand(sal_uLong nFormat) const
 {
     OUString aRet;
     const SwDocShell* pDShell = pDoc->GetDocShell();
     if( pDShell && pDShell->HasName() )
     {
         const INetURLObject& rURLObj = pDShell->GetMedium()->GetURLObject();
-        switch( nFmt & ~FF_FIXED )
+        switch( nFormat & ~FF_FIXED )
         {
             case FF_PATH:
                 {
@@ -469,8 +469,8 @@ SwFieldType* SwFileNameFieldType::Copy() const
     return pTmp;
 }
 
-SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {
     aContent = static_cast<SwFileNameFieldType*>(GetTyp())->Expand(GetFormat());
 }
@@ -583,9 +583,9 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
     pDoc = pDocument;
 }
 
-OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
+OUString SwTemplNameFieldType::Expand(sal_uLong nFormat) const
 {
-    OSL_ENSURE( nFmt < FF_END, "Expand: no valid Fmt!" );
+    OSL_ENSURE( nFormat < FF_END, "Expand: no valid Format!" );
 
     OUString aRet;
     SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -597,11 +597,11 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
             xDPS->getDocumentProperties());
         OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
 
-        if( FF_UI_NAME == nFmt )
+        if( FF_UI_NAME == nFormat )
             aRet = xDocProps->getTemplateName();
         else if( !xDocProps->getTemplateURL().isEmpty() )
         {
-            if( FF_UI_RANGE == nFmt )
+            if( FF_UI_RANGE == nFormat )
             {
                 // for getting region names!
                 SfxDocumentTemplates aFac;
@@ -613,13 +613,13 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
             else
             {
                 INetURLObject aPathName( xDocProps->getTemplateURL() );
-                if( FF_NAME == nFmt )
+                if( FF_NAME == nFormat )
                     aRet = aPathName.GetName(URL_DECODE);
-                else if( FF_NAME_NOEXT == nFmt )
+                else if( FF_NAME_NOEXT == nFormat )
                     aRet = aPathName.GetBase();
                 else
                 {
-                    if( FF_PATH == nFmt )
+                    if( FF_PATH == nFormat )
                     {
                         aPathName.removeSegment();
                         aRet = aPathName.GetFull();
@@ -639,8 +639,8 @@ SwFieldType* SwTemplNameFieldType::Copy() const
     return pTmp;
 }
 
-SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {}
 
 OUString SwTemplNameField::Expand() const
@@ -725,13 +725,13 @@ SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
     pDoc = pDocument;
 }
 
-OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
+OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const
 {
     sal_uInt32 nVal = 0;
     const SwDocStat& rDStat = pDoc->getIDocumentStatistics().GetDocStat();
     switch( nSubType )
     {
-        case DS_TBL:  nVal = rDStat.nTbl;   break;
+        case DS_TBL:  nVal = rDStat.nTable;   break;
         case DS_GRF:  nVal = rDStat.nGrf;   break;
         case DS_OLE:  nVal = rDStat.nOLE;   break;
         case DS_PARA: nVal = rDStat.nPara;  break;
@@ -741,15 +741,15 @@ OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
             if( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
                 ((SwDocStat &)rDStat).nPage = pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum();
             nVal = rDStat.nPage;
-            if( SVX_NUM_PAGEDESC == nFmt )
-                nFmt = (sal_uInt32)nNumberingType;
+            if( SVX_NUM_PAGEDESC == nFormat )
+                nFormat = (sal_uInt32)nNumberingType;
             break;
         default:
             OSL_FAIL( "SwDocStatFieldType::Expand: unknown SubType" );
     }
 
     if( nVal <= SHRT_MAX )
-        return FormatNumber( nVal, nFmt );
+        return FormatNumber( nVal, nFormat );
 
     return OUString::number( nVal );
 }
@@ -763,10 +763,10 @@ SwFieldType* SwDocStatFieldType::Copy() const
 /**
  * @param pTyp
  * @param nSub SubType
- * @param nFmt
+ * @param nFormat
  */
-SwDocStatField::SwDocStatField(SwDocStatFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt),
+SwDocStatField::SwDocStatField(SwDocStatFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat),
     nSubType(nSub)
 {}
 
@@ -1004,15 +1004,15 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
 
 // document info field
 
-SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt) :
-    SwValueField(pTyp, nFmt), nSubType(nSub)
+SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat) :
+    SwValueField(pTyp, nFormat), nSubType(nSub)
 {
     aName = rName;
-    aContent = static_cast<SwDocInfoFieldType*>(GetTyp())->Expand(nSubType, nFmt, GetLanguage(), aName);
+    aContent = static_cast<SwDocInfoFieldType*>(GetTyp())->Expand(nSubType, nFormat, GetLanguage(), aName);
 }
 
-SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt) :
-    SwValueField(pTyp, nFmt), nSubType(nSub)
+SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat) :
+    SwValueField(pTyp, nFormat), nSubType(nSub)
 {
     aName = rName;
     aContent = rValue;
@@ -1140,11 +1140,11 @@ OUString SwDocInfoField::GetFieldName() const
 
 SwField* SwDocInfoField::Copy() const
 {
-    SwDocInfoField* pFld = new SwDocInfoField(static_cast<SwDocInfoFieldType*>(GetTyp()), nSubType, aName, GetFormat());
-    pFld->SetAutomaticLanguage(IsAutomaticLanguage());
-    pFld->aContent = aContent;
+    SwDocInfoField* pField = new SwDocInfoField(static_cast<SwDocInfoFieldType*>(GetTyp()), nSubType, aName, GetFormat());
+    pField->SetAutomaticLanguage(IsAutomaticLanguage());
+    pField->aContent = aContent;
 
-    return pFld;
+    return pField;
 }
 
 sal_uInt16 SwDocInfoField::GetSubType() const
@@ -1258,42 +1258,42 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-SwHiddenTxtFieldType::SwHiddenTxtFieldType( bool bSetHidden )
+SwHiddenTextFieldType::SwHiddenTextFieldType( bool bSetHidden )
     : SwFieldType( RES_HIDDENTXTFLD ), bHidden( bSetHidden )
 {
 }
 
-SwFieldType* SwHiddenTxtFieldType::Copy() const
+SwFieldType* SwHiddenTextFieldType::Copy() const
 {
-    return new SwHiddenTxtFieldType( bHidden );
+    return new SwHiddenTextFieldType( bHidden );
 }
 
-void SwHiddenTxtFieldType::SetHiddenFlag( bool bSetHidden )
+void SwHiddenTextFieldType::SetHiddenFlag( bool bSetHidden )
 {
     if( bHidden != bSetHidden )
     {
         bHidden = bSetHidden;
-        UpdateFlds();       // notify all HiddenTexts
+        UpdateFields();       // notify all HiddenTexts
     }
 }
 
-SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
+SwHiddenTextField::SwHiddenTextField( SwHiddenTextFieldType* pFieldType,
                                     bool    bConditional,
                                     const OUString& rCond,
                                     const OUString& rStr,
                                     bool    bHidden,
                                     sal_uInt16  nSub) :
-    SwField( pFldType ), aCond(rCond), nSubType(nSub),
+    SwField( pFieldType ), aCond(rCond), nSubType(nSub),
     bCanToggle(bConditional), bIsHidden(bHidden), bValid(false)
 {
     if(nSubType == TYP_CONDTXTFLD)
     {
         sal_Int32 nPos = 0;
-        aTRUETxt = rStr.getToken(0, '|', nPos);
+        aTRUEText = rStr.getToken(0, '|', nPos);
 
         if(nPos != -1)
         {
-            aFALSETxt = rStr.getToken(0, '|', nPos);
+            aFALSEText = rStr.getToken(0, '|', nPos);
             if(nPos != -1)
             {
                 aContent = rStr.getToken(0, '|', nPos);
@@ -1302,21 +1302,21 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
         }
     }
     else
-        aTRUETxt = rStr;
+        aTRUEText = rStr;
 }
 
-SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
+SwHiddenTextField::SwHiddenTextField( SwHiddenTextFieldType* pFieldType,
                                     const OUString& rCond,
                                     const OUString& rTrue,
                                     const OUString& rFalse,
                                     sal_uInt16 nSub)
-    : SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub),
+    : SwField( pFieldType ), aTRUEText(rTrue), aFALSEText(rFalse), aCond(rCond), nSubType(nSub),
       bIsHidden(true), bValid(false)
 {
     bCanToggle = !aCond.isEmpty();
 }
 
-OUString SwHiddenTxtField::Expand() const
+OUString SwHiddenTextField::Expand() const
 {
     // Type: !Hidden  -> show always
     //        Hide    -> evaluate condition
@@ -1327,17 +1327,17 @@ OUString SwHiddenTxtField::Expand() const
             return aContent;
 
         if( bCanToggle && !bIsHidden )
-            return aTRUETxt;
+            return aTRUEText;
     }
-    else if( !static_cast<SwHiddenTxtFieldType*>(GetTyp())->GetHiddenFlag() ||
+    else if( !static_cast<SwHiddenTextFieldType*>(GetTyp())->GetHiddenFlag() ||
         ( bCanToggle && bIsHidden ))
-        return aTRUETxt;
+        return aTRUEText;
 
-    return aFALSETxt;
+    return aFALSEText;
 }
 
 /// get current field value and cache it
-void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
+void SwHiddenTextField::Evaluate(SwDoc* pDoc)
 {
     OSL_ENSURE(pDoc, "got no document");
 
@@ -1349,7 +1349,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
         SwDBManager* pMgr = pDoc->GetDBManager();
 #endif
         bValid = false;
-        OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUETxt : aFALSETxt;
+        OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUEText : aFALSEText;
 
         // Database expressions need to be different from normal text. Therefore, normal text is set
         // in quotes. If the latter exist they will be removed. If not, check if potential DB name.
@@ -1393,77 +1393,77 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
     }
 }
 
-OUString SwHiddenTxtField::GetFieldName() const
+OUString SwHiddenTextField::GetFieldName() const
 {
     OUString aStr = SwFieldType::GetTypeStr(nSubType) +
-        " " + aCond + " " + aTRUETxt;
+        " " + aCond + " " + aTRUEText;
 
     if (nSubType == TYP_CONDTXTFLD)
     {
-        aStr += " : " + aFALSETxt;
+        aStr += " : " + aFALSEText;
     }
     return aStr;
 }
 
-SwField* SwHiddenTxtField::Copy() const
+SwField* SwHiddenTextField::Copy() const
 {
-    SwHiddenTxtField* pFld =
-        new SwHiddenTxtField(static_cast<SwHiddenTxtFieldType*>(GetTyp()), aCond,
-                              aTRUETxt, aFALSETxt);
-    pFld->bIsHidden = bIsHidden;
-    pFld->bValid    = bValid;
-    pFld->aContent  = aContent;
-    pFld->SetFormat(GetFormat());
-    pFld->nSubType  = nSubType;
-    return pFld;
+    SwHiddenTextField* pField =
+        new SwHiddenTextField(static_cast<SwHiddenTextFieldType*>(GetTyp()), aCond,
+                              aTRUEText, aFALSEText);
+    pField->bIsHidden = bIsHidden;
+    pField->bValid    = bValid;
+    pField->aContent  = aContent;
+    pField->SetFormat(GetFormat());
+    pField->nSubType  = nSubType;
+    return pField;
 }
 
 /// set condition
-void SwHiddenTxtField::SetPar1(const OUString& rStr)
+void SwHiddenTextField::SetPar1(const OUString& rStr)
 {
     aCond = rStr;
     bCanToggle = !aCond.isEmpty();
 }
 
-OUString SwHiddenTxtField::GetPar1() const
+OUString SwHiddenTextField::GetPar1() const
 {
     return aCond;
 }
 
 /// set True/False text
-void SwHiddenTxtField::SetPar2(const OUString& rStr)
+void SwHiddenTextField::SetPar2(const OUString& rStr)
 {
     if (nSubType == TYP_CONDTXTFLD)
     {
         sal_Int32 nPos = rStr.indexOf('|');
         if (nPos == -1)
-            aTRUETxt = rStr;
+            aTRUEText = rStr;
         else
         {
-            aTRUETxt = rStr.copy(0, nPos);
-            aFALSETxt = rStr.copy(nPos + 1);
+            aTRUEText = rStr.copy(0, nPos);
+            aFALSEText = rStr.copy(nPos + 1);
         }
     }
     else
-        aTRUETxt = rStr;
+        aTRUEText = rStr;
 }
 
 /// get True/False text
-OUString SwHiddenTxtField::GetPar2() const
+OUString SwHiddenTextField::GetPar2() const
 {
     if(nSubType != TYP_CONDTXTFLD)
     {
-        return aTRUETxt;
+        return aTRUEText;
     }
-    return aTRUETxt + "|" + aFALSETxt;
+    return aTRUEText + "|" + aFALSEText;
 }
 
-sal_uInt16 SwHiddenTxtField::GetSubType() const
+sal_uInt16 SwHiddenTextField::GetSubType() const
 {
     return nSubType;
 }
 
-bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
+bool SwHiddenTextField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
 {
     switch( nWhichId )
     {
@@ -1471,10 +1471,10 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         rAny <<= aCond;
         break;
     case FIELD_PROP_PAR2:
-        rAny <<= aTRUETxt;
+        rAny <<= aTRUEText;
         break;
     case FIELD_PROP_PAR3:
-        rAny <<= aFALSETxt;
+        rAny <<= aFALSEText;
         break;
     case FIELD_PROP_PAR4 :
         rAny <<= aContent;
@@ -1488,7 +1488,7 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     return true;
 }
 
-bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
+bool SwHiddenTextField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 {
     switch( nWhichId )
     {
@@ -1500,10 +1500,10 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         }
         break;
     case FIELD_PROP_PAR2:
-        rAny >>= aTRUETxt;
+        rAny >>= aTRUEText;
         break;
     case FIELD_PROP_PAR3:
-        rAny >>= aFALSETxt;
+        rAny >>= aFALSEText;
         break;
     case FIELD_PROP_BOOL1:
         bIsHidden = *static_cast<sal_Bool const *>(rAny.getValue());
@@ -1518,7 +1518,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-OUString SwHiddenTxtField::GetColumnName(const OUString& rName)
+OUString SwHiddenTextField::GetColumnName(const OUString& rName)
 {
     sal_Int32 nPos = rName.indexOf(DB_DELIM);
     if( nPos>=0 )
@@ -1531,7 +1531,7 @@ OUString SwHiddenTxtField::GetColumnName(const OUString& rName)
     return rName;
 }
 
-OUString SwHiddenTxtField::GetDBName(const OUString& rName, SwDoc *pDoc)
+OUString SwHiddenTextField::GetDBName(const OUString& rName, SwDoc *pDoc)
 {
     sal_Int32 nPos = rName.indexOf(DB_DELIM);
     if( nPos>=0 )
@@ -1574,10 +1574,10 @@ OUString SwHiddenParaField::Expand() const
 
 SwField* SwHiddenParaField::Copy() const
 {
-    SwHiddenParaField* pFld = new SwHiddenParaField(static_cast<SwHiddenParaFieldType*>(GetTyp()), aCond);
-    pFld->bIsHidden = bIsHidden;
+    SwHiddenParaField* pField = new SwHiddenParaField(static_cast<SwHiddenParaFieldType*>(GetTyp()), aCond);
+    pField->bIsHidden = bIsHidden;
 
-    return pFld;
+    return pField;
 }
 
 bool SwHiddenParaField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
@@ -1641,12 +1641,12 @@ SwFieldType* SwPostItFieldType::Copy() const
 
 SwPostItField::SwPostItField( SwPostItFieldType* pT,
         const OUString& rAuthor,
-        const OUString& rTxt,
+        const OUString& rText,
         const OUString& rInitials,
         const OUString& rName,
         const DateTime& rDateTime )
     : SwField( pT )
-    , sTxt( rTxt )
+    , sText( rText )
     , sAuthor( rAuthor )
     , sInitials( rInitials )
     , sName( rName )
@@ -1679,7 +1679,7 @@ OUString SwPostItField::GetDescription() const
 
 SwField* SwPostItField::Copy() const
 {
-    SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sTxt, sInitials, sName,
+    SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sText, sInitials, sName,
                                 aDateTime);
     if (mpText)
         pRet->SetTextObject( new OutlinerParaObject(*mpText) );
@@ -1704,13 +1704,13 @@ OUString SwPostItField::GetPar1() const
 /// set the PostIt's text
 void SwPostItField::SetPar2(const OUString& rStr)
 {
-    sTxt = rStr;
+    sText = rStr;
 }
 
 /// get the PostIt's text
 OUString SwPostItField::GetPar2() const
 {
-    return sTxt;
+    return sText;
 }
 
 
@@ -1741,7 +1741,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         break;
     case FIELD_PROP_PAR2:
         {
-        rAny <<= sTxt;
+        rAny <<= sText;
         break;
         }
     case FIELD_PROP_PAR3:
@@ -1764,7 +1764,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
             if ( mpText )
                 m_pTextObject->SetText( *mpText );
             else
-                m_pTextObject->SetString( sTxt );
+                m_pTextObject->SetString( sText );
 
             uno::Reference < text::XText > xText( m_pTextObject );
             rAny <<= xText;
@@ -1795,7 +1795,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         rAny >>= sAuthor;
         break;
     case FIELD_PROP_PAR2:
-        rAny >>= sTxt;
+        rAny >>= sText;
         //#i100374# new string via api, delete complex text object so SwPostItNote picks up the new string
         if (mpText)
         {
@@ -1881,8 +1881,8 @@ OUString SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 )
 
 // extended user information field
 
-SwExtUserField::SwExtUserField(SwExtUserFieldType* pTyp, sal_uInt16 nSubTyp, sal_uInt32 nFmt) :
-    SwField(pTyp, nFmt), nType(nSubTyp)
+SwExtUserField::SwExtUserField(SwExtUserFieldType* pTyp, sal_uInt16 nSubTyp, sal_uInt32 nFormat) :
+    SwField(pTyp, nFormat), nType(nSubTyp)
 {
     aContent = SwExtUserFieldType::Expand(nType, GetFormat());
 }
@@ -1897,10 +1897,10 @@ OUString SwExtUserField::Expand() const
 
 SwField* SwExtUserField::Copy() const
 {
-    SwExtUserField* pFld = new SwExtUserField(static_cast<SwExtUserFieldType*>(GetTyp()), nType, GetFormat());
-    pFld->SetExpansion(aContent);
+    SwExtUserField* pField = new SwExtUserField(static_cast<SwExtUserFieldType*>(GetTyp()), nType, GetFormat());
+    pField->SetExpansion(aContent);
 
-    return pFld;
+    return pField;
 }
 
 sal_uInt16 SwExtUserField::GetSubType() const
@@ -2060,14 +2060,14 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
     if( !pNew && !pOld && HasWriterListeners() )
     {
         // first collect all SetPageRefFields
-        _SetGetExpFlds aTmpLst;
+        _SetGetExpFields aTmpLst;
         if( MakeSetList( aTmpLst ) )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-            for ( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *this );
+            for ( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
                     // update only the GetRef fields
-                    if( pFmtFld->GetTxtFld() )
-                        UpdateField( pFmtFld->GetTxtFld(), aTmpLst );
+                    if( pFormatField->GetTextField() )
+                        UpdateField( pFormatField->GetTextField(), aTmpLst );
         }
     }
 
@@ -2075,22 +2075,22 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
     NotifyClients( pOld, pNew );
 }
 
-bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
+bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst )
 {
-    SwIterator<SwFmtFld,SwFieldType> aIter(*pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_REFPAGESETFLD));
-    for ( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter(*pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_REFPAGESETFLD));
+    for ( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
             // update only the GetRef fields
-            const SwTxtFld* pTFld = pFmtFld->GetTxtFld();
-            if( pTFld )
+            const SwTextField* pTField = pFormatField->GetTextField();
+            if( pTField )
             {
-                const SwTxtNode& rTxtNd = pTFld->GetTxtNode();
+                const SwTextNode& rTextNd = pTField->GetTextNode();
 
                 // Always the first! (in Tab-Headline, header/footer )
                 Point aPt;
-                const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rTxtNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pFrm = rTextNd.getLayoutFrm( rTextNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
 
-                _SetGetExpFld* pNew;
+                _SetGetExpField* pNew;
 
                 if( !pFrm ||
                      pFrm->IsInDocBody() ||
@@ -2099,17 +2099,17 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
                     !pFrm->FindPageFrm() )
                 {
                     //  create index for determination of the TextNode
-                    SwNodeIndex aIdx( rTxtNd );
-                    pNew = new _SetGetExpFld( aIdx, pTFld );
+                    SwNodeIndex aIdx( rTextNd );
+                    pNew = new _SetGetExpField( aIdx, pTField );
                 }
                 else
                 {
                     //  create index for determination of the TextNode
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
-                    bool const bResult = GetBodyTxtNode( *pDoc, aPos, *pFrm );
+                    bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrm );
                     OSL_ENSURE(bResult, "where is the Field?");
                     (void) bResult; // unused in non-debug
-                    pNew = new _SetGetExpFld( aPos.nNode, pTFld,
+                    pNew = new _SetGetExpField( aPos.nNode, pTField,
                                                 &aPos.nContent );
                 }
 
@@ -2121,129 +2121,129 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
     return !rTmpLst.empty();
 }
 
-void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
-                                        _SetGetExpFlds& rSetList )
+void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField,
+                                        _SetGetExpFields& rSetList )
 {
-    SwRefPageGetField* pGetFld = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pTxtFld->GetFmtFld().GetField()));
-    pGetFld->SetText( OUString() );
+    SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pTextField->GetFormatField().GetField()));
+    pGetField->SetText( OUString() );
 
     // then search the correct RefPageSet field
-    SwTxtNode* pTxtNode = &pTxtFld->GetTxtNode();
-    if( pTxtNode->StartOfSectionIndex() >
+    SwTextNode* pTextNode = &pTextField->GetTextNode();
+    if( pTextNode->StartOfSectionIndex() >
         pDoc->GetNodes().GetEndOfExtras().GetIndex() )
     {
-        SwNodeIndex aIdx( *pTxtNode );
-        _SetGetExpFld aEndFld( aIdx, pTxtFld );
+        SwNodeIndex aIdx( *pTextNode );
+        _SetGetExpField aEndField( aIdx, pTextField );
 
-        _SetGetExpFlds::const_iterator itLast = rSetList.lower_bound( &aEndFld );
+        _SetGetExpFields::const_iterator itLast = rSetList.lower_bound( &aEndField );
 
         if( itLast != rSetList.begin() )
         {
             --itLast;
-            const SwTxtFld* pRefTxtFld = (*itLast)->GetTxtFld();
-            const SwRefPageSetField* pSetFld =
-                        static_cast<const SwRefPageSetField*>(pRefTxtFld->GetFmtFld().GetField());
-            if( pSetFld->IsOn() )
+            const SwTextField* pRefTextField = (*itLast)->GetTextField();
+            const SwRefPageSetField* pSetField =
+                        static_cast<const SwRefPageSetField*>(pRefTextField->GetFormatField().GetField());
+            if( pSetField->IsOn() )
             {
                 // determine the correct offset
                 Point aPt;
-                const SwCntntFrm* pFrm = pTxtNode->getLayoutFrm( pTxtNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
-                const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().getLayoutFrm( pRefTxtFld->GetTxtNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pFrm = pTextNode->getLayoutFrm( pTextNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pRefTextField->GetTextNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                 const SwPageFrm* pPgFrm = 0;
                 const short nDiff = ( pFrm && pRefFrm )
                         ?   (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
                             pRefFrm->FindPageFrm()->GetPhyPageNum() + 1
                         : 1;
 
-                sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
+                sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
                         ? ( !pPgFrm
                                 ? (sal_uInt32)SVX_NUM_ARABIC
                                 : pPgFrm->GetPageDesc()->GetNumType().GetNumberingType() )
-                        : pGetFld->GetFormat();
-                const short nPageNum = std::max<short>(0, pSetFld->GetOffset() + nDiff);
-                pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
+                        : pGetField->GetFormat();
+                const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
+                pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
             }
         }
     }
     // start formatting
-    const_cast<SwFmtFld&>(pTxtFld->GetFmtFld()).ModifyNotification( 0, 0 );
+    const_cast<SwFormatField&>(pTextField->GetFormatField()).ModifyNotification( 0, 0 );
 }
 
 // queries for relative page numbering
 
 SwRefPageGetField::SwRefPageGetField( SwRefPageGetFieldType* pTyp,
-                                    sal_uInt32 nFmt )
-    : SwField( pTyp, nFmt )
+                                    sal_uInt32 nFormat )
+    : SwField( pTyp, nFormat )
 {
 }
 
 OUString SwRefPageGetField::Expand() const
 {
-    return sTxt;
+    return sText;
 }
 
 SwField* SwRefPageGetField::Copy() const
 {
     SwRefPageGetField* pCpy = new SwRefPageGetField(
                         static_cast<SwRefPageGetFieldType*>(GetTyp()), GetFormat() );
-    pCpy->SetText( sTxt );
+    pCpy->SetText( sText );
     return pCpy;
 }
 
 void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
-                                        const SwTxtFld* pFld )
+                                        const SwTextField* pField )
 {
     // only fields in Footer, Header, FootNote, Flys
     SwRefPageGetFieldType* pGetType = static_cast<SwRefPageGetFieldType*>(GetTyp());
     SwDoc* pDoc = pGetType->GetDoc();
-    if( pFld->GetTxtNode().StartOfSectionIndex() >
+    if( pField->GetTextNode().StartOfSectionIndex() >
         pDoc->GetNodes().GetEndOfExtras().GetIndex() )
         return;
 
-    sTxt.clear();
+    sText.clear();
 
     OSL_ENSURE( !pFrm->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
 
     // collect all SetPageRefFields
-    _SetGetExpFlds aTmpLst;
+    _SetGetExpFields aTmpLst;
     if( !pGetType->MakeSetList( aTmpLst ) )
         return ;
 
     //  create index for determination of the TextNode
     SwPosition aPos( SwNodeIndex( pDoc->GetNodes() ) );
-    SwTxtNode* pTxtNode = const_cast<SwTxtNode*>(GetBodyTxtNode( *pDoc, aPos, *pFrm ));
+    SwTextNode* pTextNode = const_cast<SwTextNode*>(GetBodyTextNode( *pDoc, aPos, *pFrm ));
 
     // If no layout exists, ChangeExpansion is called for header and
-    // footer lines via layout formatting without existing TxtNode.
-    if(!pTxtNode)
+    // footer lines via layout formatting without existing TextNode.
+    if(!pTextNode)
         return;
 
-    _SetGetExpFld aEndFld( aPos.nNode, pFld, &aPos.nContent );
+    _SetGetExpField aEndField( aPos.nNode, pField, &aPos.nContent );
 
-    _SetGetExpFlds::const_iterator itLast = aTmpLst.lower_bound( &aEndFld );
+    _SetGetExpFields::const_iterator itLast = aTmpLst.lower_bound( &aEndField );
 
     if( itLast == aTmpLst.begin() )
         return;        // there is no corresponding set-field in front
     --itLast;
 
-    const SwTxtFld* pRefTxtFld = (*itLast)->GetTxtFld();
-    const SwRefPageSetField* pSetFld =
-                        static_cast<const SwRefPageSetField*>(pRefTxtFld->GetFmtFld().GetField());
+    const SwTextField* pRefTextField = (*itLast)->GetTextField();
+    const SwRefPageSetField* pSetField =
+                        static_cast<const SwRefPageSetField*>(pRefTextField->GetFormatField().GetField());
     Point aPt;
-    const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, false );
-    if( pSetFld->IsOn() && pRefFrm )
+    const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, false );
+    if( pSetField->IsOn() && pRefFrm )
     {
         // determine the correct offset
         const SwPageFrm* pPgFrm = pFrm->FindPageFrm();
         const short nDiff = pPgFrm->GetPhyPageNum() -
                             pRefFrm->FindPageFrm()->GetPhyPageNum() + 1;
 
-        SwRefPageGetField* pGetFld = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pFld->GetFmtFld().GetField()));
-        sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
+        SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pField->GetFormatField().GetField()));
+        sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
                             ? pPgFrm->GetPageDesc()->GetNumType().GetNumberingType()
-                            : pGetFld->GetFormat();
-        const short nPageNum = std::max<short>(0, pSetFld->GetOffset() + nDiff);
-        pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
+                            : pGetField->GetFormat();
+        const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
+        pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
     }
 }
 
@@ -2255,7 +2255,7 @@ bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
             rAny <<= (sal_Int16)GetFormat();
         break;
         case FIELD_PROP_PAR1:
-            rAny <<= sTxt;
+            rAny <<= sText;
         break;
         default:
             OSL_FAIL("illegal property");
@@ -2278,7 +2278,7 @@ bool SwRefPageGetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         }
         break;
         case FIELD_PROP_PAR1:
-            rAny >>= sTxt;
+            rAny >>= sText;
         break;
     default:
         OSL_FAIL("illegal property");
@@ -2298,44 +2298,44 @@ SwFieldType* SwJumpEditFieldType::Copy() const
     return new SwJumpEditFieldType( pDoc );
 }
 
-SwCharFmt* SwJumpEditFieldType::GetCharFmt()
+SwCharFormat* SwJumpEditFieldType::GetCharFormat()
 {
-    SwCharFmt* pFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( RES_POOLCHR_JUMPEDIT );
+    SwCharFormat* pFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_JUMPEDIT );
 
     // not registered yet?
     if( !aDep.GetRegisteredIn() )
-        pFmt->Add( &aDep );     // register
+        pFormat->Add( &aDep );     // register
 
-    return pFmt;
+    return pFormat;
 }
 
 SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm,
-                                const OUString& rTxt, const OUString& rHelp )
-    : SwField( pTyp, nForm ), sTxt( rTxt ), sHelp( rHelp )
+                                const OUString& rText, const OUString& rHelp )
+    : SwField( pTyp, nForm ), sText( rText ), sHelp( rHelp )
 {
 }
 
 OUString SwJumpEditField::Expand() const
 {
-    return "<" + sTxt + ">";
+    return "<" + sText + ">";
 }
 
 SwField* SwJumpEditField::Copy() const
 {
     return new SwJumpEditField( static_cast<SwJumpEditFieldType*>(GetTyp()), GetFormat(),
-                                sTxt, sHelp );
+                                sText, sHelp );
 }
 
 /// get place holder text
 OUString SwJumpEditField::GetPar1() const
 {
-    return sTxt;
+    return sText;
 }
 
 /// set place holder text
 void SwJumpEditField::SetPar1(const OUString& rStr)
 {
-    sTxt = rStr;
+    sText = rStr;
 }
 
 /// get hint text
@@ -2373,7 +2373,7 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         rAny <<= sHelp;
         break;
     case FIELD_PROP_PAR2 :
-         rAny <<= sTxt;
+         rAny <<= sText;
          break;
     default:
         OSL_FAIL("illegal property");
@@ -2406,7 +2406,7 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         rAny >>= sHelp;
         break;
     case FIELD_PROP_PAR2 :
-         rAny >>= sTxt;
+         rAny >>= sText;
          break;
     default:
         OSL_FAIL("illegal property");
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 602b83015676..b9007ab4e86e 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -131,50 +131,50 @@ OUString ReplacePoint( const OUString& rTmpName, bool bWithCommandType )
     return sRes;
 }
 
-SwTxtNode* GetFirstTxtNode( const SwDoc& rDoc, SwPosition& rPos,
-                            const SwCntntFrm *pCFrm, Point &rPt )
+SwTextNode* GetFirstTextNode( const SwDoc& rDoc, SwPosition& rPos,
+                            const SwContentFrm *pCFrm, Point &rPt )
 {
-    SwTxtNode* pTxtNode = 0;
+    SwTextNode* pTextNode = 0;
     if ( !pCFrm )
     {
         const SwNodes& rNodes = rDoc.GetNodes();
         rPos.nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         while( 0 != (pCNd = rNodes.GoNext( &rPos.nNode ) ) &&
-                0 == ( pTxtNode = pCNd->GetTxtNode() ) )
+                0 == ( pTextNode = pCNd->GetTextNode() ) )
                         ;
-        OSL_ENSURE( pTxtNode, "Where is the 1. TextNode?" );
-        rPos.nContent.Assign( pTxtNode, 0 );
+        OSL_ENSURE( pTextNode, "Where is the 1. TextNode?" );
+        rPos.nContent.Assign( pTextNode, 0 );
     }
     else if ( !pCFrm->IsValid() )
     {
-        pTxtNode = const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCFrm->GetNode()));
-        rPos.nNode = *pTxtNode;
-        rPos.nContent.Assign( pTxtNode, 0 );
+        pTextNode = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCFrm->GetNode()));
+        rPos.nNode = *pTextNode;
+        rPos.nContent.Assign( pTextNode, 0 );
     }
     else
     {
         pCFrm->GetCrsrOfst( &rPos, rPt );
-        pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+        pTextNode = rPos.nNode.GetNode().GetTextNode();
     }
-    return pTxtNode;
+    return pTextNode;
 }
 
-const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
+const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
                                 const SwFrm& rFrm )
 {
     const SwLayoutFrm* pLayout = rFrm.GetUpper();
-    const SwTxtNode* pTxtNode = 0;
+    const SwTextNode* pTextNode = 0;
 
     while( pLayout )
     {
         if( pLayout->IsFlyFrm() )
         {
             // get the FlyFormat
-            const SwFrmFmt* pFlyFmt = static_cast<const SwFlyFrm*>(pLayout)->GetFmt();
-            OSL_ENSURE( pFlyFmt, "Could not find FlyFormat, where is the field?" );
+            const SwFrameFormat* pFlyFormat = static_cast<const SwFlyFrm*>(pLayout)->GetFormat();
+            OSL_ENSURE( pFlyFormat, "Could not find FlyFormat, where is the field?" );
 
-            const SwFmtAnchor &rAnchor = pFlyFmt->GetAnchor();
+            const SwFormatAnchor &rAnchor = pFlyFormat->GetAnchor();
 
             if( FLY_AT_FLY == rAnchor.GetAnchorId() )
             {
@@ -186,12 +186,12 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
                      (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
                      (FLY_AS_CHAR == rAnchor.GetAnchorId()))
             {
-                OSL_ENSURE( rAnchor.GetCntntAnchor(), "no valid position" );
-                rPos = *rAnchor.GetCntntAnchor();
-                pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                OSL_ENSURE( rAnchor.GetContentAnchor(), "no valid position" );
+                rPos = *rAnchor.GetContentAnchor();
+                pTextNode = rPos.nNode.GetNode().GetTextNode();
                 if ( FLY_AT_PARA == rAnchor.GetAnchorId() )
                 {
-                    const_cast<SwTxtNode*>(pTxtNode)->MakeStartIndex(
+                    const_cast<SwTextNode*>(pTextNode)->MakeStartIndex(
                             &rPos.nContent );
                 }
 
@@ -202,51 +202,51 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
             }
             else
             {
-                pLayout->FindPageFrm()->GetCntntPosition(
+                pLayout->FindPageFrm()->GetContentPosition(
                                                 pLayout->Frm().Pos(), rPos );
-                pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                pTextNode = rPos.nNode.GetNode().GetTextNode();
             }
         }
-        else if( pLayout->IsFtnFrm() )
+        else if( pLayout->IsFootnoteFrm() )
         {
             // get the anchor's node
-            const SwTxtFtn* pFtn = static_cast<const SwFtnFrm*>(pLayout)->GetAttr();
-            pTxtNode = &pFtn->GetTxtNode();
-            rPos.nNode = *pTxtNode;
-            rPos.nContent = pFtn->GetStart();
+            const SwTextFootnote* pFootnote = static_cast<const SwFootnoteFrm*>(pLayout)->GetAttr();
+            pTextNode = &pFootnote->GetTextNode();
+            rPos.nNode = *pTextNode;
+            rPos.nContent = pFootnote->GetStart();
         }
         else if( pLayout->IsHeaderFrm() || pLayout->IsFooterFrm() )
         {
-            const SwCntntFrm* pCntFrm;
+            const SwContentFrm* pCntFrm;
             const SwPageFrm* pPgFrm = pLayout->FindPageFrm();
             if( pLayout->IsHeaderFrm() )
             {
                 const SwTabFrm *pTab;
-                if( 0 != ( pCntFrm = pPgFrm->FindFirstBodyCntnt()) &&
+                if( 0 != ( pCntFrm = pPgFrm->FindFirstBodyContent()) &&
                     0 != (pTab = pCntFrm->FindTabFrm()) && pTab->IsFollow() &&
                     pTab->GetTable()->GetRowsToRepeat() > 0 &&
                     pTab->IsInHeadline( *pCntFrm ) )
                 {
                     // take the next line
                     const SwLayoutFrm* pRow = pTab->GetFirstNonHeadlineRow();
-                    pCntFrm = pRow->ContainsCntnt();
+                    pCntFrm = pRow->ContainsContent();
                 }
             }
             else
-                pCntFrm = pPgFrm->FindLastBodyCntnt();
+                pCntFrm = pPgFrm->FindLastBodyContent();
 
             if( pCntFrm )
             {
-                pTxtNode = pCntFrm->GetNode()->GetTxtNode();
-                rPos.nNode = *pTxtNode;
-                const_cast<SwTxtNode*>(pTxtNode)->MakeEndIndex( &rPos.nContent );
+                pTextNode = pCntFrm->GetNode()->GetTextNode();
+                rPos.nNode = *pTextNode;
+                const_cast<SwTextNode*>(pTextNode)->MakeEndIndex( &rPos.nContent );
             }
             else
             {
                 Point aPt( pLayout->Frm().Pos() );
                 aPt.Y()++;      // get out of the header
-                pCntFrm = pPgFrm->GetCntntPos( aPt, false, true, false );
-                pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
+                pCntFrm = pPgFrm->GetContentPos( aPt, false, true, false );
+                pTextNode = GetFirstTextNode( rDoc, rPos, pCntFrm, aPt );
             }
         }
         else
@@ -256,7 +256,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
         }
         break; // found, so finish loop
     }
-    return pTxtNode;
+    return pTextNode;
 }
 
 SwGetExpFieldType::SwGetExpFieldType(SwDoc* pDc)
@@ -277,9 +277,9 @@ void SwGetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* pNew )
 }
 
 SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp, const OUString& rFormel,
-                            sal_uInt16 nSub, sal_uLong nFmt)
-    : SwFormulaField( pTyp, nFmt, 0.0 ),
-    bIsInBodyTxt( true ),
+                            sal_uInt16 nSub, sal_uLong nFormat)
+    : SwFormulaField( pTyp, nFormat, 0.0 ),
+    bIsInBodyText( true ),
     nSubType(nSub),
     bLateInitialization( false )
 {
@@ -311,7 +311,7 @@ SwField* SwGetExpField::Copy() const
     pTmp->SetLanguage(GetLanguage());
     pTmp->SwValueField::SetValue(GetValue());
     pTmp->sExpand       = sExpand;
-    pTmp->bIsInBodyTxt  = bIsInBodyTxt;
+    pTmp->bIsInBodyText  = bIsInBodyText;
     pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
     if( bLateInitialization )
         pTmp->SetLateInitialization();
@@ -319,52 +319,52 @@ SwField* SwGetExpField::Copy() const
     return pTmp;
 }
 
-void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
+void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTextField& rField )
 {
-    if( bIsInBodyTxt ) // only fields in Footer, Header, FootNote, Flys
+    if( bIsInBodyText ) // only fields in Footer, Header, FootNote, Flys
         return;
 
     OSL_ENSURE( !rFrm.IsInDocBody(), "Flag incorrect, frame is in DocBody" );
 
     // determine document (or is there an easier way?)
-    const SwTxtNode* pTxtNode = &rFld.GetTxtNode();
-    SwDoc& rDoc = *const_cast<SwDoc*>(pTxtNode->GetDoc());
+    const SwTextNode* pTextNode = &rField.GetTextNode();
+    SwDoc& rDoc = *const_cast<SwDoc*>(pTextNode->GetDoc());
 
     // create index for determination of the TextNode
     SwPosition aPos( SwNodeIndex( rDoc.GetNodes() ) );
-    pTxtNode = GetBodyTxtNode( rDoc, aPos, rFrm );
+    pTextNode = GetBodyTextNode( rDoc, aPos, rFrm );
 
     // If no layout exists, ChangeExpansion is called for header and
-    // footer lines via layout formatting without existing TxtNode.
-    if(!pTxtNode)
+    // footer lines via layout formatting without existing TextNode.
+    if(!pTextNode)
         return;
     // #i82544#
     if( bLateInitialization )
     {
-        SwFieldType* pSetExpFld = rDoc.getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, GetFormula(), false);
-        if( pSetExpFld )
+        SwFieldType* pSetExpField = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, GetFormula(), false);
+        if( pSetExpField )
         {
             bLateInitialization = false;
             if( !(GetSubType() & nsSwGetSetExpType::GSE_STRING) &&
-                static_cast< SwSetExpFieldType* >(pSetExpFld)->GetType() == nsSwGetSetExpType::GSE_STRING )
+                static_cast< SwSetExpFieldType* >(pSetExpField)->GetType() == nsSwGetSetExpType::GSE_STRING )
             SetSubType( nsSwGetSetExpType::GSE_STRING );
         }
     }
 
-    _SetGetExpFld aEndFld( aPos.nNode, &rFld, &aPos.nContent );
+    _SetGetExpField aEndField( aPos.nNode, &rField, &aPos.nContent );
     if(GetSubType() & nsSwGetSetExpType::GSE_STRING)
     {
-        SwHash** ppHashTbl;
+        SwHash** ppHashTable;
         sal_uInt16 nSize;
-        rDoc.getIDocumentFieldsAccess().FldsToExpand( ppHashTbl, nSize, aEndFld );
-        sExpand = LookString( ppHashTbl, nSize, GetFormula() );
-        ::DeleteHashTable( ppHashTbl, nSize );
+        rDoc.getIDocumentFieldsAccess().FieldsToExpand( ppHashTable, nSize, aEndField );
+        sExpand = LookString( ppHashTable, nSize, GetFormula() );
+        ::DeleteHashTable( ppHashTable, nSize );
     }
     else
     {
         // fill calculator with values
         SwCalc aCalc( rDoc );
-        rDoc.getIDocumentFieldsAccess().FldsToCalc(aCalc, aEndFld);
+        rDoc.getIDocumentFieldsAccess().FieldsToCalc(aCalc, aEndField);
 
         // calculate value
         SetValue(aCalc.Calculate(GetFormula()).GetDouble());
@@ -516,11 +516,11 @@ void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* )
     return;     // do not expand further
 }
 
-void SwSetExpFieldType::SetSeqFormat(sal_uLong nFmt)
+void SwSetExpFieldType::SetSeqFormat(sal_uLong nFormat)
 {
-    SwIterator<SwFmtFld,SwFieldType> aIter(*this);
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
-        pFmtFld->GetField()->ChangeFormat( nFmt );
+    SwIterator<SwFormatField,SwFieldType> aIter(*this);
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+        pFormatField->GetField()->ChangeFormat( nFormat );
 }
 
 sal_uLong SwSetExpFieldType::GetSeqFormat()
@@ -528,11 +528,11 @@ sal_uLong SwSetExpFieldType::GetSeqFormat()
     if( !HasWriterListeners() )
         return SVX_NUM_ARABIC;
 
-    const SwField *pFld = SwIterator<SwFmtFld,SwSetExpFieldType>(*this).First()->GetField();
-    return pFld->GetFormat();
+    const SwField *pField = SwIterator<SwFormatField,SwSetExpFieldType>(*this).First()->GetField();
+    return pField->GetFormat();
 }
 
-sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
+sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
 {
     if( !HasWriterListeners() || !(nsSwGetSetExpType::GSE_SEQ & nType) )
         return USHRT_MAX;
@@ -540,12 +540,12 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
     std::vector<sal_uInt16> aArr;
 
     // check if number is already used and if a new one needs to be created
-    SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-    for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *this );
+    for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
     {
-        const SwTxtNode* pNd;
-        if( pF->GetField() != &rFld && pF->GetTxtFld() &&
-            0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
+        const SwTextNode* pNd;
+        if( pF->GetField() != &rField && pF->GetTextField() &&
+            0 != ( pNd = pF->GetTextField()->GetpTextNode() ) &&
             pNd->GetNodes().IsDocNodes() )
         {
             InsertSort( aArr, static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() );
@@ -553,7 +553,7 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
     }
 
     // check first if number already exists
-    sal_uInt16 nNum = rFld.GetSeqNumber();
+    sal_uInt16 nNum = rField.GetSeqNumber();
     if( USHRT_MAX != nNum )
     {
         std::vector<sal_uInt16>::size_type n {0};
@@ -577,24 +577,24 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
                 break;
     }
 
-    rFld.SetSeqNumber( n );
+    rField.SetSeqNumber( n );
     return n;
 }
 
-size_t SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
+size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList )
 {
     rList.Clear();
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-    for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *this );
+    for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
     {
-        const SwTxtNode* pNd;
-        if( pF->GetTxtFld() &&
-            0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
+        const SwTextNode* pNd;
+        if( pF->GetTextField() &&
+            0 != ( pNd = pF->GetTextField()->GetpTextNode() ) &&
             pNd->GetNodes().IsDocNodes() )
         {
-            _SeqFldLstElem* pNew = new _SeqFldLstElem(
-                    pNd->GetExpandTxt( 0, -1 ),
+            _SeqFieldLstElem* pNew = new _SeqFieldLstElem(
+                    pNd->GetExpandText( 0, -1 ),
                     static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() );
             rList.InsertSort( pNew );
         }
@@ -603,25 +603,25 @@ size_t SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
     return rList.Count();
 }
 
-void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
+void SwSetExpFieldType::SetChapter( SwSetExpField& rField, const SwNode& rNd )
 {
-    const SwTxtNode* pTxtNd = rNd.FindOutlineNodeOfLevel( nLevel );
-    if( pTxtNd )
+    const SwTextNode* pTextNd = rNd.FindOutlineNodeOfLevel( nLevel );
+    if( pTextNd )
     {
-        SwNumRule * pRule = pTxtNd->GetNumRule();
+        SwNumRule * pRule = pTextNd->GetNumRule();
 
         if (pRule)
         {
             // --> OD 2005-11-02 #i51089 - TUNING#
-            if ( pTxtNd->GetNum() )
+            if ( pTextNd->GetNum() )
             {
-                const SwNodeNum & aNum = *(pTxtNd->GetNum());
+                const SwNodeNum & aNum = *(pTextNd->GetNum());
 
                 // only get the number, without pre-/post-fixstrings
                 OUString sNumber( pRule->MakeNumString(aNum, false ));
 
                 if( !sNumber.isEmpty() )
-                    rFld.ChgExpStr( sNumber + sDelim + rFld.GetExpStr() );
+                    rField.ChgExpStr( sNumber + sDelim + rField.GetExpStr() );
             }
             else
             {
@@ -693,7 +693,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
+bool SwSeqFieldList::InsertSort( _SeqFieldLstElem* pNew )
 {
     OUStringBuffer aBuf(pNew->sDlgEntry);
     const sal_Int32 nLen = aBuf.getLength();
@@ -713,7 +713,7 @@ bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
     return bRet;
 }
 
-bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
+bool SwSeqFieldList::SeekEntry( const _SeqFieldLstElem& rNew, size_t* pP ) const
 {
     size_t nO = maData.size();
     size_t nU = 0;
@@ -770,15 +770,15 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
 }
 
 SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
-                                        sal_uLong nFmt)
-    : SwFormulaField( pTyp, nFmt, 0.0 ), nSeqNo( USHRT_MAX ),
+                                        sal_uLong nFormat)
+    : SwFormulaField( pTyp, nFormat, 0.0 ), nSeqNo( USHRT_MAX ),
     nSubType(0)
-    , mpFmtFld(0)
+    , mpFormatField(0)
 {
     SetFormula(rFormel);
     // ignore SubType
     bInput = false;
-    if( IsSequenceFld() )
+    if( IsSequenceField() )
     {
         SwValueField::SetValue(1.0);
         if( rFormel.isEmpty() )
@@ -788,9 +788,9 @@ SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
     }
 }
 
-void SwSetExpField::SetFmtFld(SwFmtFld & rFmtFld)
+void SwSetExpField::SetFormatField(SwFormatField & rFormatField)
 {
-    mpFmtFld = &rFmtFld;
+    mpFormatField = &rFormatField;
 }
 
 OUString SwSetExpField::Expand() const
@@ -809,7 +809,7 @@ OUString SwSetExpField::Expand() const
 /// @return the field name
 OUString SwSetExpField::GetFieldName() const
 {
-    SwFldTypesEnum const nStrType( (IsSequenceFld())
+    SwFieldTypesEnum const nStrType( (IsSequenceField())
                             ? TYP_SEQFLD
                             : (bInput)
                                 ? TYP_SETINPFLD
@@ -861,7 +861,7 @@ void SwSetExpField::SetValue( const double& rAny )
 {
     SwValueField::SetValue(rAny);
 
-    if( IsSequenceFld() )
+    if( IsSequenceField() )
         sExpand = FormatNumber( GetValue(), GetFormat() );
     else
         sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue( rAny,
@@ -877,19 +877,19 @@ void SwGetExpField::SetValue( const double& rAny )
 
 /** Find the index of the reference text following the current field
  *
- * @param rFmt
+ * @param rFormat
  * @param rDoc
  * @param nHint search starting position after the current field (or 0 if default)
  * @return
  */
-sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint)
+sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint)
 {
 
-    const SwTxtFld* pTxtFld = rFmt.GetTxtFld();
-    const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+    const SwTextField* pTextField = rFormat.GetTextField();
+    const SwTextNode& rTextNode = pTextField->GetTextNode();
 
-    sal_Int32 nRet = nHint ? nHint : pTxtFld->GetStart() + 1;
-    OUString sNodeText = rTxtNode.GetTxt();
+    sal_Int32 nRet = nHint ? nHint : pTextField->GetStart() + 1;
+    OUString sNodeText = rTextNode.GetText();
 
     if(nRet<sNodeText.getLength())
     {
@@ -909,7 +909,7 @@ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc,
             0, 0
         };
         SwAttrSet aSet(rDoc.GetAttrPool(), nIds);
-        rTxtNode.GetAttr(aSet, nRet, nRet+1);
+        rTextNode.GetAttr(aSet, nRet, nRet+1);
 
         if( RTL_TEXTENCODING_SYMBOL != static_cast<const SvxFontItem&>(aSet.Get(
                 GetWhichOfScript( RES_CHRATR_FONT, nSrcpt )) ).GetCharSet() )
@@ -1122,14 +1122,14 @@ SwInputField::SwInputField( SwInputFieldType* pFieldType,
                             const OUString& rContent,
                             const OUString& rPrompt,
                             sal_uInt16 nSub,
-                            sal_uLong nFmt,
+                            sal_uLong nFormat,
                             bool bIsFormField )
-    : SwField( pFieldType, nFmt, LANGUAGE_SYSTEM, false )
+    : SwField( pFieldType, nFormat, LANGUAGE_SYSTEM, false )
     , aContent(rContent)
     , aPText(rPrompt)
     , nSubType(nSub)
     , mbIsFormField( bIsFormField )
-    , mpFmtFld( NULL )
+    , mpFormatField( NULL )
 {
 }
 
@@ -1137,33 +1137,33 @@ SwInputField::~SwInputField()
 {
 }
 
-void SwInputField::SetFmtFld( SwFmtFld& rFmtFld )
+void SwInputField::SetFormatField( SwFormatField& rFormatField )
 {
-    mpFmtFld = &rFmtFld;
+    mpFormatField = &rFormatField;
 }
 
 
 
 void SwInputField::LockNotifyContentChange()
 {
-    if ( GetFmtFld() != NULL )
+    if ( GetFormatField() != NULL )
     {
-        SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld* >(GetFmtFld()->GetTxtFld());
-        if ( pTxtInputFld != NULL )
+        SwTextInputField* pTextInputField = dynamic_cast< SwTextInputField* >(GetFormatField()->GetTextField());
+        if ( pTextInputField != NULL )
         {
-            pTxtInputFld->LockNotifyContentChange();
+            pTextInputField->LockNotifyContentChange();
         }
     }
 }
 
 void SwInputField::UnlockNotifyContentChange()
 {
-    if ( GetFmtFld() != NULL )
+    if ( GetFormatField() != NULL )
     {
-        SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld* >(GetFmtFld()->GetTxtFld());
-        if ( pTxtInputFld != NULL )
+        SwTextInputField* pTextInputField = dynamic_cast< SwTextInputField* >(GetFormatField()->GetTextField());
+        if ( pTextInputField != NULL )
         {
-            pTxtInputFld->UnlockNotifyContentChange();
+            pTextInputField->UnlockNotifyContentChange();
         }
     }
 }
@@ -1177,7 +1177,7 @@ void SwInputField::applyFieldContent( const OUString& rNewFieldContent )
     else if( (nSubType & 0x00ff) == INP_USR )
     {
         SwUserFieldType* pUserTyp = static_cast<SwUserFieldType*>(
-            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFldType( RES_USERFLD, getContent(), false ) );
+            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFieldType( RES_USERFLD, getContent(), false ) );
         if( pUserTyp )
         {
             pUserTyp->SetContent( rNewFieldContent );
@@ -1185,7 +1185,7 @@ void SwInputField::applyFieldContent( const OUString& rNewFieldContent )
             // trigger update of the corresponding User Fields and other related Input Fields
             {
                 LockNotifyContentChange();
-                pUserTyp->UpdateFlds();
+                pUserTyp->UpdateFields();
                 UnlockNotifyContentChange();
             }
         }
@@ -1204,7 +1204,7 @@ OUString SwInputField::GetFieldName() const
 
 SwField* SwInputField::Copy() const
 {
-    SwInputField* pFld =
+    SwInputField* pField =
         new SwInputField(
             static_cast<SwInputFieldType*>(GetTyp()),
             getContent(),
@@ -1213,11 +1213,11 @@ SwField* SwInputField::Copy() const
             GetFormat(),
             mbIsFormField );
 
-    pFld->SetHelp( aHelp );
-    pFld->SetToolTip( aToolTip );
+    pField->SetHelp( aHelp );
+    pField->SetToolTip( aToolTip );
 
-    pFld->SetAutomaticLanguage(IsAutomaticLanguage());
-    return pFld;
+    pField->SetAutomaticLanguage(IsAutomaticLanguage());
+    return pField;
 }
 
 OUString SwInputField::Expand() const
@@ -1230,7 +1230,7 @@ OUString SwInputField::Expand() const
     if( (nSubType & 0x00ff) == INP_USR )
     {
         SwUserFieldType* pUserTyp = static_cast<SwUserFieldType*>(
-            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFldType( RES_USERFLD, getContent(), false ) );
+            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFieldType( RES_USERFLD, getContent(), false ) );
         if( pUserTyp )
             return pUserTyp->GetContent();
     }
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3024f9c042f3..7f02e0a23bb8 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -51,13 +51,13 @@
 using namespace ::com::sun::star;
 using namespace nsSwDocInfoSubType;
 
-static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt,
+static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFormat,
                                 const SvNumberFormatter& rFormatter )
 {
     if( nLng == LANGUAGE_NONE ) // Bug #60010
         nLng = LANGUAGE_SYSTEM;
     else if( nLng == ::GetAppLanguage() )
-        switch( rFormatter.GetIndexTableOffset( nFmt ))
+        switch( rFormatter.GetIndexTableOffset( nFormat ))
         {
         case NF_NUMBER_SYSTEM:
         case NF_DATE_SYSTEM_SHORT:
@@ -73,7 +73,7 @@ static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt,
 // Globals
 
 /// field names
-std::vector<OUString>* SwFieldType::s_pFldNames = nullptr;
+std::vector<OUString>* SwFieldType::s_pFieldNames = nullptr;
 
 namespace
 {
@@ -125,11 +125,11 @@ namespace
 
 OUString SwFieldType::GetTypeStr(sal_uInt16 nTypeId)
 {
-    if (!s_pFldNames)
-        _GetFldName();
+    if (!s_pFieldNames)
+        _GetFieldName();
 
-    if (nTypeId < SwFieldType::s_pFldNames->size())
-        return (*SwFieldType::s_pFldNames)[nTypeId];
+    if (nTypeId < SwFieldType::s_pFieldNames->size())
+        return (*SwFieldType::s_pFieldNames)[nTypeId];
     return OUString();
 }
 
@@ -154,26 +154,26 @@ bool SwFieldType::PutValue( const uno::Any& , sal_uInt16 )
     return false;
 }
 
-void SwFldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFieldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFldTypes"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFieldTypes"));
     sal_uInt16 nCount = size();
     for (sal_uInt16 nType = 0; nType < nCount; ++nType)
     {
         const SwFieldType *pCurType = (*this)[nType];
-        SwIterator<SwFmtFld, SwFieldType> aIter(*pCurType);
-        for (const SwFmtFld* pCurFldFmt = aIter.First(); pCurFldFmt; pCurFldFmt = aIter.Next())
+        SwIterator<SwFormatField, SwFieldType> aIter(*pCurType);
+        for (const SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next())
         {
-            xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFld"));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFldFmt);
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("txtFld"), "%p", pCurFldFmt->GetTxtFld());
+            xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatField"));
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFieldFormat);
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("txtField"), "%p", pCurFieldFormat->GetTextField());
 
             xmlTextWriterStartElement(pWriter, BAD_CAST("swField"));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s", BAD_CAST(typeid(*pCurFldFmt->GetField()).name()));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFldFmt->GetField());
-            if (pCurFldFmt->GetField()->GetTyp()->Which() == RES_POSTITFLD)
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s", BAD_CAST(typeid(*pCurFieldFormat->GetField()).name()));
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFieldFormat->GetField());
+            if (pCurFieldFormat->GetField()->GetTyp()->Which() == RES_POSTITFLD)
             {
-                const SwPostItField* pField = static_cast<const SwPostItField*>(pCurFldFmt->GetField());
+                const SwPostItField* pField = static_cast<const SwPostItField*>(pCurFieldFormat->GetField());
                 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(pField->GetName().toUtf8().getStr()));
             }
             xmlTextWriterEndElement(pWriter);
@@ -481,7 +481,7 @@ SwValueFieldType::SwValueFieldType( const SwValueFieldType& rTyp )
 
 /// return value formatted as string
 OUString SwValueFieldType::ExpandValue( const double& rVal,
-                                        sal_uInt32 nFmt, sal_uInt16 nLng) const
+                                        sal_uInt32 nFormat, sal_uInt16 nLng) const
 {
     if (rVal >= DBL_MAX) // error string for calculator
         return SwViewShell::GetShellRes()->aCalc_Error;
@@ -491,51 +491,51 @@ OUString SwValueFieldType::ExpandValue( const double& rVal,
     Color* pCol = 0;
 
     // Bug #60010
-    sal_uInt16 nFmtLng = ::lcl_GetLanguageOfFormat( nLng, nFmt, *pFormatter );
+    sal_uInt16 nFormatLng = ::lcl_GetLanguageOfFormat( nLng, nFormat, *pFormatter );
 
-    if( nFmt < SV_COUNTRY_LANGUAGE_OFFSET && LANGUAGE_SYSTEM != nFmtLng )
+    if( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && LANGUAGE_SYSTEM != nFormatLng )
     {
         short nType = css::util::NumberFormat::DEFINED;
         sal_Int32 nDummy;
 
-        const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+        const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
 
         if (pEntry && nLng != pEntry->GetLanguage())
         {
-            sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
-                                                    (LanguageType)nFmtLng);
+            sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFormat,
+                                                    (LanguageType)nFormatLng);
 
-            if (nNewFormat == nFmt)
+            if (nNewFormat == nFormat)
             {
                 // probably user-defined format
-                OUString sFmt(pEntry->GetFormatstring());
+                OUString sFormat(pEntry->GetFormatstring());
 
-                pFormatter->PutandConvertEntry(sFmt, nDummy, nType, nFmt,
-                                        pEntry->GetLanguage(), nFmtLng );
+                pFormatter->PutandConvertEntry(sFormat, nDummy, nType, nFormat,
+                                        pEntry->GetLanguage(), nFormatLng );
             }
             else
-                nFmt = nNewFormat;
+                nFormat = nNewFormat;
         }
         OSL_ENSURE(pEntry, "unknown number format!");
     }
 
-    if( pFormatter->IsTextFormat( nFmt ) )
+    if( pFormatter->IsTextFormat( nFormat ) )
     {
-        pFormatter->GetOutputString(DoubleToString(rVal, nFmtLng), nFmt,
+        pFormatter->GetOutputString(DoubleToString(rVal, nFormatLng), nFormat,
                                     sExpand, &pCol);
     }
     else
     {
-        pFormatter->GetOutputString(rVal, nFmt, sExpand, &pCol);
+        pFormatter->GetOutputString(rVal, nFormat, sExpand, &pCol);
     }
     return sExpand;
 }
 
 OUString SwValueFieldType::DoubleToString(const double &rVal,
-                                        sal_uInt32 nFmt) const
+                                        sal_uInt32 nFormat) const
 {
     SvNumberFormatter* pFormatter = m_pDoc->GetNumberFormatter();
-    const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+    const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
 
     if (!pEntry)
         return OUString();
@@ -557,16 +557,16 @@ OUString SwValueFieldType::DoubleToString( const double &rVal,
                                     pFormatter->GetDecSep(), true );
 }
 
-SwValueField::SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt,
+SwValueField::SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat,
                             sal_uInt16 nLng, const double fVal )
-    : SwField(pFldType, nFmt, nLng)
+    : SwField(pFieldType, nFormat, nLng)
     , m_fValue(fVal)
 {
 }
 
-SwValueField::SwValueField( const SwValueField& rFld )
-    : SwField(rFld)
-    , m_fValue(rFld.GetValue())
+SwValueField::SwValueField( const SwValueField& rField )
+    : SwField(rField)
+    , m_fValue(rField.GetValue())
 {
 }
 
@@ -590,43 +590,43 @@ SwFieldType* SwValueField::ChgTyp( SwFieldType* pNewType )
     {
         SvNumberFormatter* pFormatter = pNewDoc->GetNumberFormatter();
 
-        if( pFormatter && pFormatter->HasMergeFmtTbl() &&
+        if( pFormatter && pFormatter->HasMergeFormatTable() &&
             static_cast<SwValueFieldType *>(GetTyp())->UseFormat() )
-            SetFormat(pFormatter->GetMergeFmtIndex( GetFormat() ));
+            SetFormat(pFormatter->GetMergeFormatIndex( GetFormat() ));
     }
 
     return SwField::ChgTyp(pNewType);
 }
 
 /// get format in office language
-sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt)
+sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat)
 {
-    const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+    const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
     sal_uInt16 nLng = SvtSysLocale().GetLanguageTag().getLanguageType();
 
     if (pEntry && nLng != pEntry->GetLanguage())
     {
-        sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
+        sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFormat,
                                                         (LanguageType)nLng);
 
-        if (nNewFormat == nFmt)
+        if (nNewFormat == nFormat)
         {
             // probably user-defined format
             short nType = css::util::NumberFormat::DEFINED;
             sal_Int32 nDummy;
 
-            OUString sFmt(pEntry->GetFormatstring());
+            OUString sFormat(pEntry->GetFormatstring());
 
-            sal_uInt32 nTempFormat = nFmt;
-            pFormatter->PutandConvertEntry(sFmt, nDummy, nType,
+            sal_uInt32 nTempFormat = nFormat;
+            pFormatter->PutandConvertEntry(sFormat, nDummy, nType,
                                            nTempFormat, pEntry->GetLanguage(), nLng);
-            nFmt = nTempFormat;
+            nFormat = nTempFormat;
         }
         else
-            nFmt = nNewFormat;
+            nFormat = nNewFormat;
     }
 
-    return nFmt;
+    return nFormat;
 }
 
 /// set language of the format
@@ -638,30 +638,30 @@ void SwValueField::SetLanguage( sal_uInt16 nLng )
     {
         // Bug #60010
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
-        sal_uInt16 nFmtLng = ::lcl_GetLanguageOfFormat( nLng, GetFormat(),
+        sal_uInt16 nFormatLng = ::lcl_GetLanguageOfFormat( nLng, GetFormat(),
                                                     *pFormatter );
 
         if( (GetFormat() >= SV_COUNTRY_LANGUAGE_OFFSET ||
-             LANGUAGE_SYSTEM != nFmtLng ) &&
+             LANGUAGE_SYSTEM != nFormatLng ) &&
             !(Which() == RES_USERFLD && (GetSubType()&nsSwExtendedSubType::SUB_CMD) ) )
         {
             const SvNumberformat* pEntry = pFormatter->GetEntry(GetFormat());
 
-            if( pEntry && nFmtLng != pEntry->GetLanguage() )
+            if( pEntry && nFormatLng != pEntry->GetLanguage() )
             {
                 sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(
-                                        GetFormat(), (LanguageType)nFmtLng );
+                                        GetFormat(), (LanguageType)nFormatLng );
 
                 if( nNewFormat == GetFormat() )
                 {
                     // probably user-defined format
                     short nType = css::util::NumberFormat::DEFINED;
                     sal_Int32 nDummy;
-                    OUString sFmt( pEntry->GetFormatstring() );
-                    pFormatter->PutandConvertEntry( sFmt, nDummy, nType,
+                    OUString sFormat( pEntry->GetFormatstring() );
+                    pFormatter->PutandConvertEntry( sFormat, nDummy, nType,
                                                     nNewFormat,
                                                     pEntry->GetLanguage(),
-                                                    nFmtLng );
+                                                    nFormatLng );
                 }
                 SetFormat( nNewFormat );
             }
@@ -682,14 +682,14 @@ void SwValueField::SetValue( const double& rVal )
     m_fValue = rVal;
 }
 
-SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt, const double fVal)
-    : SwValueField(pFldType, nFmt, LANGUAGE_SYSTEM, fVal)
+SwFormulaField::SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, const double fVal)
+    : SwValueField(pFieldType, nFormat, LANGUAGE_SYSTEM, fVal)
 {
 }
 
-SwFormulaField::SwFormulaField( const SwFormulaField& rFld )
-    : SwValueField(static_cast<SwValueFieldType *>(rFld.GetTyp()), rFld.GetFormat(),
-                    rFld.GetLanguage(), rFld.GetValue())
+SwFormulaField::SwFormulaField( const SwFormulaField& rField )
+    : SwValueField(static_cast<SwValueFieldType *>(rField.GetTyp()), rField.GetFormat(),
+                    rField.GetLanguage(), rField.GetValue())
 {
 }
 
@@ -702,9 +702,9 @@ void SwFormulaField::SetFormula(const OUString& rStr)
 {
     m_sFormula = rStr;
 
-    sal_uLong nFmt(GetFormat());
+    sal_uLong nFormat(GetFormat());
 
-    if( nFmt && SAL_MAX_UINT32 != nFmt )
+    if( nFormat && SAL_MAX_UINT32 != nFormat )
     {
         sal_Int32 nPos = 0;
         double fTmpValue;
@@ -715,19 +715,19 @@ void SwFormulaField::SetFormula(const OUString& rStr)
 
 void SwFormulaField::SetExpandedFormula( const OUString& rStr )
 {
-    sal_uInt32 nFmt(GetFormat());
+    sal_uInt32 nFormat(GetFormat());
 
-    if (nFmt && nFmt != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
+    if (nFormat && nFormat != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
     {
         double fTmpValue;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        if (pFormatter->IsNumberFormat(rStr, nFmt, fTmpValue))
+        if (pFormatter->IsNumberFormat(rStr, nFormat, fTmpValue))
         {
             SwValueField::SetValue(fTmpValue);
 
-            m_sFormula = static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(fTmpValue, nFmt);
+            m_sFormula = static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(fTmpValue, nFormat);
             return;
         }
     }
@@ -736,23 +736,23 @@ void SwFormulaField::SetExpandedFormula( const OUString& rStr )
 
 OUString SwFormulaField::GetExpandedFormula() const
 {
-    sal_uInt32 nFmt(GetFormat());
+    sal_uInt32 nFormat(GetFormat());
 
-    if (nFmt && nFmt != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
+    if (nFormat && nFormat != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
     {
         OUString sFormattedValue;
         Color* pCol = 0;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        if (pFormatter->IsTextFormat(nFmt))
+        if (pFormatter->IsTextFormat(nFormat))
         {
-            OUString sTempIn(static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(GetValue(), nFmt));
-            pFormatter->GetOutputString(sTempIn, nFmt, sFormattedValue, &pCol);
+            OUString sTempIn(static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(GetValue(), nFormat));
+            pFormatter->GetOutputString(sTempIn, nFormat, sFormattedValue, &pCol);
         }
         else
         {
-            pFormatter->GetOutputString(GetValue(), nFmt, sFormattedValue, &pCol);
+            pFormatter->GetOutputString(GetValue(), nFormat, sFormattedValue, &pCol);
         }
         return sFormattedValue;
     }
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 0b23799b5b34..42d14a21e3d1 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -37,12 +37,12 @@ SwFieldType* SwDateTimeFieldType::Copy() const
     return pTmp;
 }
 
-SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pInitType, sal_uInt16 nSub, sal_uLong nFmt, sal_uInt16 nLng)
-    : SwValueField(pInitType, nFmt, nLng, 0.0),
+SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pInitType, sal_uInt16 nSub, sal_uLong nFormat, sal_uInt16 nLng)
+    : SwValueField(pInitType, nFormat, nLng, 0.0),
     nSubType(nSub),
     nOffset(0)
 {
-    if (!nFmt)
+    if (!nFormat)
     {
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
         if (nSubType & DATEFLD)
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 03e3a8efa7ae..13339c5753a2 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -36,40 +36,40 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst )
     : pSh(pShell)
 {
     // create sorted list of all  input fields
-    pSrtLst = new _SetGetExpFlds();
+    pSrtLst = new _SetGetExpFields();
 
-    const SwFldTypes& rFldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nSize = rFldTypes.size();
+    const SwFieldTypes& rFieldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nSize = rFieldTypes.size();
 
     // iterate over all types
     for(size_t i=0; i < nSize; ++i)
     {
-        SwFieldType* pFldType = (SwFieldType*)rFldTypes[ i ];
-        const sal_uInt16 nType = pFldType->Which();
+        SwFieldType* pFieldType = (SwFieldType*)rFieldTypes[ i ];
+        const sal_uInt16 nType = pFieldType->Which();
 
         if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType || RES_DROPDOWN == nType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+                const SwTextField* pTextField = pFormatField->GetTextField();
 
-                // only process InputFields, interactive SetExpFlds and DropDown fields
-                if( !pTxtFld || ( RES_SETEXPFLD == nType &&
-                    !static_cast<SwSetExpField*>(pFmtFld->GetField())->GetInputFlag()))
+                // only process InputFields, interactive SetExpFields and DropDown fields
+                if( !pTextField || ( RES_SETEXPFLD == nType &&
+                    !static_cast<SwSetExpField*>(pFormatField->GetField())->GetInputFlag()))
                     continue;
 
-                const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-                if( rTxtNode.GetNodes().IsDocNodes() )
+                const SwTextNode& rTextNode = pTextField->GetTextNode();
+                if( rTextNode.GetNodes().IsDocNodes() )
                 {
                     if( bBuildTmpLst )
                     {
-                        aTmpLst.insert( pTxtFld );
+                        aTmpLst.insert( pTextField );
                     }
                     else
                     {
-                        SwNodeIndex aIdx( rTxtNode );
-                        _SetGetExpFld* pNew = new _SetGetExpFld(aIdx, pTxtFld );
+                        SwNodeIndex aIdx( rTextNode );
+                        _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField );
                         pSrtLst->insert( pNew );
                     }
                 }
@@ -91,9 +91,9 @@ size_t SwInputFieldList::Count() const
 // get field from list in sorted order
 SwField* SwInputFieldList::GetField(size_t nId)
 {
-    const SwTxtFld* pTxtFld = (*pSrtLst)[ nId ]->GetTxtFld();
-    OSL_ENSURE( pTxtFld, "no TextFld" );
-    return const_cast<SwField*>(pTxtFld->GetFmtFld().GetField());
+    const SwTextField* pTextField = (*pSrtLst)[ nId ]->GetTextField();
+    OSL_ENSURE( pTextField, "no TextField" );
+    return const_cast<SwField*>(pTextField->GetFormatField().GetField());
 }
 
 /// save cursor
@@ -126,36 +126,36 @@ void SwInputFieldList::GotoFieldPos(size_t nId)
  */
 bool SwInputFieldList::BuildSortLst()
 {
-    const SwFldTypes& rFldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nSize = rFldTypes.size();
+    const SwFieldTypes& rFieldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nSize = rFieldTypes.size();
 
     // iterate over all types
     for( size_t i = 0; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (SwFieldType*)rFldTypes[ i ];
-        const sal_uInt16 nType = pFldType->Which();
+        SwFieldType* pFieldType = (SwFieldType*)rFieldTypes[ i ];
+        const sal_uInt16 nType = pFieldType->Which();
 
         if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+                const SwTextField* pTextField = pFormatField->GetTextField();
 
-                //  process only InputFields and interactive SetExpFlds
-                if( !pTxtFld || ( RES_SETEXPFLD == nType &&
-                    !static_cast<SwSetExpField*>(pFmtFld->GetField())->GetInputFlag()))
+                //  process only InputFields and interactive SetExpFields
+                if( !pTextField || ( RES_SETEXPFLD == nType &&
+                    !static_cast<SwSetExpField*>(pFormatField->GetField())->GetInputFlag()))
                     continue;
 
-                const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-                if( rTxtNode.GetNodes().IsDocNodes() )
+                const SwTextNode& rTextNode = pTextField->GetTextNode();
+                if( rTextNode.GetNodes().IsDocNodes() )
                 {
                     // not in TempList, thus add to SortList
-                    std::set<const SwTxtFld*>::iterator it = aTmpLst.find( pTxtFld );
+                    std::set<const SwTextField*>::iterator it = aTmpLst.find( pTextField );
                     if( aTmpLst.end() == it )
                     {
-                        SwNodeIndex aIdx( rTxtNode );
-                        _SetGetExpFld* pNew = new _SetGetExpFld(aIdx, pTxtFld );
+                        SwNodeIndex aIdx( rTextNode );
+                        _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField );
                         pSrtLst->insert( pNew );
                     }
                     else
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index f03ad73e7dca..371ca8c5c30a 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -41,8 +41,8 @@ SwFieldType* SwMacroFieldType::Copy() const
 }
 
 SwMacroField::SwMacroField(SwMacroFieldType* pInitType,
-                           const OUString& rLibAndName, const OUString& rTxt) :
-    SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(false)
+                           const OUString& rLibAndName, const OUString& rText) :
+    SwField(pInitType), aMacro(rLibAndName), aText(rText), bIsScriptURL(false)
 {
     bIsScriptURL = isScriptURL(aMacro);
 }
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 6a8f53eea98e..618acb04509e 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -44,23 +44,23 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
     const SwPosition* pAnnotationStartPos )
 {
     SwLayoutStatus aRet = INVISIBLE;
-    SwTxtNode* pTxtNode = rAnchorPos.nNode.GetNode().GetTxtNode();
-    if ( pTxtNode == NULL )
+    SwTextNode* pTextNode = rAnchorPos.nNode.GetNode().GetTextNode();
+    if ( pTextNode == NULL )
         return aRet;
 
-    SwIterator<SwTxtFrm,SwCntntNode> aIter( *pTxtNode );
-    for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm != NULL; pTxtFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwContentNode> aIter( *pTextNode );
+    for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm != NULL; pTextFrm = aIter.Next() )
     {
-        if( !pTxtFrm->IsFollow() )
+        if( !pTextFrm->IsFollow() )
         {
-            pTxtFrm = pTxtFrm->GetFrmAtPos( rAnchorPos );
-            SwPageFrm *pPage = pTxtFrm ? pTxtFrm->FindPageFrm() : 0;
+            pTextFrm = pTextFrm->GetFrmAtPos( rAnchorPos );
+            SwPageFrm *pPage = pTextFrm ? pTextFrm->FindPageFrm() : 0;
             if ( pPage != NULL && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
             {
                 aRet = VISIBLE;
 
-                o_rInfo.mpAnchorFrm = pTxtFrm;
-                pTxtFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 );
+                o_rInfo.mpAnchorFrm = pTextFrm;
+                pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 );
                 if ( pAnnotationStartPos != NULL )
                 {
                     o_rInfo.mnStartNodeIdx = pAnnotationStartPos->nNode.GetIndex();
@@ -78,7 +78,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
                 o_rInfo.meSidebarPosition = pPage->SidebarPosition();
                 o_rInfo.mRedlineAuthor = 0;
 
-                const IDocumentRedlineAccess* pIDRA = pTxtNode->getIDocumentRedlineAccess();
+                const IDocumentRedlineAccess* pIDRA = pTextNode->getIDocumentRedlineAccess();
                 if( IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() ) )
                 {
                     const SwRangeRedline* pRedline = pIDRA->GetRedline( rAnchorPos, 0 );
@@ -95,7 +95,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
         }
     }
 
-    return ( (aRet==VISIBLE) && SwScriptInfo::IsInHiddenRange( *pTxtNode , rAnchorPos.nContent.GetIndex()) )
+    return ( (aRet==VISIBLE) && SwScriptInfo::IsInHiddenRange( *pTextNode , rAnchorPos.nContent.GetIndex()) )
              ? HIDDEN
              : aRet;
 }
@@ -130,17 +130,17 @@ unsigned long SwPostItHelper::getPageInfo( SwRect& rPageFrm, const SwRootFrm* pR
 
 SwPosition SwAnnotationItem::GetAnchorPosition() const
 {
-    SwTxtFld* pTxtFld = mrFmtFld.GetTxtFld();
-    SwTxtNode* pTxtNode = pTxtFld->GetpTxtNode();
+    SwTextField* pTextField = mrFormatField.GetTextField();
+    SwTextNode* pTextNode = pTextField->GetpTextNode();
 
-    SwPosition aPos( *pTxtNode );
-    aPos.nContent.Assign( pTxtNode, pTxtFld->GetStart() );
+    SwPosition aPos( *pTextNode );
+    aPos.nContent.Assign( pTextNode, pTextField->GetStart() );
     return aPos;
 }
 
 bool SwAnnotationItem::UseElement()
 {
-    return mrFmtFld.IsFldInDoc();
+    return mrFormatField.IsFieldInDoc();
 }
 
 VclPtr<sw::sidebarwindows::SwSidebarWin> SwAnnotationItem::GetSidebarWindow(
@@ -152,7 +152,7 @@ VclPtr<sw::sidebarwindows::SwSidebarWin> SwAnnotationItem::GetSidebarWindow(
     return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin, nBits,
                                                 aMgr, aBits,
                                                 *this,
-                                                &mrFmtFld );
+                                                &mrFormatField );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index f75eedfea755..c845ed0f2d5e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -90,11 +90,11 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
     }
 }
 
-bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                    const SwTxtNode& rBehindNd, sal_Int32 nSttPos )
+bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
+                    const SwTextNode& rBehindNd, sal_Int32 nSttPos )
 {
-    const SwTxtFrm *pMyFrm = static_cast<SwTxtFrm*>(rMyNd.getLayoutFrm( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) ),
-                   *pFrm = static_cast<SwTxtFrm*>(rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) );
+    const SwTextFrm *pMyFrm = static_cast<SwTextFrm*>(rMyNd.getLayoutFrm( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) ),
+                   *pFrm = static_cast<SwTextFrm*>(rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) );
 
     while( pFrm && !pFrm->IsInside( nSttPos ) )
         pFrm = pFrm->GetFollow();
@@ -131,39 +131,39 @@ bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
     }
 
     const SwFrm* pRefFrm = aRefArr[ nRefCnt ];
-    const SwFrm* pFldFrm = aArr[ nCnt ];
+    const SwFrm* pFieldFrm = aArr[ nCnt ];
 
     // different frames, check their Y-/X-position
     bool bRefIsLower = false;
-    if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() ||
+    if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() ||
         ( FRM_COLUMN | FRM_CELL ) & pRefFrm->GetType() )
     {
-        if( pFldFrm->GetType() == pRefFrm->GetType() )
+        if( pFieldFrm->GetType() == pRefFrm->GetType() )
         {
             // here, the X-pos is more important
             if( bVert )
             {
                 if( bR2L )
-                    bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                            ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                              pRefFrm->Frm().Left() < pFldFrm->Frm().Left() );
+                    bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                            ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                              pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
                 else
-                    bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                            ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                              pRefFrm->Frm().Left() > pFldFrm->Frm().Left() );
+                    bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                            ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                              pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
             }
             else if( bR2L )
-                bRefIsLower = pRefFrm->Frm().Left() > pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                              pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                              pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             else
-                bRefIsLower = pRefFrm->Frm().Left() < pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                              pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                              pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             pRefFrm = 0;
         }
-        else if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() )
-            pFldFrm = aArr[ nCnt - 1 ];
+        else if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() )
+            pFieldFrm = aArr[ nCnt - 1 ];
         else
             pRefFrm = aRefArr[ nRefCnt - 1 ];
     }
@@ -173,31 +173,31 @@ bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
         if( bVert )
         {
             if( bR2L )
-                bRefIsLower = pRefFrm->Frm().Left() < pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                                pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                                pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             else
-                bRefIsLower = pRefFrm->Frm().Left() > pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                                pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                                pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
         }
         else if( bR2L )
-            bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                        ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                            pRefFrm->Frm().Left() > pFldFrm->Frm().Left() );
+            bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                        ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                            pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
         else
-            bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                        ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                            pRefFrm->Frm().Left() < pFldFrm->Frm().Left() );
+            bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                        ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                            pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
     }
     return bRefIsLower;
 }
 
 /// get references
-SwGetRefField::SwGetRefField( SwGetRefFieldType* pFldType,
+SwGetRefField::SwGetRefField( SwGetRefFieldType* pFieldType,
                               const OUString& rSetRef, sal_uInt16 nSubTyp,
-                              sal_uInt16 nSeqenceNo, sal_uLong nFmt )
-    : SwField( pFldType, nFmt ),
+                              sal_uInt16 nSeqenceNo, sal_uLong nFormat )
+    : SwField( pFieldType, nFormat ),
       sSetRefName( rSetRef ),
       nSubType( nSubTyp ),
       nSeqNo( nSeqenceNo )
@@ -236,7 +236,7 @@ bool SwGetRefField::IsRefToNumItemCrossRefBookmark() const
         ::sw::mark::CrossRefNumItemBookmark::IsLegalName(sSetRefName);
 }
 
-const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
+const SwTextNode* SwGetRefField::GetReferencedTextNode() const
 {
     SwGetRefFieldType *pTyp = dynamic_cast<SwGetRefFieldType*>(GetTyp());
     if (!pTyp)
@@ -246,17 +246,17 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
 }
 
 // #i85090#
-OUString SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const
+OUString SwGetRefField::GetExpandedTextOfReferencedTextNode() const
 {
-    const SwTxtNode* pReferencedTxtNode( GetReferencedTxtNode() );
-    return pReferencedTxtNode
-           ? OUString(pReferencedTxtNode->GetExpandTxt( 0, -1, true, true, false, false ))
+    const SwTextNode* pReferencedTextNode( GetReferencedTextNode() );
+    return pReferencedTextNode
+           ? OUString(pReferencedTextNode->GetExpandText( 0, -1, true, true, false, false ))
            : OUString();
 }
 
 OUString SwGetRefField::Expand() const
 {
-    return sTxt;
+    return sText;
 }
 
 OUString SwGetRefField::GetFieldName() const
@@ -269,26 +269,26 @@ OUString SwGetRefField::GetFieldName() const
     return Expand();
 }
 
-// #i81002# - parameter <pFldTxtAttr> added
-void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
+// #i81002# - parameter <pFieldTextAttr> added
+void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
 {
-    sTxt.clear();
+    sText.clear();
 
     SwDoc* pDoc = static_cast<SwGetRefFieldType*>(GetTyp())->GetDoc();
     // finding the reference target (the number)
     sal_Int32 nNumStart = -1;
     sal_Int32 nNumEnd = -1;
-    SwTxtNode* pTxtNd = SwGetRefFieldType::FindAnchor(
+    SwTextNode* pTextNd = SwGetRefFieldType::FindAnchor(
         pDoc, sSetRefName, nSubType, nSeqNo, &nNumStart, &nNumEnd
     );
     // not found?
-    if ( !pTxtNd )
+    if ( !pTextNd )
     {
-        sTxt = SwViewShell::GetShellRes()->aGetRefFld_RefItemNotFound;
+        sText = SwViewShell::GetShellRes()->aGetRefField_RefItemNotFound;
         return ;
     }
     // where is the category name (e.g. "Illustration")?
-    const OUString aText = pTxtNd->GetTxt();
+    const OUString aText = pTextNd->GetText();
     const sal_Int32 nCatStart = aText.indexOf(sSetRefName);
     const bool bHasCat = nCatStart>=0;
     const sal_Int32 nCatEnd = bHasCat ? nCatStart + sSetRefName.getLength() : -1;
@@ -328,14 +328,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                 // "Caption Text"
                 case REF_ONLYCAPTION: {
                     // next alphanumeric character after category+number
-                    if (const SwTxtAttr* const pTxtAttr =
-                        pTxtNd->GetTxtAttrForCharAt(nNumStart, RES_TXTATR_FIELD)
+                    if (const SwTextAttr* const pTextAttr =
+                        pTextNd->GetTextAttrForCharAt(nNumStart, RES_TXTATR_FIELD)
                     ) {
                         // start searching from nFrom
                         const sal_Int32 nFrom = bHasCat
                             ? std::max(nNumStart + 1, nCatEnd)
                             : nNumStart + 1;
-                        nStart = SwGetExpField::GetReferenceTextPos( pTxtAttr->GetFmtFld(), *pDoc, nFrom );
+                        nStart = SwGetExpField::GetReferenceTextPos( pTextAttr->GetFormatField(), *pDoc, nFrom );
                     } else {
                         nStart = bHasCat ? std::max(nNumEnd, nCatEnd) : nNumEnd;
                     }
@@ -371,12 +371,12 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
                 // get number or numString
-                for( unsigned i = 0; i < pDoc->GetFtnIdxs().size(); ++i )
+                for( unsigned i = 0; i < pDoc->GetFootnoteIdxs().size(); ++i )
                 {
-                    SwTxtFtn* const pFtnIdx = pDoc->GetFtnIdxs()[i];
-                    if( nSeqNo == pFtnIdx->GetSeqRefNo() )
+                    SwTextFootnote* const pFootnoteIdx = pDoc->GetFootnoteIdxs()[i];
+                    if( nSeqNo == pFootnoteIdx->GetSeqRefNo() )
                     {
-                        sTxt = pFtnIdx->GetFtn().GetViewNumStr( *pDoc );
+                        sText = pFootnoteIdx->GetFootnote().GetViewNumStr( *pDoc );
                         break;
                     }
                 }
@@ -390,13 +390,13 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 
             if( nStart != nEnd ) // a section?
             {
-                sTxt = pTxtNd->GetExpandTxt( nStart, nEnd - nStart );
+                sText = pTextNd->GetExpandText( nStart, nEnd - nStart );
 
                 // remove all special characters (replace them with blanks)
-                if( !sTxt.isEmpty() )
+                if( !sText.isEmpty() )
                 {
-                    sTxt = comphelper::string::remove(sTxt, 0xad);
-                    OUStringBuffer aBuf(sTxt);
+                    sText = comphelper::string::remove(sText, 0xad);
+                    OUStringBuffer aBuf(sText);
                     const sal_Int32 l = aBuf.getLength();
                     for (sal_Int32 i=0; i<l; ++i)
                     {
@@ -409,7 +409,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                             aBuf[i]='-';
                         }
                     }
-                    sTxt = aBuf.makeStringAndClear();
+                    sText = aBuf.makeStringAndClear();
                 }
             }
         }
@@ -418,7 +418,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_PAGE:
     case REF_PAGE_PGDESC:
         {
-            const SwTxtFrm* pFrm = static_cast<SwTxtFrm*>(pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)),
+            const SwTextFrm* pFrm = static_cast<SwTextFrm*>(pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)),
                         *pSave = pFrm;
             while( pFrm && !pFrm->IsInside( nNumStart ) )
                 pFrm = pFrm->GetFollow();
@@ -430,9 +430,9 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                 if( REF_PAGE_PGDESC == GetFormat() &&
                     0 != ( pPage = pFrm->FindPageFrm() ) &&
                     pPage->GetPageDesc() )
-                    sTxt = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo );
+                    sText = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo );
                 else
-                    sTxt = OUString::number(nPageNo);
+                    sText = OUString::number(nPageNo);
             }
         }
         break;
@@ -440,14 +440,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_CHAPTER:
         {
             // a bit tricky: search any frame
-            const SwFrm* pFrm = pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+            const SwFrm* pFrm = pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
             if( pFrm )
             {
-                SwChapterFieldType aFldTyp;
-                SwChapterField aFld( &aFldTyp, 0 );
-                aFld.SetLevel( MAXLEVEL - 1 );
-                aFld.ChangeExpansion( pFrm, pTxtNd, true );
-                sTxt = aFld.GetNumber();
+                SwChapterFieldType aFieldTyp;
+                SwChapterField aField( &aFieldTyp, 0 );
+                aField.SetLevel( MAXLEVEL - 1 );
+                aField.ChangeExpansion( pFrm, pTextNd, true );
+                sText = aField.GetNumber();
             }
         }
         break;
@@ -455,24 +455,24 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_UPDOWN:
         {
             // #i81002#
-            // simplified: use parameter <pFldTxtAttr>
-            if( !pFldTxtAttr || !pFldTxtAttr->GetpTxtNode() )
+            // simplified: use parameter <pFieldTextAttr>
+            if( !pFieldTextAttr || !pFieldTextAttr->GetpTextNode() )
                 break;
 
             LanguageTag aLanguageTag( GetLanguage());
             LocaleDataWrapper aLocaleData( aLanguageTag );
 
             // first a "short" test - in case both are in the same node
-            if( pFldTxtAttr->GetpTxtNode() == pTxtNd )
+            if( pFieldTextAttr->GetpTextNode() == pTextNd )
             {
-                sTxt = nNumStart < pFldTxtAttr->GetStart()
+                sText = nNumStart < pFieldTextAttr->GetStart()
                             ? aLocaleData.getAboveWord()
                             : aLocaleData.getBelowWord();
                 break;
             }
 
-            sTxt = ::IsFrameBehind( *pFldTxtAttr->GetpTxtNode(), pFldTxtAttr->GetStart(),
-                                    *pTxtNd, nNumStart )
+            sText = ::IsFrameBehind( *pFieldTextAttr->GetpTextNode(), pFieldTextAttr->GetStart(),
+                                    *pTextNd, nNumStart )
                         ? aLocaleData.getAboveWord()
                         : aLocaleData.getBelowWord();
         }
@@ -482,9 +482,9 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_NUMBER_NO_CONTEXT:
     case REF_NUMBER_FULL_CONTEXT:
         {
-            if ( pFldTxtAttr && pFldTxtAttr->GetpTxtNode() )
+            if ( pFieldTextAttr && pFieldTextAttr->GetpTextNode() )
             {
-                sTxt = MakeRefNumStr( pFldTxtAttr->GetTxtNode(), *pTxtNd, GetFormat() );
+                sText = MakeRefNumStr( pFieldTextAttr->GetTextNode(), *pTextNd, GetFormat() );
             }
         }
         break;
@@ -495,14 +495,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 }
 
 // #i81002#
-OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
-                                     const SwTxtNode& rTxtNodeOfReferencedItem,
+OUString SwGetRefField::MakeRefNumStr( const SwTextNode& rTextNodeOfField,
+                                     const SwTextNode& rTextNodeOfReferencedItem,
                                      const sal_uInt32 nRefNumFormat )
 {
-    if ( rTxtNodeOfReferencedItem.HasNumber() &&
-         rTxtNodeOfReferencedItem.IsCountedInList() )
+    if ( rTextNodeOfReferencedItem.HasNumber() &&
+         rTextNodeOfReferencedItem.IsCountedInList() )
     {
-        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNum(),
+        OSL_ENSURE( rTextNodeOfReferencedItem.GetNum(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced paragraph has number, but no <SwNodeNum> instance --> please inform OD!" );
 
         // Determine, up to which level the superior list labels have to be
@@ -513,30 +513,30 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
         // field and the text node of the referenced item are in the same
         // document context.
         if ( nRefNumFormat == REF_NUMBER &&
-             rTxtNodeOfField.FindFlyStartNode()
-                            == rTxtNodeOfReferencedItem.FindFlyStartNode() &&
-             rTxtNodeOfField.FindFootnoteStartNode()
-                            == rTxtNodeOfReferencedItem.FindFootnoteStartNode() &&
-             rTxtNodeOfField.FindHeaderStartNode()
-                            == rTxtNodeOfReferencedItem.FindHeaderStartNode() &&
-             rTxtNodeOfField.FindFooterStartNode()
-                            == rTxtNodeOfReferencedItem.FindFooterStartNode() )
+             rTextNodeOfField.FindFlyStartNode()
+                            == rTextNodeOfReferencedItem.FindFlyStartNode() &&
+             rTextNodeOfField.FindFootnoteStartNode()
+                            == rTextNodeOfReferencedItem.FindFootnoteStartNode() &&
+             rTextNodeOfField.FindHeaderStartNode()
+                            == rTextNodeOfReferencedItem.FindHeaderStartNode() &&
+             rTextNodeOfField.FindFooterStartNode()
+                            == rTextNodeOfReferencedItem.FindFooterStartNode() )
         {
-            const SwNodeNum* pNodeNumForTxtNodeOfField( 0 );
-            if ( rTxtNodeOfField.HasNumber() &&
-                 rTxtNodeOfField.GetNumRule() == rTxtNodeOfReferencedItem.GetNumRule() )
+            const SwNodeNum* pNodeNumForTextNodeOfField( 0 );
+            if ( rTextNodeOfField.HasNumber() &&
+                 rTextNodeOfField.GetNumRule() == rTextNodeOfReferencedItem.GetNumRule() )
             {
-                pNodeNumForTxtNodeOfField = rTxtNodeOfField.GetNum();
+                pNodeNumForTextNodeOfField = rTextNodeOfField.GetNum();
             }
             else
             {
-                pNodeNumForTxtNodeOfField =
-                    rTxtNodeOfReferencedItem.GetNum()->GetPrecedingNodeNumOf( rTxtNodeOfField );
+                pNodeNumForTextNodeOfField =
+                    rTextNodeOfReferencedItem.GetNum()->GetPrecedingNodeNumOf( rTextNodeOfField );
             }
-            if ( pNodeNumForTxtNodeOfField )
+            if ( pNodeNumForTextNodeOfField )
             {
-                const SwNumberTree::tNumberVector rFieldNumVec = pNodeNumForTxtNodeOfField->GetNumberVector();
-                const SwNumberTree::tNumberVector rRefItemNumVec = rTxtNodeOfReferencedItem.GetNum()->GetNumberVector();
+                const SwNumberTree::tNumberVector rFieldNumVec = pNodeNumForTextNodeOfField->GetNumberVector();
+                const SwNumberTree::tNumberVector rRefItemNumVec = rTextNodeOfReferencedItem.GetNum()->GetNumberVector();
                 sal_uInt8 nLevel( 0 );
                 while ( nLevel < rFieldNumVec.size() && nLevel < rRefItemNumVec.size() )
                 {
@@ -555,13 +555,13 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
 
         // Determine, if superior list labels have to be included
         const bool bInclSuperiorNumLabels(
-            ( nRestrictInclToThisLevel < rTxtNodeOfReferencedItem.GetActualListLevel() &&
+            ( nRestrictInclToThisLevel < rTextNodeOfReferencedItem.GetActualListLevel() &&
               ( nRefNumFormat == REF_NUMBER || nRefNumFormat == REF_NUMBER_FULL_CONTEXT ) ) );
 
-        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNumRule(),
+        OSL_ENSURE( rTextNodeOfReferencedItem.GetNumRule(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced numbered paragraph has no numbering rule set --> please inform OD!" );
-        return rTxtNodeOfReferencedItem.GetNumRule()->MakeRefNumString(
-                                            *(rTxtNodeOfReferencedItem.GetNum()),
+        return rTextNodeOfReferencedItem.GetNumRule()->MakeRefNumString(
+                                            *(rTextNodeOfReferencedItem.GetNum()),
                                             bInclSuperiorNumLabels,
                                             nRestrictInclToThisLevel );
     }
@@ -571,11 +571,11 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
 
 SwField* SwGetRefField::Copy() const
 {
-    SwGetRefField* pFld = new SwGetRefField( static_cast<SwGetRefFieldType*>(GetTyp()),
+    SwGetRefField* pField = new SwGetRefField( static_cast<SwGetRefFieldType*>(GetTyp()),
                                                 sSetRefName, nSubType,
                                                 nSeqNo, GetFormat() );
-    pFld->sTxt = sTxt;
-    return pFld;
+    pField->sText = sText;
+    return pField;
 }
 
 /// get reference name
@@ -750,7 +750,7 @@ void SwGetRefField::ConvertProgrammaticToUIName()
         SwDoc* pDoc = static_cast<SwGetRefFieldType*>(GetTyp())->GetDoc();
         const OUString rPar1 = GetPar1();
         // don't convert when the name points to an existing field type
-        if(!pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, rPar1, false))
+        if(!pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, rPar1, false))
         {
             sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
             sal_uInt16 nResId = USHRT_MAX;
@@ -789,66 +789,66 @@ void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
     // update to all GetReference fields
     if( !pNew && !pOld )
     {
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
             // update only the GetRef fields
             //JP 3.4.2001: Task 71231 - we need the correct language
-            SwGetRefField* pGRef = static_cast<SwGetRefField*>(pFmtFld->GetField());
-            const SwTxtFld* pTFld;
+            SwGetRefField* pGRef = static_cast<SwGetRefField*>(pFormatField->GetField());
+            const SwTextField* pTField;
             if( !pGRef->GetLanguage() &&
-                0 != ( pTFld = pFmtFld->GetTxtFld()) &&
-                pTFld->GetpTxtNode() )
+                0 != ( pTField = pFormatField->GetTextField()) &&
+                pTField->GetpTextNode() )
             {
-                pGRef->SetLanguage( pTFld->GetpTxtNode()->GetLang(
-                                                pTFld->GetStart() ) );
+                pGRef->SetLanguage( pTField->GetpTextNode()->GetLang(
+                                                pTField->GetStart() ) );
             }
 
             // #i81002#
-            pGRef->UpdateField( pFmtFld->GetTxtFld() );
+            pGRef->UpdateField( pFormatField->GetTextField() );
         }
     }
     // forward to text fields, they "expand" the text
     NotifyClients( pOld, pNew );
 }
 
-SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
+SwTextNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                                         sal_uInt16 nSubType, sal_uInt16 nSeqNo,
                                         sal_Int32* pStt, sal_Int32* pEnd )
 {
     OSL_ENSURE( pStt, "Why did no one check the StartPos?" );
 
-    SwTxtNode* pTxtNd = 0;
+    SwTextNode* pTextNd = 0;
     switch( nSubType )
     {
     case REF_SETREFATTR:
         {
-            const SwFmtRefMark *pRef = pDoc->GetRefMark( rRefMark );
-            if( pRef && pRef->GetTxtRefMark() )
+            const SwFormatRefMark *pRef = pDoc->GetRefMark( rRefMark );
+            if( pRef && pRef->GetTextRefMark() )
             {
-                pTxtNd = const_cast<SwTxtNode*>(&pRef->GetTxtRefMark()->GetTxtNode());
-                *pStt = pRef->GetTxtRefMark()->GetStart();
+                pTextNd = const_cast<SwTextNode*>(&pRef->GetTextRefMark()->GetTextNode());
+                *pStt = pRef->GetTextRefMark()->GetStart();
                 if( pEnd )
-                    *pEnd = *pRef->GetTxtRefMark()->GetAnyEnd();
+                    *pEnd = *pRef->GetTextRefMark()->GetAnyEnd();
             }
         }
         break;
 
     case REF_SEQUENCEFLD:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetFldType( RES_SETEXPFLD, rRefMark, false );
-            if( pFldType && pFldType->HasWriterListeners() &&
-                nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pFldType)->GetType() )
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetFieldType( RES_SETEXPFLD, rRefMark, false );
+            if( pFieldType && pFieldType->HasWriterListeners() &&
+                nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pFieldType)->GetType() )
             {
-                SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+                SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
                 {
-                    if( pFmtFld->GetTxtFld() && nSeqNo ==
-                        static_cast<SwSetExpField*>(pFmtFld->GetField())->GetSeqNumber() )
+                    if( pFormatField->GetTextField() && nSeqNo ==
+                        static_cast<SwSetExpField*>(pFormatField->GetField())->GetSeqNumber() )
                     {
-                        SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-                        pTxtNd = pTxtFld->GetpTxtNode();
-                        *pStt = pTxtFld->GetStart();
+                        SwTextField* pTextField = pFormatField->GetTextField();
+                        pTextNd = pTextField->GetpTextNode();
+                        *pStt = pTextField->GetStart();
                         if( pEnd )
                             *pEnd = (*pStt) + 1;
                         break;
@@ -866,7 +866,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                 const ::sw::mark::IMark* pBkmk = ppMark->get();
                 const SwPosition* pPos = &pBkmk->GetMarkStart();
 
-                pTxtNd = pPos->nNode.GetNode().GetTxtNode();
+                pTextNd = pPos->nNode.GetNode().GetTextNode();
                 *pStt = pPos->nContent.GetIndex();
                 if(pEnd)
                 {
@@ -876,9 +876,9 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                         // #i81002#
                         if(dynamic_cast< ::sw::mark::CrossRefBookmark const *>(pBkmk))
                         {
-                            OSL_ENSURE( pTxtNd,
+                            OSL_ENSURE( pTextNd,
                                     "<SwGetRefFieldType::FindAnchor(..)> - node marked by cross-reference bookmark isn't a text node --> crash" );
-                            *pEnd = pTxtNd->Len();
+                            *pEnd = pTextNd->Len();
                         }
                     }
                     else if(pBkmk->GetOtherMarkPos().nNode == pBkmk->GetMarkPos().nNode)
@@ -896,15 +896,15 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
     case REF_FOOTNOTE:
     case REF_ENDNOTE:
         {
-            for( auto pFtnIdx : pDoc->GetFtnIdxs() )
-                if( nSeqNo == pFtnIdx->GetSeqRefNo() )
+            for( auto pFootnoteIdx : pDoc->GetFootnoteIdxs() )
+                if( nSeqNo == pFootnoteIdx->GetSeqRefNo() )
                 {
-                    SwNodeIndex* pIdx = pFtnIdx->GetStartNode();
+                    SwNodeIndex* pIdx = pFootnoteIdx->GetStartNode();
                     if( pIdx )
                     {
                         SwNodeIndex aIdx( *pIdx, 1 );
-                        if( 0 == ( pTxtNd = aIdx.GetNode().GetTxtNode()))
-                            pTxtNd = static_cast<SwTxtNode*>(pDoc->GetNodes().GoNext( &aIdx ));
+                        if( 0 == ( pTextNd = aIdx.GetNode().GetTextNode()))
+                            pTextNd = static_cast<SwTextNode*>(pDoc->GetNodes().GoNext( &aIdx ));
                     }
                     *pStt = 0;
                     if( pEnd )
@@ -915,7 +915,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
         break;
     }
 
-    return pTxtNd;
+    return pTextNd;
 }
 
 struct _RefIdsMap
@@ -936,7 +936,7 @@ private:
 public:
     _RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false ) {}
 
-    void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld, bool bField );
+    void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool bField );
 
     OUString GetName() { return aName; }
 };
@@ -948,17 +948,17 @@ typedef boost::ptr_vector<_RefIdsMap> _RefIdsMaps;
 /// @param[in,out] rIds The list of IDs found in the document.
 void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 {
-    SwFieldType *const pType = rDoc.getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, aName, false);
+    SwFieldType *const pType = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, aName, false);
 
     if (!pType)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-    for (SwFmtFld const* pF = aIter.First(); pF; pF = aIter.Next())
+    SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+    for (SwFormatField const* pF = aIter.First(); pF; pF = aIter.Next())
     {
-        if (pF->GetTxtFld())
+        if (pF->GetTextField())
         {
-            SwTxtNode const*const pNd = pF->GetTxtFld()->GetpTxtNode();
+            SwTextNode const*const pNd = pF->GetTextField()->GetpTextNode();
             if (pNd && pNd->GetNodes().IsDocNodes())
             {
                 rIds.insert(static_cast<SwSetExpField const*>(pF->GetField())
@@ -973,8 +973,8 @@ void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 /// @param[in,out] rIds The list of IDs found in the document.
 void _RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 {
-    for( auto n = rDoc.GetFtnIdxs().size(); n; )
-        rIds.insert( rDoc.GetFtnIdxs()[ --n ]->GetSeqRefNo() );
+    for( auto n = rDoc.GetFootnoteIdxs().size(); n; )
+        rIds.insert( rDoc.GetFootnoteIdxs()[ --n ]->GetSeqRefNo() );
 }
 
 /// Initialise the aIds and aDestIds collections from the source documents.
@@ -996,12 +996,12 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
             AddId( GetFirstUnusedId(aIds), *pIt );
 
         // Change the Sequence number of all SetExp fields in the source document
-        SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFldType( RES_SETEXPFLD, aName, false );
+        SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFieldType( RES_SETEXPFLD, aName, false );
         if( pType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-            for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-                if( pF->GetTxtFld() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+            for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
+                if( pF->GetTextField() )
                 {
                     SwSetExpField *const pSetExp(
                             static_cast<SwSetExpField *>(pF->GetField()));
@@ -1019,10 +1019,10 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
             AddId( GetFirstUnusedId(aIds), *pIt );
 
         // Change the footnotes/endnotes in the source doc to the new ID
-        for ( const auto pFtnIdx : rDoc.GetFtnIdxs() )
+        for ( const auto pFootnoteIdx : rDoc.GetFootnoteIdxs() )
         {
-            sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
-            pFtnIdx->SetSeqNo(sequencedIds[n]);
+            sal_uInt16 const n = pFootnoteIdx->GetSeqRefNo();
+            pFootnoteIdx->SetSeqNo(sequencedIds[n]);
         }
     }
     bInit = true;
@@ -1056,12 +1056,12 @@ void _RefIdsMap::AddId( sal_uInt16 id, sal_uInt16 seqNum )
     sequencedIds[ seqNum ] = id;
 }
 
-void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
+void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField,
                         bool bField )
 {
     Init( rDoc, rDestDoc, bField);
 
-    sal_uInt16 const nSeqNo = rFld.GetSeqNo();
+    sal_uInt16 const nSeqNo = rField.GetSeqNo();
 
     // check if it needs to be remapped
     // if sequencedIds doesn't contain the number, it means there is no
@@ -1070,7 +1070,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
     // (and if it is not the same document, there's no "correct" result anyway)
     if (sequencedIds.count(nSeqNo))
     {
-        rFld.SetSeqNo( sequencedIds[nSeqNo] );
+        rField.SetSeqNo( sequencedIds[nSeqNo] );
     }
 }
 
@@ -1089,45 +1089,45 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
         {
             // when copying _to_ clipboard, expectation is that no fields exist
             // so no re-mapping is required to avoid collisions
-            assert(!rDestDoc.getIDocumentFieldsAccess().GetSysFldType(RES_GETREFFLD)->HasWriterListeners());
+            assert(!rDestDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_GETREFFLD)->HasWriterListeners());
             return; // don't modify the fields in the source doc
         }
 
         // then there are RefFields in the DescDox - so all RefFields in the SourceDoc
         // need to be converted to have unique IDs for both documents
         _RefIdsMap aFntMap( aEmptyOUStr );
-        _RefIdsMaps aFldMap;
+        _RefIdsMaps aFieldMap;
 
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-        for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
+        for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
         {
-            SwGetRefField& rRefFld = *static_cast<SwGetRefField*>(pFld->GetField());
-            switch( rRefFld.GetSubType() )
+            SwGetRefField& rRefField = *static_cast<SwGetRefField*>(pField->GetField());
+            switch( rRefField.GetSubType() )
             {
             case REF_SEQUENCEFLD:
                 {
                     _RefIdsMap* pMap = 0;
-                    for( auto n = aFldMap.size(); n; )
+                    for( auto n = aFieldMap.size(); n; )
                     {
-                        if( aFldMap[ --n ].GetName()==rRefFld.GetSetRefName() )
+                        if( aFieldMap[ --n ].GetName()==rRefField.GetSetRefName() )
                         {
-                            pMap = &aFldMap[ n ];
+                            pMap = &aFieldMap[ n ];
                             break;
                         }
                     }
                     if( !pMap )
                     {
-                        pMap = new _RefIdsMap( rRefFld.GetSetRefName() );
-                        aFldMap.push_back( pMap );
+                        pMap = new _RefIdsMap( rRefField.GetSetRefName() );
+                        aFieldMap.push_back( pMap );
                     }
 
-                    pMap->Check( *pDoc, rDestDoc, rRefFld, true );
+                    pMap->Check( *pDoc, rDestDoc, rRefField, true );
                 }
                 break;
 
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
-                aFntMap.Check( *pDoc, rDestDoc, rRefFld, false );
+                aFntMap.Check( *pDoc, rDestDoc, rRefField, false );
                 break;
             }
         }
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index b993fd84eabc..1aa3992539fd 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -30,38 +30,38 @@
 
 using namespace ::com::sun::star;
 
-SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr)
+SwTableFieldType::SwTableFieldType(SwDoc* pDocPtr)
     : SwValueFieldType( pDocPtr, RES_TABLEFLD )
 {}
 
-SwFieldType* SwTblFieldType::Copy() const
+SwFieldType* SwTableFieldType::Copy() const
 {
-    return new SwTblFieldType(GetDoc());
+    return new SwTableFieldType(GetDoc());
 }
 
-void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
+void SwTableField::CalcField( SwTableCalcPara& rCalcPara )
 {
     if( rCalcPara.rCalc.IsCalcError() ) // stop if there is already an error set
         return;
 
     // create pointers from box name
-    BoxNmToPtr( rCalcPara.pTbl );
-    OUString sFml( MakeFormula( rCalcPara ));
-    SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
+    BoxNmToPtr( rCalcPara.pTable );
+    OUString sFormula( MakeFormula( rCalcPara ));
+    SetValue( rCalcPara.rCalc.Calculate( sFormula ).GetDouble() );
     ChgValid( !rCalcPara.IsStackOverflow() ); // is the value again valid?
 }
 
-SwTblField::SwTblField( SwTblFieldType* pInitType, const OUString& rFormel,
-                        sal_uInt16 nType, sal_uLong nFmt )
-    : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ),
+SwTableField::SwTableField( SwTableFieldType* pInitType, const OUString& rFormel,
+                        sal_uInt16 nType, sal_uLong nFormat )
+    : SwValueField( pInitType, nFormat ), SwTableFormula( rFormel ),
     nSubType(nType)
 {
     sExpand = "0";
 }
 
-SwField* SwTblField::Copy() const
+SwField* SwTableField::Copy() const
 {
-    SwTblField* pTmp = new SwTblField( static_cast<SwTblFieldType*>(GetTyp()),
+    SwTableField* pTmp = new SwTableField( static_cast<SwTableFieldType*>(GetTyp()),
                                         SwTableFormula::GetFormula(), nSubType, GetFormat() );
     pTmp->sExpand     = sExpand;
     pTmp->SwValueField::SetValue(GetValue());
@@ -70,33 +70,33 @@ SwField* SwTblField::Copy() const
     return pTmp;
 }
 
-OUString SwTblField::GetFieldName() const
+OUString SwTableField::GetFieldName() const
 {
-    return GetTyp()->GetName() + " " + const_cast<SwTblField *>(this)->GetCommand();
+    return GetTyp()->GetName() + " " + const_cast<SwTableField *>(this)->GetCommand();
 }
 
 /// search TextNode containing this field
-const SwNode* SwTblField::GetNodeOfFormula() const
+const SwNode* SwTableField::GetNodeOfFormula() const
 {
     if( !GetTyp()->HasWriterListeners() )
         return 0;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
-            if( this == pFmtFld->GetField() )
-                return &pFmtFld->GetTxtFld()->GetTxtNode();
+    SwIterator<SwFormatField,SwFieldType> aIter( *GetTyp() );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+            if( this == pFormatField->GetField() )
+                return &pFormatField->GetTextField()->GetTextNode();
     return 0;
 }
 
-OUString SwTblField::GetCommand()
+OUString SwTableField::GetCommand()
 {
     if (EXTRNL_NAME != GetNameType())
     {
         SwNode const*const pNd = GetNodeOfFormula();
-        SwTableNode const*const pTblNd = (pNd) ? pNd->FindTableNode() : 0;
-        if (pTblNd)
+        SwTableNode const*const pTableNd = (pNd) ? pNd->FindTableNode() : 0;
+        if (pTableNd)
         {
-            PtrToBoxNm( &pTblNd->GetTable() );
+            PtrToBoxNm( &pTableNd->GetTable() );
         }
     }
     return (EXTRNL_NAME == GetNameType())
@@ -104,11 +104,11 @@ OUString SwTblField::GetCommand()
         : OUString();
 }
 
-OUString SwTblField::Expand() const
+OUString SwTableField::Expand() const
 {
     if (nSubType & nsSwExtendedSubType::SUB_CMD)
     {
-        return const_cast<SwTblField *>(this)->GetCommand();
+        return const_cast<SwTableField *>(this)->GetCommand();
     }
 
     if(nSubType & nsSwGetSetExpType::GSE_STRING)
@@ -120,33 +120,33 @@ OUString SwTblField::Expand() const
     return sExpand;
 }
 
-sal_uInt16 SwTblField::GetSubType() const
+sal_uInt16 SwTableField::GetSubType() const
 {
     return nSubType;
 }
 
-void SwTblField::SetSubType(sal_uInt16 nType)
+void SwTableField::SetSubType(sal_uInt16 nType)
 {
     nSubType = nType;
 }
 
-void SwTblField::SetValue( const double& rVal )
+void SwTableField::SetValue( const double& rVal )
 {
     SwValueField::SetValue(rVal);
     sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, GetFormat(), GetLanguage());
 }
 
-OUString SwTblField::GetPar2() const
+OUString SwTableField::GetPar2() const
 {
     return SwTableFormula::GetFormula();
 }
 
-void SwTblField::SetPar2(const OUString& rStr)
+void SwTableField::SetPar2(const OUString& rStr)
 {
     SetFormula( rStr );
 }
 
-bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
+bool SwTableField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
 {
     bool bRet = true;
     switch ( nWhichId )
@@ -154,7 +154,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     case FIELD_PROP_PAR2:
         {
             sal_uInt16 nOldSubType = nSubType;
-            SwTblField* pThis = const_cast<SwTblField*>(this);
+            SwTableField* pThis = const_cast<SwTableField*>(this);
             pThis->nSubType |= nsSwExtendedSubType::SUB_CMD;
             rAny <<= Expand();
             pThis->nSubType = nOldSubType;
@@ -175,7 +175,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     return bRet;
 }
 
-bool SwTblField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
+bool SwTableField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 {
     bool bRet = true;
     switch ( nWhichId )
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index b8aad8a1b1f0..467d0e90fe56 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star;
 
 // Userfields
 
-SwUserField::SwUserField(SwUserFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFmt)
-    : SwValueField(pTyp, nFmt),
+SwUserField::SwUserField(SwUserFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFormat)
+    : SwValueField(pTyp, nFormat),
     nSubType(nSub)
 {
 }
@@ -163,12 +163,12 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const OUString& aNam )
         EnableFormat(false);    // Do not use a Numberformatter
 }
 
-OUString SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng)
+OUString SwUserFieldType::Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng)
 {
     if((nType & nsSwGetSetExpType::GSE_EXPR) && !(nSubType & nsSwExtendedSubType::SUB_CMD))
     {
         EnableFormat(true);
-        return ExpandValue(nValue, nFmt, nLng);
+        return ExpandValue(nValue, nFormat, nLng);
     }
 
     EnableFormat(false);    // Do not use a Numberformatter
@@ -203,7 +203,7 @@ void SwUserFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     if ( !IsModifyLocked() )
     {
         LockModify();
-        GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )->UpdateFlds();
+        GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_INPUTFLD )->UpdateFields();
         UnlockModify();
     }
 }
@@ -229,38 +229,38 @@ double SwUserFieldType::GetValue( SwCalc& rCalc )
     return nValue;
 }
 
-OUString SwUserFieldType::GetContent( sal_uInt32 nFmt )
+OUString SwUserFieldType::GetContent( sal_uInt32 nFormat )
 {
-    if (nFmt && nFmt != SAL_MAX_UINT32)
+    if (nFormat && nFormat != SAL_MAX_UINT32)
     {
         OUString sFormattedValue;
         Color* pCol = 0;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        pFormatter->GetOutputString(GetValue(), nFmt, sFormattedValue, &pCol);
+        pFormatter->GetOutputString(GetValue(), nFormat, sFormattedValue, &pCol);
         return sFormattedValue;
     }
 
     return aContent;
 }
 
-void SwUserFieldType::SetContent( const OUString& rStr, sal_uInt32 nFmt )
+void SwUserFieldType::SetContent( const OUString& rStr, sal_uInt32 nFormat )
 {
     if( aContent != rStr )
     {
         aContent = rStr;
 
-        if (nFmt && nFmt != SAL_MAX_UINT32)
+        if (nFormat && nFormat != SAL_MAX_UINT32)
         {
             double fValue;
 
             SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-            if (pFormatter->IsNumberFormat(rStr, nFmt, fValue))
+            if (pFormatter->IsNumberFormat(rStr, nFormat, fValue))
             {
                 SetValue(fValue);
-                aContent = DoubleToString(fValue, nFmt);
+                aContent = DoubleToString(fValue, nFormat);
             }
         }
 
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 5611070ea26e..ef1a64a1de3b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -82,7 +82,7 @@
 using namespace ::com::sun::star;
 
 // Copy for the internal clipboard. Copies all selections to the clipboard.
-bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
+bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
 {
     OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument"  );
 
@@ -90,35 +90,35 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
 
     // delete content if ClpDocument contains content
     SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
-    SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-    if (!pTxtNd || !pTxtNd->GetTxt().isEmpty() ||
+    SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
+    if (!pTextNd || !pTextNd->GetText().isEmpty() ||
         aSttIdx.GetIndex()+1 != pClpDoc->GetNodes().GetEndOfContent().GetIndex() )
     {
         pClpDoc->GetNodes().Delete( aSttIdx,
             pClpDoc->GetNodes().GetEndOfContent().GetIndex() - aSttIdx.GetIndex() );
-        pTxtNd = pClpDoc->GetNodes().MakeTxtNode( aSttIdx,
-                            pClpDoc->GetDfltTxtFmtColl() );
+        pTextNd = pClpDoc->GetNodes().MakeTextNode( aSttIdx,
+                            pClpDoc->GetDfltTextFormatColl() );
         --aSttIdx;
     }
 
     // also delete surrounding FlyFrames if any
-    for( auto pFmt : *pClpDoc->GetSpzFrmFmts() )
+    for( auto pFormat : *pClpDoc->GetSpzFrameFormats() )
     {
-        SwFlyFrmFmt* pFly = static_cast<SwFlyFrmFmt*>(pFmt);
-        pClpDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+        SwFlyFrameFormat* pFly = static_cast<SwFlyFrameFormat*>(pFormat);
+        pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
     }
     pClpDoc->GetDocumentFieldsManager().GCFieldTypes();        // delete the FieldTypes
 
     // if a string was passed, copy it to the clipboard-
     // document. Then also the Calculator can use the internal
     // clipboard
-    if( pNewClpTxt )
+    if( pNewClpText )
     {
-        pTxtNd->InsertText( *pNewClpTxt, SwIndex( pTxtNd ) );
+        pTextNd->InsertText( *pNewClpText, SwIndex( pTextNd ) );
         return true;                // das wars.
     }
 
-    pClpDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pClpDoc->getIDocumentFieldsAccess().LockExpFields();
     pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES );
     bool bRet;
 
@@ -127,8 +127,8 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
     {
         // get the FlyFormat
         SwFlyFrm* pFly = FindFlyFrm();
-        SwFrmFmt* pFlyFmt = pFly->GetFmt();
-        SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() );
+        SwFrameFormat* pFlyFormat = pFly->GetFormat();
+        SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
 
         if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
             (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
@@ -138,22 +138,22 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             SwPosition aPos( aSttIdx );
             if ( FLY_AS_CHAR == aAnchor.GetAnchorId() )
             {
-                aPos.nContent.Assign( pTxtNd, 0 );
+                aPos.nContent.Assign( pTextNd, 0 );
             }
             aAnchor.SetAnchor( &aPos );
         }
-        pFlyFmt = pClpDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFlyFmt, aAnchor, true, true );
+        pFlyFormat = pClpDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFlyFormat, aAnchor, true, true );
 
-       // assure the "RootFmt" is the first element in Spz-Array
+       // assure the "RootFormat" is the first element in Spz-Array
         // (if necessary Flys were copied in Flys)
-        SwFrmFmts& rSpzFrmFmts = *pClpDoc->GetSpzFrmFmts();
-        if( rSpzFrmFmts[ 0 ] != pFlyFmt )
+        SwFrameFormats& rSpzFrameFormats = *pClpDoc->GetSpzFrameFormats();
+        if( rSpzFrameFormats[ 0 ] != pFlyFormat )
         {
-            SwFrmFmts::iterator it = std::find( rSpzFrmFmts.begin(), rSpzFrmFmts.end(), pFlyFmt );
-            OSL_ENSURE( it != rSpzFrmFmts.end(), "Fly not contained in Spz-Array" );
+            SwFrameFormats::iterator it = std::find( rSpzFrameFormats.begin(), rSpzFrameFormats.end(), pFlyFormat );
+            OSL_ENSURE( it != rSpzFrameFormats.end(), "Fly not contained in Spz-Array" );
 
-            rSpzFrmFmts.erase( it );
-            rSpzFrmFmts.insert( rSpzFrmFmts.begin(), pFlyFmt );
+            rSpzFrameFormats.erase( it );
+            rSpzFrameFormats.insert( rSpzFrameFormats.begin(), pFlyFormat );
         }
 
         if ( FLY_AS_CHAR == aAnchor.GetAnchorId() )
@@ -162,21 +162,21 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             //              clipboard, it should be found at pasting. Therefore
             //              the copied TextAttribut should be removed in the node
             //              otherwise it will be recognised as TextSelektion
-            const SwIndex& rIdx = pFlyFmt->GetAnchor().GetCntntAnchor()->nContent;
-            SwTxtFlyCnt *const pTxtFly = static_cast<SwTxtFlyCnt *>(
-                pTxtNd->GetTxtAttrForCharAt(
+            const SwIndex& rIdx = pFlyFormat->GetAnchor().GetContentAnchor()->nContent;
+            SwTextFlyCnt *const pTextFly = static_cast<SwTextFlyCnt *>(
+                pTextNd->GetTextAttrForCharAt(
                     rIdx.GetIndex(), RES_TXTATR_FLYCNT));
-            if( pTxtFly )
+            if( pTextFly )
             {
-                const_cast<SwFmtFlyCnt&>(pTxtFly->GetFlyCnt()).SetFlyFmt( 0 );
-                pTxtNd->EraseText( rIdx, 1 );
+                const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat( 0 );
+                pTextNd->EraseText( rIdx, 1 );
             }
         }
         bRet = true;
     }
     else if ( IsObjSelected() )
     {
-        SwPosition aPos( aSttIdx, SwIndex( pTxtNd, 0 ));
+        SwPosition aPos( aSttIdx, SwIndex( pTextNd, 0 ));
         const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
         for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
         {
@@ -185,9 +185,9 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             if( Imp()->GetDrawView()->IsGroupEntered() ||
                 ( !pObj->GetUserCall() && pObj->GetUpGroup()) )
             {
-                SfxItemSet aSet( pClpDoc->GetAttrPool(), aFrmFmtSetRange );
+                SfxItemSet aSet( pClpDoc->GetAttrPool(), aFrameFormatSetRange );
 
-                SwFmtAnchor aAnchor( FLY_AT_PARA );
+                SwFormatAnchor aAnchor( FLY_AT_PARA );
                 aAnchor.SetAnchor( &aPos );
                 aSet.Put( aAnchor );
 
@@ -200,8 +200,8 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             else
             {
                 SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
-                SwFrmFmt *pFmt = pContact->GetFmt();
-                SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+                SwFrameFormat *pFormat = pContact->GetFormat();
+                SwFormatAnchor aAnchor( pFormat->GetAnchor() );
                 if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
                     (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
                     (FLY_AT_FLY  == aAnchor.GetAnchorId()) ||
@@ -210,7 +210,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
                     aAnchor.SetAnchor( &aPos );
                 }
 
-                pClpDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, true, true );
+                pClpDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, true, true );
             }
         }
         bRet = true;
@@ -219,9 +219,9 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
         bRet = _CopySelToDoc( pClpDoc, 0 );     // copy the selections
 
     pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 );
-    pClpDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pClpDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pClpDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pClpDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pClpDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pClpDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     return bRet;
 }
@@ -231,8 +231,8 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
     const SwFrm *pF = pFrm;
     while ( pF && !pF->Frm().IsInside( rPt ) )
     {
-        if ( pF->IsCntntFrm() )
-            pF = static_cast<const SwCntntFrm*>(pF)->GetFollow();
+        if ( pF->IsContentFrm() )
+            pF = static_cast<const SwContentFrm*>(pF)->GetFollow();
         else
             pF = 0;
     }
@@ -243,12 +243,12 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
 }
 
 static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
-                const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor,
+                const Point& rInsPt, SwFEShell& rDestShell, SwFormatAnchor& rAnchor,
                 Point& rNewPos, bool bCheckFlyRecur )
 {
     bool bRet = true;
     rAnchor.SetAnchor( &rPos );
-    SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, false );
+    SwContentFrm* pTmpFrm = rNd.GetContentNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, false );
     SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm();
     if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) )
     {
@@ -258,7 +258,7 @@ static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm*
     {
         if( pTmpFly )
         {
-            const SwNodeIndex& rIdx = *pTmpFly->GetFmt()->GetCntnt().GetCntntIdx();
+            const SwNodeIndex& rIdx = *pTmpFly->GetFormat()->GetContent().GetContentIdx();
             SwPosition aPos( rIdx );
             rAnchor.SetAnchor( &aPos );
             rNewPos = pTmpFly->Frm().Pos();
@@ -302,10 +302,10 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
         SdrObject *pObj = aMrkList.GetMark( i )->GetMarkedSdrObj();
 
         SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
-        SwFrmFmt *pFmt = pContact->GetFmt();
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+        SwFrameFormat *pFormat = pContact->GetFormat();
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
 
-        bool bInsWithFmt = true;
+        bool bInsWithFormat = true;
 
         if( pDestDrwView->IsGroupEntered() )
         {
@@ -319,13 +319,13 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                                         GetDoc() == pDestDoc, false );
                 pNew->NbcMove( aSiz );
                 pDestDrwView->InsertObjectAtView( pNew, *pDestPgView );
-                bInsWithFmt = false;
+                bInsWithFormat = false;
             }
         }
 
-        if( bInsWithFmt )
+        if( bInsWithFormat )
         {
-            SwFmtAnchor aAnchor( rAnchor );
+            SwFormatAnchor aAnchor( rAnchor );
             Point aNewAnch;
 
             if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
@@ -343,7 +343,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                     SwCrsrMoveState aState( MV_SETONLYTEXT );
                     GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                     const SwNode *pNd;
-                    if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
+                    if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
                         bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( aPos, *pNd, 0, rInsPt,
@@ -352,7 +352,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 else
                 {
                     SwPaM *pCrsr = pDestShell->GetCrsr();
-                    if( pCrsr->GetNode().IsNoTxtNode() )
+                    if( pCrsr->GetNode().IsNoTextNode() )
                         bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(),
@@ -375,19 +375,19 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 if( pSrcDrwView->IsGroupEntered() ||
                     ( !pObj->GetUserCall() && pObj->GetUpGroup()) )
                 {
-                    SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrmFmtSetRange);
+                    SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrameFormatSetRange);
                     aSet.Put( aAnchor );
                     SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
                                                 GetDoc() == pDestDoc, true );
-                    pFmt = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
+                    pFormat = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
                 }
                 else
-                    pFmt = pDestDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, true, true );
+                    pFormat = pDestDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, true, true );
 
                 // Can be 0, as Draws are not allowed in Headers/Footers
-                if ( pFmt )
+                if ( pFormat )
                 {
-                    SdrObject* pNew = pFmt->FindSdrObject();
+                    SdrObject* pNew = pFormat->FindSdrObject();
                     if ( FLY_AS_CHAR != aAnchor.GetAnchorId() )
                     {
                         Point aPos( rInsPt );
@@ -395,13 +395,13 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                         aPos -= rSttPt - pObj->GetSnapRect().TopLeft();
                         // OD 2004-04-05 #i26791# - change attributes instead of
                         // direct positioning
-                        pFmt->SetFmtAttr( SwFmtHoriOrient( aPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-                        pFmt->SetFmtAttr( SwFmtVertOrient( aPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+                        pFormat->SetFormatAttr( SwFormatHoriOrient( aPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+                        pFormat->SetFormatAttr( SwFormatVertOrient( aPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
                         // #i47455# - notify draw frame format
                         // that position attributes are already set.
-                        if ( pFmt->ISA(SwDrawFrmFmt) )
+                        if ( pFormat->ISA(SwDrawFrameFormat) )
                         {
-                            static_cast<SwDrawFrmFmt*>(pFmt)->PosAttrSet();
+                            static_cast<SwDrawFrameFormat*>(pFormat)->PosAttrSet();
                         }
                     }
                     if( bSelectInsert )
@@ -449,7 +449,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     SET_CURR_SHELL( pDestShell );
 
     pDestShell->StartAllAction();
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 
     // Shift references
     bool bCopyIsMove = mpDoc->IsCopyIsMove();
@@ -463,13 +463,13 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     // If there are table formulas in the area, then display the table first
     // so that the table formula can calculate a new value first
     // (individual boxes in the area are retrieved via the layout)
-     SwFieldType* pTblFldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_TABLEFLD );
+     SwFieldType* pTableFieldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_TABLEFLD );
 
     if( IsFrmSelected() )
     {
         SwFlyFrm* pFly = FindFlyFrm();
-        SwFrmFmt* pFlyFmt = pFly->GetFmt();
-        SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() );
+        SwFrameFormat* pFlyFormat = pFly->GetFormat();
+        SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
         bRet = true;
         Point aNewAnch;
 
@@ -488,12 +488,12 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 SwCrsrMoveState aState( MV_SETONLYTEXT );
                 GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                 const SwNode *pNd;
-                if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
+                if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
                     bRet = false;
                 else
                 {
                     // do not copy in itself
-                    const SwNodeIndex *pTmp = pFlyFmt->GetCntnt().GetCntntIdx();
+                    const SwNodeIndex *pTmp = pFlyFormat->GetContent().GetContentIdx();
                     if ( aPos.nNode > *pTmp && aPos.nNode <
                         pTmp->GetNode().EndOfSectionIndex() )
                     {
@@ -507,7 +507,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             else
             {
                 const SwPaM *pCrsr = pDestShell->GetCrsr();
-                if( pCrsr->GetNode().IsNoTxtNode() )
+                if( pCrsr->GetNode().IsNoTextNode() )
                     bRet = false;
                 else
                     bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), pCrsr->GetNode(),
@@ -529,27 +529,27 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
 
         if( bRet )
         {
-            SwFrmFmt *pOldFmt = pFlyFmt;
-            pFlyFmt = pDestShell->GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pFlyFmt, aAnchor, true, true );
+            SwFrameFormat *pOldFormat = pFlyFormat;
+            pFlyFormat = pDestShell->GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pFlyFormat, aAnchor, true, true );
 
             if ( FLY_AS_CHAR != aAnchor.GetAnchorId() )
             {
                 Point aPos( rInsPt );
                 aPos -= aNewAnch;
                 aPos -= rSttPt - pFly->Frm().Pos();
-                pFlyFmt->SetFmtAttr( SwFmtHoriOrient( aPos.getX(),text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-                pFlyFmt->SetFmtAttr( SwFmtVertOrient( aPos.getY(),text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+                pFlyFormat->SetFormatAttr( SwFormatHoriOrient( aPos.getX(),text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+                pFlyFormat->SetFormatAttr( SwFormatVertOrient( aPos.getY(),text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
             }
 
             const Point aPt( pDestShell->GetCrsrDocPos() );
 
             if( bIsMove )
-                GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pOldFmt );
+                GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pOldFormat );
 
             // only select if it can be shifted/copied in the same shell
             if( bSelectInsert )
             {
-                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrmFmt*>(pFlyFmt)->GetFrm( &aPt, false );
+                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aPt, false );
                 if( pFlyFrm )
                 {
                     //JP 12.05.98: should this be in SelectFlyFrm???
@@ -571,11 +571,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
         // Sizes will be corrected by percentage.
 
         // find boxes via the layout
-        const SwTableNode* pTblNd;
+        const SwTableNode* pTableNd;
         SwSelBoxes aBoxes;
-        GetTblSel( *this, aBoxes );
+        GetTableSel( *this, aBoxes );
         if( !aBoxes.empty() &&
-            0 != (pTblNd = aBoxes[0]->GetSttNd()->FindTableNode()) )
+            0 != (pTableNd = aBoxes[0]->GetSttNd()->FindTableNode()) )
         {
             SwPosition* pDstPos = 0;
             if( this == pDestShell )
@@ -585,10 +585,10 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 pDstPos = new SwPosition( *GetCrsr()->GetPoint() );
                 Point aPt( rInsPt );
                 GetLayout()->GetCrsrOfst( pDstPos, aPt );
-                if( !pDstPos->nNode.GetNode().IsNoTxtNode() )
+                if( !pDstPos->nNode.GetNode().IsNoTextNode() )
                     bRet = true;
             }
-            else if( !pDestShell->GetCrsr()->GetNode().IsNoTxtNode() )
+            else if( !pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
             {
                 pDstPos = new SwPosition( *pDestShell->GetCrsr()->GetPoint() );
                 bRet = true;
@@ -597,11 +597,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             if( bRet )
             {
                 if( GetDoc() == pDestShell->GetDoc() )
-                    ParkTblCrsr();
+                    ParkTableCrsr();
 
-                bRet = pDestShell->GetDoc()->InsCopyOfTbl( *pDstPos, aBoxes,0,
+                bRet = pDestShell->GetDoc()->InsCopyOfTable( *pDstPos, aBoxes,0,
                                         bIsMove && this == pDestShell &&
-                                        aBoxes.size() == pTblNd->GetTable().
+                                        aBoxes.size() == pTableNd->GetTable().
                                         GetTabSortBoxes().size(),
                                         this != pDestShell );
 
@@ -630,9 +630,9 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             SwPosition aPos( *GetCrsr()->GetPoint() );
             Point aPt( rInsPt );
             GetLayout()->GetCrsrOfst( &aPos, aPt );
-            bRet = !aPos.nNode.GetNode().IsNoTxtNode();
+            bRet = !aPos.nNode.GetNode().IsNoTextNode();
         }
-        else if( pDestShell->GetCrsr()->GetNode().IsNoTxtNode() )
+        else if( pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
             bRet = false;
 
         if( bRet )
@@ -643,7 +643,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     mpDoc->SetCopyIsMove( bCopyIsMove );
 
     // have new table formules been inserted?
-    if( pTblFldTyp->HasWriterListeners() )
+    if( pTableFieldTyp->HasWriterListeners() )
     {
         // finish old actions: the table frames are created and
         // a selection can be made
@@ -654,8 +654,8 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
         for( ; nActCnt; --nActCnt )
             pDestShell->StartAllAction();
     }
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
 
     pDestShell->EndAllAction();
     return bRet;
@@ -681,12 +681,12 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     // If there are table formulas in the area, then display the table first
     // so that the table formula can calculate a new value first
     // (individual boxes in the area are retrieved via the layout)
-    SwFieldType* pTblFldTyp = GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_TABLEFLD );
+    SwFieldType* pTableFieldTyp = GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_TABLEFLD );
 
     SwTableNode *pDestNd, *pSrcNd = aCpyPam.GetNode().GetTableNode();
     if( !pSrcNd )                               // TabellenNode ?
     {                                           // nicht ueberspringen!!
-        SwCntntNode* pCNd = aCpyPam.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aCpyPam.GetNode().GetContentNode();
         if( pCNd )
             aCpyPam.GetPoint()->nContent.Assign( pCNd, 0 );
         else if( !aCpyPam.Move( fnMoveForward, fnGoNode ))
@@ -699,7 +699,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     bool bRet = true;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 
     // When the clipboard content has been created by a rectangular selection
     // the pasting is more sophisticated:
@@ -737,8 +737,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
         while( nCount )
         {
             --nCount;
-            OSL_ENSURE( aIdx.GetNode().GetCntntNode(), "Who filled the clipboard?!" );
-            if( aIdx.GetNode().GetCntntNode() ) // robust
+            OSL_ENSURE( aIdx.GetNode().GetContentNode(), "Who filled the clipboard?!" );
+            if( aIdx.GetNode().GetContentNode() ) // robust
             {
                 Insertion aInsertion( PaMPtr( new SwPaM( aIdx ) ),
                     PositionPtr( new SwPosition( aInsertPos ) ) );
@@ -769,7 +769,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     aInsertion.first->GetPoint()->nNode = aIdx;
                 else
                     aInsertion.first->GetPoint()->nContent =
-                        aInsertion.first->GetCntntNode()->Len();
+                        aInsertion.first->GetContentNode()->Len();
                 aCopyList.push_back( aInsertion );
             }
             // If there are no text portions left but there are some more
@@ -806,19 +806,19 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
                 }
             }
-            SaveTblBoxCntnt( &rInsPos );
+            SaveTableBoxContent( &rInsPos );
             ++pCurr;
         }
     }
     else
     {
-        bool bDelTbl = true;
+        bool bDelTable = true;
 
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
         {
 
             if( pSrcNd &&
-                0 != ( pDestNd = GetDoc()->IsIdxInTbl( rPaM.GetPoint()->nNode )) &&
+                0 != ( pDestNd = GetDoc()->IsIdxInTable( rPaM.GetPoint()->nNode )) &&
                 // are we at the beginning of the cell? (if not, we will insert a nested table)
                 // first paragraph of the cell?
                 rPaM.GetNode().GetIndex() == rPaM.GetNode().FindTableBoxStartNode()->GetIndex()+1 &&
@@ -827,7 +827,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
             {
                 SwPosition aDestPos( *rPaM.GetPoint() );
 
-                bool bParkTblCrsr = false;
+                bool bParkTableCrsr = false;
                 const SwStartNode* pSttNd =  rPaM.GetNode().FindTableBoxStartNode();
 
                 // TABLE IN TABLE: copy table in table
@@ -835,71 +835,71 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                 SwSelBoxes aBoxes;
                 if( IsTableMode() )     // table selection?
                 {
-                    GetTblSel( *this, aBoxes );
-                    ParkTblCrsr();
-                    bParkTblCrsr = true;
+                    GetTableSel( *this, aBoxes );
+                    ParkTableCrsr();
+                    bParkTableCrsr = true;
                 }
                 else if( !rPaM.HasMark() && rPaM.GetNext() == &rPaM &&
-                     ( !pSrcNd->GetTable().IsTblComplex() ||
+                     ( !pSrcNd->GetTable().IsTableComplex() ||
                        pDestNd->GetTable().IsNewModel() ) )
                 {
                     // make relative table copy
-                    SwTableBox* pBox = pDestNd->GetTable().GetTblBox(
+                    SwTableBox* pBox = pDestNd->GetTable().GetTableBox(
                                         pSttNd->GetIndex() );
                     OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
                     aBoxes.insert( pBox );
                 }
 
                 SwNodeIndex aNdIdx( *pDestNd->EndOfSectionNode());
-                if( !bParkTblCrsr )
+                if( !bParkTableCrsr )
                 {
                     // exit first the complete table
                     // ???? what about only table in a frame ?????
-                    SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
+                    SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
                     SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
                     // #i59539: Don't remove all redline
                     SwPaM const tmpPaM(*pDestNd, *pDestNd->EndOfSectionNode());
                     ::PaMCorrAbs(tmpPaM, aPos);
                 }
 
-                bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, &pSrcNd->GetTable(),
+                bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable(),
                                             false, false );
 
-                if( bParkTblCrsr )
+                if( bParkTableCrsr )
                     GetCrsr();
                 else
                 {
                     // return to the box
                     aNdIdx = *pSttNd;
-                    SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
+                    SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
                     SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
                     // #i59539: Don't remove all redline
                     SwNode & rNode(rPaM.GetPoint()->nNode.GetNode());
-                    SwCntntNode *const pCntntNode( rNode.GetCntntNode() );
+                    SwContentNode *const pContentNode( rNode.GetContentNode() );
                     SwPaM const tmpPam(rNode, 0,
-                                   rNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                                   rNode, (pContentNode) ? pContentNode->Len() : 0);
                     ::PaMCorrAbs(tmpPam, aPos);
                 }
 
                 break;      // exit the "while-loop"
             }
             else if( *aCpyPam.GetPoint() == *aCpyPam.GetMark() &&
-                 pClpDoc->GetSpzFrmFmts()->size() )
+                 pClpDoc->GetSpzFrameFormats()->size() )
             {
                 // we need a DrawView
                 if( !Imp()->GetDrawView() )
                     MakeDrawView();
 
-                std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pClpDoc);
-                for ( auto pCpyFmt : *pClpDoc->GetSpzFrmFmts() )
+                std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pClpDoc);
+                for ( auto pCpyFormat : *pClpDoc->GetSpzFrameFormats() )
                 {
-                    bool bInsWithFmt = true;
+                    bool bInsWithFormat = true;
 
                     if( Imp()->GetDrawView()->IsGroupEntered() &&
-                        RES_DRAWFRMFMT == pCpyFmt->Which() &&
-                        (FLY_AS_CHAR != pCpyFmt->GetAnchor().GetAnchorId()) )
+                        RES_DRAWFRMFMT == pCpyFormat->Which() &&
+                        (FLY_AS_CHAR != pCpyFormat->GetAnchor().GetAnchorId()) )
                     {
-                        const SdrObject* pSdrObj = pCpyFmt->FindSdrObject();
+                        const SdrObject* pSdrObj = pCpyFormat->FindSdrObject();
                         if( pSdrObj )
                         {
                             SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj,
@@ -938,29 +938,29 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                             pNew->NbcSetAnchorPos( aGrpAnchor );
                             pNew->SetSnapRect( aSnapRect );
 
-                            bInsWithFmt = false;
+                            bInsWithFormat = false;
                         }
                     }
 
-                    if( bInsWithFmt  )
+                    if( bInsWithFormat  )
                     {
-                        SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+                        SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
                         if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
                             (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
                             (FLY_AS_CHAR == aAnchor.GetAnchorId()))
                         {
                             SwPosition* pPos = rPaM.GetPoint();
                             // allow shapes (no controls) in header/footer
-                            if( RES_DRAWFRMFMT == pCpyFmt->Which() &&
+                            if( RES_DRAWFRMFMT == pCpyFormat->Which() &&
                                 GetDoc()->IsInHeaderFooter( pPos->nNode ) )
                             {
-                                const SdrObject *pCpyObj = pCpyFmt->FindSdrObject();
+                                const SdrObject *pCpyObj = pCpyFormat->FindSdrObject();
                                 if (pCpyObj && CheckControlLayer(pCpyObj))
                                     continue;
                             }
 
-                            // Ignore TextBoxes, they are already handled in sw::DocumentLayoutManager::CopyLayoutFmt().
-                            if (aTextBoxes.find(pCpyFmt) != aTextBoxes.end())
+                            // Ignore TextBoxes, they are already handled in sw::DocumentLayoutManager::CopyLayoutFormat().
+                            if (aTextBoxes.find(pCpyFormat) != aTextBoxes.end())
                                 continue;
 
                             aAnchor.SetAnchor( pPos );
@@ -976,14 +976,14 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                                         0, aPt, *this, aAnchor, aPt, false );
                         }
 
-                        SwFrmFmt * pNew = GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+                        SwFrameFormat * pNew = GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
 
                         if( pNew )
                         {
                             if( RES_FLYFRMFMT == pNew->Which() )
                             {
                                 const Point aPt( GetCrsrDocPos() );
-                                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrmFmt*>(pNew)->
+                                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pNew)->
                                                         GetFrm( &aPt, false );
                                 if( pFlyFrm )
                                     SelectFlyFrm( *pFlyFrm, true );
@@ -1006,9 +1006,9 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                                 pDV->MarkObj( pObj, pDV->GetSdrPageView() );
                                 // #i47455# - notify draw frame format
                                 // that position attributes are already set.
-                                if ( pNew->ISA(SwDrawFrmFmt) )
+                                if ( pNew->ISA(SwDrawFrameFormat) )
                                 {
-                                    static_cast<SwDrawFrmFmt*>(pNew)->PosAttrSet();
+                                    static_cast<SwDrawFrameFormat*>(pNew)->PosAttrSet();
                                 }
                             }
                         }
@@ -1017,10 +1017,10 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
             }
             else
             {
-                if( bDelTbl && IsTableMode() )
+                if( bDelTable && IsTableMode() )
                 {
                     SwEditShell::Delete();
-                    bDelTbl = false;
+                    bDelTable = false;
                 }
 
                 SwPosition& rInsPos = *rPaM.GetPoint();
@@ -1064,15 +1064,15 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex();
                         nIdx <= nEndIdx; ++nIdx)
                     {
-                        SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode();
-                        if ( pTxtNode )
+                        SwTextNode *const pTextNode = rDestNodes[nIdx]->GetTextNode();
+                        if ( pTextNode )
                         {
-                            GetDoc()->UpdateParRsid( pTxtNode );
+                            GetDoc()->UpdateParRsid( pTextNode );
                         }
                     }
                 }
 
-                SaveTblBoxCntnt( &rInsPos );
+                SaveTableBoxContent( &rInsPos );
                 if(bIncludingPageFrames && bStartWithTable)
                 {
                     //remove the paragraph in front of the table
@@ -1080,19 +1080,19 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     GetDoc()->getIDocumentContentOperations().DelFullPara(aPara);
                 }
                 //additionally copy page bound frames
-                if( bIncludingPageFrames && pClpDoc->GetSpzFrmFmts()->size() )
+                if( bIncludingPageFrames && pClpDoc->GetSpzFrameFormats()->size() )
                 {
                     // create a draw view if necessary
                     if( !Imp()->GetDrawView() )
                         MakeDrawView();
 
-                    for ( auto pCpyFmt : *pClpDoc->GetSpzFrmFmts() )
+                    for ( auto pCpyFormat : *pClpDoc->GetSpzFrameFormats() )
                     {
-                        SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+                        SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
                         if ( FLY_AT_PAGE != aAnchor.GetAnchorId() )
                             continue;
                         aAnchor.SetPageNum( aAnchor.GetPageNum() + nStartPageNumber - 1 );
-                        GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+                        GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
                     }
                 }
             }
@@ -1102,7 +1102,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
     // have new table formulas been inserted?
-    if( pTblFldTyp->HasWriterListeners() )
+    if( pTableFieldTyp->HasWriterListeners() )
     {
         // finish old action: table-frames have been created
         // a selection can be made now
@@ -1113,8 +1113,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
         for( ; nActCnt; --nActCnt )
             StartAllAction();
     }
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
     EndAllAction();
 
     return bRet;
@@ -1146,9 +1146,9 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     {
         //insert a paragraph
         StartUndo(UNDO_INSERT);
-        SwNodeIndex aTblIdx(  *pTableNode, -1 );
-        SwPosition aBefore(aTblIdx);
-        if(GetDoc()->getIDocumentContentOperations().AppendTxtNode( aBefore ))
+        SwNodeIndex aTableIdx(  *pTableNode, -1 );
+        SwPosition aBefore(aTableIdx);
+        if(GetDoc()->getIDocumentContentOperations().AppendTextNode( aBefore ))
         {
             SwPaM aTmp(aBefore);
             aCpyPam = aTmp;
@@ -1163,7 +1163,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     SET_CURR_SHELL( this );
 
     StartAllAction();
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
     SetSelection(aCpyPam);
     // copy the text of the selection
     SwEditShell::Copy(&rToFill);
@@ -1179,15 +1179,15 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     }
     // now the page bound objects
     // additionally copy page bound frames
-    if( GetDoc()->GetSpzFrmFmts()->size() )
+    if( GetDoc()->GetSpzFrameFormats()->size() )
     {
         // create a draw view if necessary
         if( !rToFill.Imp()->GetDrawView() )
             rToFill.MakeDrawView();
 
-        for ( auto pCpyFmt : *GetDoc()->GetSpzFrmFmts() )
+        for ( auto pCpyFormat : *GetDoc()->GetSpzFrameFormats() )
         {
-            SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+            SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
             if ((FLY_AT_PAGE == aAnchor.GetAnchorId()) &&
                     aAnchor.GetPageNum() >= nStartPage && aAnchor.GetPageNum() <= nEndPage)
             {
@@ -1195,18 +1195,18 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
             }
             else
                 continue;
-            rToFill.GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+            rToFill.GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
         }
     }
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
     Pop(false);
     EndAllAction();
 
     return true;
 }
 
-bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const
+bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const
 {
     OSL_ENSURE( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
@@ -1223,7 +1223,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co
                 if ( pGrf )
                 {
                     Graphic aGrf( *pGrf );
-                    if( SotClipboardFormatId::GDIMETAFILE == nFmt )
+                    if( SotClipboardFormatId::GDIMETAFILE == nFormat )
                     {
                         if( GRAPHIC_BITMAP != aGrf.GetType() )
                         {
@@ -1281,9 +1281,9 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co
                 }
             }
         }
-        else if( SotClipboardFormatId::GDIMETAFILE == nFmt )
+        else if( SotClipboardFormatId::GDIMETAFILE == nFormat )
             rGrf = Imp()->GetDrawView()->GetMarkedObjMetaFile();
-        else if( SotClipboardFormatId::BITMAP == nFmt || SotClipboardFormatId::PNG == nFmt )
+        else if( SotClipboardFormatId::BITMAP == nFormat || SotClipboardFormatId::PNG == nFormat )
             rGrf = Imp()->GetDrawView()->GetMarkedObjBitmapEx();
     }
     return bConvert;
@@ -1368,14 +1368,14 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
         {
         case SW_PASTESDR_REPLACE:
             {
-                const SwFrmFmt* pFmt(0);
+                const SwFrameFormat* pFormat(0);
                 const SwFrm* pAnchor(0);
                 if( pOldObj->ISA(SwVirtFlyDrawObj) )
                 {
-                    pFmt = FindFrmFmt( pOldObj );
+                    pFormat = FindFrameFormat( pOldObj );
 
                     Point aNullPt;
-                    SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrmFmt*>(pFmt)->GetFrm( &aNullPt );
+                    SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrameFormat*>(pFormat)->GetFrm( &aNullPt );
                     pAnchor = pFlyFrm ? pFlyFrm->GetAnchorFrm() : NULL;
 
                     if (!pAnchor || pAnchor->FindFooterOrHeader())
@@ -1412,12 +1412,12 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
                     // store attributes, then set SdrObject
                     SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
                                             RES_SURROUND, RES_ANCHOR );
-                    aFrmSet.Set( pFmt->GetAttrSet() );
+                    aFrmSet.Set( pFormat->GetAttrSet() );
 
                     Point aNullPt;
-                    if( pAnchor->IsTxtFrm() && static_cast<const SwTxtFrm*>(pAnchor)->IsFollow() )
+                    if( pAnchor->IsTextFrm() && static_cast<const SwTextFrm*>(pAnchor)->IsFollow() )
                     {
-                        const SwTxtFrm* pTmp = static_cast<const SwTxtFrm*>(pAnchor);
+                        const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnchor);
                         do {
                             pTmp = pTmp->FindMaster();
                             OSL_ENSURE( pTmp, "Where's my Master?" );
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index d6a24296fe7a..35d9210e26f8 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -61,12 +61,12 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
     SET_CURR_SHELL( this );
     while ( pPage )
     {
-        pFlow = pPage->FindFirstBodyCntnt();
+        pFlow = pPage->FindFirstBodyContent();
         if ( pFlow )
         {
             if ( pFlow->IsInTab() )
                 pFlow = pFlow->FindTabFrm();
-            const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
+            const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
             if( rPgDesc.GetPageDesc() )
             {
                 // wir haben ihn den Schlingel
@@ -79,24 +79,24 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
     if ( !pPage )
     {
         pPage = static_cast<SwPageFrm*>(GetLayout()->Lower());
-        pFlow = pPage->FindFirstBodyCntnt();
+        pFlow = pPage->FindFirstBodyContent();
         if ( !pFlow )
         {
             pPage   = static_cast<SwPageFrm*>(pPage->GetNext());
-            pFlow = pPage->FindFirstBodyCntnt();
+            pFlow = pPage->FindFirstBodyContent();
             OSL_ENSURE( pFlow, "Dokuemnt ohne Inhalt?!?" );
         }
     }
 
     // use pagenumber
-    SwFmtPageDesc aNew( &rDesc );
+    SwFormatPageDesc aNew( &rDesc );
     aNew.SetNumOffset( oPageNumOffset );
 
     if ( pFlow->IsInTab() )
-        GetDoc()->SetAttr( aNew, *(SwFmt*)pFlow->FindTabFrm()->GetFmt() );
+        GetDoc()->SetAttr( aNew, *(SwFormat*)pFlow->FindTabFrm()->GetFormat() );
     else
     {
-        SwPaM aPaM( *static_cast<const SwCntntFrm*>(pFlow)->GetNode() );
+        SwPaM aPaM( *static_cast<const SwContentFrm*>(pFlow)->GetNode() );
         GetDoc()->getIDocumentContentOperations().InsertPoolItem( aPaM, aNew );
     }
     EndAllActionAndCall();
@@ -178,7 +178,7 @@ size_t SwFEShell::GetCurPageDesc( const bool bCalcFrm ) const
 // Otherwise return 0 pointer
 const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
 {
-    const SwCntntNode* pCNd;
+    const SwContentNode* pCNd;
     const SwFrm* pMkFrm, *pPtFrm;
     const SwPageDesc* pFnd, *pRetDesc = reinterpret_cast<SwPageDesc*>(sal_IntPtr(-1));
     const Point aNulPt;
@@ -186,14 +186,14 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
 
-        if( 0 != (pCNd = rPaM.GetCntntNode() ) &&
+        if( 0 != (pCNd = rPaM.GetContentNode() ) &&
             0 != ( pPtFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, false )) )
             pPtFrm = pPtFrm->FindPageFrm();
         else
             pPtFrm = 0;
 
         if( rPaM.HasMark() &&
-            0 != (pCNd = rPaM.GetCntntNode( false ) ) &&
+            0 != (pCNd = rPaM.GetContentNode( false ) ) &&
             0 != ( pMkFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, false )) )
             pMkFrm = pMkFrm->FindPageFrm();
         else
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index a7b1c1f7b756..2937f04928e4 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star;
 
 // Based on the request, changes to the specific layouts will be made, to
 // fit to the format
-static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
+static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFormatAnchor& rAnchor,
                         const Point& rPt )
 {
     bool bRet = false;
@@ -88,8 +88,8 @@ static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
     }
     else
     {
-        const SwCntntNode *pCntNd = rNode.GetCntntNode();
-        const SwCntntFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false ) : 0;
+        const SwContentNode *pCntNd = rNode.GetContentNode();
+        const SwContentFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false ) : 0;
         const SwPageFrm *pPg = pCFrm ? pCFrm->FindPageFrm() : 0;
 
         rAnchor.SetPageNum( pPg ? pPg->GetPhyPageNum() : 1 );
@@ -105,7 +105,7 @@ static bool lcl_FindAnchorPos(
     SfxItemSet& rSet )
 {
     bool bRet = true;
-    SwFmtAnchor aNewAnch( static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )) );
+    SwFormatAnchor aNewAnch( static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )) );
     RndStdIds nNew = aNewAnch.GetAnchorId();
     const SwFrm *pNewAnch;
 
@@ -118,7 +118,7 @@ static bool lcl_FindAnchorPos(
     case FLY_AT_CHAR: // LAYER_IMPL
         {
             // starting from the upper-left corner of the Fly,
-            // search nearest CntntFrm
+            // search nearest ContentFrm
             const SwFrm* pFrm = rFrm.IsFlyFrm() ? static_cast<const SwFlyFrm&>(rFrm).GetAnchorFrm()
                                                 : &rFrm;
             pNewAnch = ::FindAnchor( pFrm, aTmpPnt );
@@ -128,7 +128,7 @@ static bool lcl_FindAnchorPos(
                 break;
             }
 
-            SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnch)->GetNode() );
+            SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnch)->GetNode() );
             if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
             {
                 // textnode should be found, as only in those
@@ -137,7 +137,7 @@ static bool lcl_FindAnchorPos(
                 aTmpPnt.setX(aTmpPnt.getX() - 1);                   // do not land in the fly!
                 if( !pNewAnch->GetCrsrOfst( &aPos, aTmpPnt, &aState ) )