#123891# consolidate @since tag, in future only OpenOffice <version>

96 files changed, 106 insertions, 106 deletions

diff --git a/offapi/com/sun/star/frame/CommandGroup.idl b/offapi/com/sun/star/frame/CommandGroup.idl
index a44ee91cb49d..0324357f2608 100644
--- a/offapi/com/sun/star/frame/CommandGroup.idl
+++ b/offapi/com/sun/star/frame/CommandGroup.idl
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module frame {
     @see XDispatchInformationProvider
     @see Controller
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published constants CommandGroup
 {
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index ba41ec51ee35..f79d9f5fc357 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module frame {
 
 /** describes a command which can be send to a generic toolbar control.
 
-    @since OOo 2.0.3
+    @since OpenOffice 2.0.3
  */
 struct ControlCommand
 {
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index bfd26b534bc7..791ea357758b 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module frame {
 /** describes a control event send by extended user interface
     controls.
 
-    @since OOo 2.0.3
+    @since OpenOffice 2.0.3
  */
 struct ControlEvent
 {
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index c62d51cafa74..6f7572938795 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module frame {
 
     @see DispatchProvider
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published service DispatchHelper
 {
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index d0ad8c811443..c1bc6d672871 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module frame {
     @see XDispatchInformationProvider
     @see Controller
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published struct DispatchInformation
 {
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index 08472253b332..5aef7adb36f1 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -51,7 +51,7 @@
     @see DispatchRecorderSupplier
     @see Frame::RecorderSupplier
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published service DispatchRecorder
 {
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index 821adf20820f..e56170b7e0ff 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -47,7 +47,7 @@
 
     @see DispatchRecorder
     @see Frame
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published service DispatchRecorderSupplier
 {
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index c1a62e015b58..9543b148f072 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -36,7 +36,7 @@
 // DocMerge from xml: struct com::sun::star::frame::DispatchStatement
 /** represents a dispatch statement from a recorded macro
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published struct DispatchStatement
 {
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index 8a51efb0fe0f..5fc5ca52eee1 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -37,7 +37,7 @@
 // DocMerge from xml: exception com::sun::star::frame::DoubleInitializationException
 /** This exception can be thrown in case an object is initialized second time.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published exception DoubleInitializationException: com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index 50b8d7e6a3ed..64306ad5fcc0 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -123,7 +123,7 @@ published service Frame
     //-------------------------------------------------------------------------
     /** provides information about supported commands
 
-        @since OOo 2.0
+        @since OpenOffice 2.0
     */
     [optional] interface XDispatchInformationProvider;
 
@@ -185,7 +185,7 @@ published service Frame
         no possibility to check for enabled/disabled recording then.
         </p>
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
      */
     [optional, property] XDispatchRecorderSupplier RecorderSupplier;
 
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 98283ee802cc..841f94282b3a 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -37,7 +37,7 @@
 // DocMerge from xml: exception com::sun::star::frame::IllegalArgumentIOException
 /** This exception can be thrown in case arguments are wrong.
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published exception IllegalArgumentIOException: com::sun::star::io::IOException
 {
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index f6269518d3bc..e38f75d49c1f 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -68,7 +68,7 @@
     the size and position of those user interface elements.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service LayoutManager
diff --git a/offapi/com/sun/star/frame/LayoutManagerEvents.idl b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
index 47cdb21d239a..6029444e3620 100644
--- a/offapi/com/sun/star/frame/LayoutManagerEvents.idl
+++ b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module frame {
     @see com::sun::star::frame::LayoutManager
     @see com::sun::star::frame::XLayoutManagerEventBroadcaster
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 constants LayoutManagerEvents
 {
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index f73373597a11..04ae67526d5c 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module frame {
     of office modules.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 
 published service ModuleManager
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index 9c9ea3e1be5b..66e83c36938f 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -61,7 +61,7 @@ module com { module sun { module star { module frame {
     worked on. This list gets changes consistently during a work session.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service PopupMenuController
@@ -124,7 +124,7 @@ service PopupMenuController
         the dispatch URL scheme: "vnd.sun.star.popup:" opaque_part [ "?" query ].
         </p>
 
-        @since OOo 2.2
+        @since OpenOffice 2.2
     */
     [optional] interface com::sun::star::frame::XDispatchProvider;
 
@@ -137,7 +137,7 @@ service PopupMenuController
         controller should support this interface.
         </p>
 
-        @since OOo 2.2
+        @since OpenOffice 2.2
     */
     [optional] interface com::sun::star::lang::XComponent;
 };
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 5eccdc85ba1b..b2105df7d651 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module frame {
     it contains a registered command URL.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service PopupMenuControllerFactory : XUIControllerFactory
 {
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index a9773a55ff96..0e048d6b36e3 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -45,7 +45,7 @@ interface XStatusbarController;
     @see com::sun::star::frame::XDispatchProvider
     @see com::sun::star::frame::XStatusbarController
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 service StatusbarController : XStatusbarController
 {
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index 46aff8d418f1..636b6aee7bea 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module frame {
     if it contains a registered command URL.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service StatusbarControllerFactory : XUIControllerFactory
 {
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 2721dd245a31..23cbfc0e0588 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -48,7 +48,7 @@
 
     @deprecated
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published service Task
 {
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 9b5c543afafe..fc45325b99e3 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -63,7 +63,7 @@
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 
 service ToolbarController
diff --git a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
index f24bc0391a8e..9ba539f88b78 100644
--- a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module frame {
     A toolbar controller can be registered for a command URL and a model service name.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 service ToolbarControllerFactory : XUIControllerFactory
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 53e51ef92b09..2624ff834a1f 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module frame {
 /** specifies a factory for
     <type scope="com::sun::star::ucb">TransientDocumentsDocumentContent</type>s.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 service TransientDocumentsDocumentContentFactory
 {
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 46ddef1dd8de..7240cc8baab4 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module frame {
  *  module could not be classified or does not have
  *  a valid configuration.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index 3688343ba02f..5370d75aaf82 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module frame {
 /** Must be implemented by dispatch objects which want to get
     notifications about control events.
 
-    @since OOo 2.0.3
+    @since OpenOffice 2.0.3
  */
 interface XControlNotificationListener : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index e21dabfceaee..712839d877c8 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module frame {
 
 /** extends the <type>XController</type> interface
 
-    @since OOo 3.0
+    @since OpenOffice 3.0
 */
 published interface XController2 : XController
 {
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 49e919c6364e..18fa212913a8 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -44,7 +44,7 @@
 
     @see XDispatch
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published interface XDispatchHelper : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index 2425347211cc..d2ac164df68b 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -52,7 +52,7 @@ module com {  module sun {  module star {  module frame {
 
     @see Frame
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published interface XDispatchInformationProvider: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index 61d3e93c997e..0f9564fa27f5 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -56,7 +56,7 @@ module com {  module sun {  module star {  module frame {
     @see Frame
     @see XDispatchRecorderSupplier
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published interface XDispatchRecorder: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index 4706b5e27b7b..1b5ed8008181 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -51,7 +51,7 @@
     </p>
 
     @see XDispatchRecorder
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published interface XDispatchRecorderSupplier: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index a831d47f466f..54b3dfdbc722 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module frame {
 
     @deprecated
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 interface XInplaceLayout : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index 446f90bb0805..a078140c7f26 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -91,7 +91,7 @@ module com { module sun { module star { module frame {
     @see com::sun::star::frame::XFrame
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 published interface XLayoutManager : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index f287ae8e2f63..481fcd377680 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -36,7 +36,7 @@
 
     @see ::com::sun::star::frame::LayoutManager
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 
 published interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 9ea26aceff66..cebe0821a779 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module frame {
     @see ::com::sun::star::frame::LayoutManager
     @see ::com::sun::star::frame::LayoutManagerEvents
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published interface XLayoutManagerListener : com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index 9db71a4c02ed..0476a139a751 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -51,7 +51,7 @@
        is already initialized the mentioned methods should throw DoubleInitializationException.
     </p>
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published interface XLoadable: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index bbf46b17716b..9767cfd8f720 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module frame {
 
     @deprecated
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 interface XMenuBarAcceptor : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index 61fba271b39f..317333bff942 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module frame {
 /** provides functions to set and remove a merged menu bar for inplace
     editing.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 
 interface XMenuBarMergingAcceptor : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index 5a76f14f854c..fc0a583a47f2 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module frame {
 
     @see XModuleManager
 
-    @since OOo 2.3
+    @since OpenOffice 2.3
  */
 interface XModule : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index 51cf804f9578..d893366adf6f 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module frame {
 //===============================================
 /** can be used to identify office modules.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 published interface XModuleManager : com::sun::star::uno::XInterface
 {
@@ -58,7 +58,7 @@ published interface XModuleManager : com::sun::star::uno::XInterface
                is requested on the given module. Because all module service registrations must be unique
                this value can be queried and checked against the configuration.
 
-               Since OOo 2.3.0 also the optional interface <type>XModule</type> will be used.
+               Since OpenOffice 2.3.0 also the optional interface <type>XModule</type> will be used.
                If its exists it will be preferred.
 
        @param  Module
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index 61ad2056cade..50126264ddbe 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module frame {
     briefs the controller whenever the popup menu gets activated by a user.
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 interface XPopupMenuController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 09af15feb622..2267f56bc31a 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -79,7 +79,7 @@
     @see XDispatchRecorderSupplier
     @see XDispatch
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
  */
 published interface XRecordableDispatch: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index f2d853c03af0..46dad7d56c4c 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module frame {
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 interface XStatusbarController
 {
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index a7fc2afc2327..8e94d49e1a0f 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -43,7 +43,7 @@
 
     @see com::sun::star::frame::ToolbarController
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 interface XSubToolbarController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index 66de6796efa2..6e8724412334 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module frame {
 
 //=============================================================================
 /** additional interfaces for dispatch objects: allow to execute with return value
-    @since OOo 2.0
+    @since OpenOffice 2.0
     @see XDispatch
  */
 published interface XSynchronousDispatch: com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 0dc123e56cdf..8aa090f8d5ff 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -49,7 +49,7 @@
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 interface XToolbarController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XToolbarControllerListener.idl b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
index 74448109e414..2e2985044cc8 100644
--- a/offapi/com/sun/star/frame/XToolbarControllerListener.idl
+++ b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
@@ -32,7 +32,7 @@
 
     @see com::sun::star::frame::ToolbarController
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 interface XToolbarControllerListener : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index 8c85ca49b45d..eafb92dc47f6 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module frame {
      @see      com::sun::star::document::OfficeDocument
      @see      com::sun::star::ucb::TransientDocumentsDocumentContent
 
-     @since OOo 2.0
+     @since OpenOffice 2.0
 */
 interface XTransientDocumentsDocumentContentFactory : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XUIControllerFactory.idl b/offapi/com/sun/star/frame/XUIControllerFactory.idl
index 4e21a0a3d250..a1fc07787373 100644
--- a/offapi/com/sun/star/frame/XUIControllerFactory.idl
+++ b/offapi/com/sun/star/frame/XUIControllerFactory.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module frame {
     @see ToolbarControllerFactory
     </p>
 
-    @since Apache OpenOffice 4.0
+    @since OpenOffice 4.0
  */
 interface XUIControllerFactory
 {
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index a4abcd358781..19def98bf3e9 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module frame {
     @see PopupMenuControllerFactory
     </p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 
 published interface XUIControllerRegistration : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/status/ClipboardFormats.idl b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
index 8adaa34934ff..95f25e198ca5 100644
--- a/offapi/com/sun/star/frame/status/ClipboardFormats.idl
+++ b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module frame { module status {
 /** contains a list of format ID's and names which are part of the
     system clipboard.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct ClipboardFormats
 {
diff --git a/offapi/com/sun/star/frame/status/FontHeight.idl b/offapi/com/sun/star/frame/status/FontHeight.idl
index ba4ba9490175..237b9cbd137f 100644
--- a/offapi/com/sun/star/frame/status/FontHeight.idl
+++ b/offapi/com/sun/star/frame/status/FontHeight.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module frame { module status {
 
     <p>For example, this can be used to select a font.</p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct FontHeight
 {
diff --git a/offapi/com/sun/star/frame/status/ItemState.idl b/offapi/com/sun/star/frame/status/ItemState.idl
index b00c119236fd..10aaf039b63d 100644
--- a/offapi/com/sun/star/frame/status/ItemState.idl
+++ b/offapi/com/sun/star/frame/status/ItemState.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module frame { module status {
 
     @see ItemStatus
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 constants ItemState
 {
diff --git a/offapi/com/sun/star/frame/status/ItemStatus.idl b/offapi/com/sun/star/frame/status/ItemStatus.idl
index e5467ecd4ac6..0179b3df4c00 100644
--- a/offapi/com/sun/star/frame/status/ItemStatus.idl
+++ b/offapi/com/sun/star/frame/status/ItemStatus.idl
@@ -31,7 +31,7 @@ module com {  module sun {  module star {  module frame { module status {
 
 /** describes a state of a property.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct ItemStatus
 {
diff --git a/offapi/com/sun/star/frame/status/LeftRightMargin.idl b/offapi/com/sun/star/frame/status/LeftRightMargin.idl
index 0066f2fa83ca..371e8ab8a82d 100644
--- a/offapi/com/sun/star/frame/status/LeftRightMargin.idl
+++ b/offapi/com/sun/star/frame/status/LeftRightMargin.idl
@@ -32,7 +32,7 @@ module com {  module sun {  module star {  module frame {  module status {
 
 /** specifies a left and right margin.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct LeftRightMargin
 {
diff --git a/offapi/com/sun/star/frame/status/Template.idl b/offapi/com/sun/star/frame/status/Template.idl
index 21be6be1a02b..96ae5fbc1e56 100644
--- a/offapi/com/sun/star/frame/status/Template.idl
+++ b/offapi/com/sun/star/frame/status/Template.idl
@@ -32,7 +32,7 @@ module com {  module sun {  module star {  module frame { module status {
 
 /** contains an association between a style name and a value.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct Template
 {
diff --git a/offapi/com/sun/star/frame/status/UpperLowerMargin.idl b/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
index bbf379a6035e..ef225cf17f70 100644
--- a/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
+++ b/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
@@ -32,7 +32,7 @@ module com {  module sun {  module star {  module frame {  module status {
 
 /** specifies an upper and lower margin.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct UpperLowerMargin
 {
diff --git a/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl b/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
index c6cbcd32dcef..0d2f77f06d58 100644
--- a/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
+++ b/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
@@ -32,7 +32,7 @@ module com {  module sun {  module star {  module frame {  module status {
 
 /** specifies an upper and lower margin.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct UpperLowerMarginScale
 {
diff --git a/offapi/com/sun/star/frame/status/Verb.idl b/offapi/com/sun/star/frame/status/Verb.idl
index fbfef5f28113..6d1771dc9ae8 100644
--- a/offapi/com/sun/star/frame/status/Verb.idl
+++ b/offapi/com/sun/star/frame/status/Verb.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module frame { module status {
 
     <p>For example, this can be used to select a font.</p>
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct Verb
 {
diff --git a/offapi/com/sun/star/frame/status/Visibility.idl b/offapi/com/sun/star/frame/status/Visibility.idl
index a913bb0c4ef2..06fcad3e2ac3 100644
--- a/offapi/com/sun/star/frame/status/Visibility.idl
+++ b/offapi/com/sun/star/frame/status/Visibility.idl
@@ -31,7 +31,7 @@ module com {  module sun {  module star {  module frame { module status {
 
 /** describes the visibility state of a property.
 
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 struct Visibility
 {
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index a5ee9a6f4a69..f8a55e1b0f53 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -55,7 +55,7 @@ module com {  module sun {  module star {  module sdb {
     is urged to specify which properties are mandatory, and which ones optional. Additionally,
     it's free to specify any additional requirements about the relations of properties.</p>
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 published service DataAccessDescriptor
 {
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index b467880c6735..44d300719156 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -75,7 +75,7 @@ published service DataSource
         as it is the case when using <type>XCompletedConnection</type> or <type scope="com::sun::star::sdbc">XDataSource</type>.
         @see XCompletedConnection
         @see com::sun::star::sdbc::XDataSource
-        @since OOo 1.1.2
+        @since OpenOffice 1.1.2
      */
     interface com::sun::star::sdbc::XIsolatedConnection;
 
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index d2632e4e0370..b972de60a04a 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -275,7 +275,7 @@ published service DataSourceBrowser
         in the event structure passed to the context menu interceptors, actually is a value from the
         <type scope="com::sun::star::sdb::application">NamedDatabaseObject</type> group.</p>
 
-        @since OOo 3.0
+        @since OpenOffice 3.0
     */
     [optional] interface ::com::sun::star::ui::XContextMenuInterception;
 };
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index 3f8be2bab1ed..3b2534c58fba 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -92,7 +92,7 @@ published service DatabaseContext
         are maintained, so if possible at all, you should use this interface, instead of modifying or
         querying the configuration data directly.</p>
 
-        @since OOo 3.3
+        @since OpenOffice 3.3
     */
     [optional] interface XDatabaseRegistrations;
 };
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index 560201be1e4d..d832869f6df2 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -39,7 +39,7 @@
  module com {  module sun {  module star {  module sdb {
 
 /** specifies a link to a document associated with a database document
-    @since OOo 2.0
+    @since OpenOffice 2.0
     @deprecated
  */
 published service DatabaseDocument
diff --git a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
index 3d3897c4cf6f..a0c9087401d0 100644
--- a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
+++ b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module sdb {
     @see XDatabaseRegistrations
     @see XDatabaseRegistrationsListener
 
-    @since  OpenOffice.org 3.3
+    @since OpenOffice 3.3
  */
 struct DatabaseRegistrationEvent : ::com::sun::star::lang::EventObject
 {
diff --git a/offapi/com/sun/star/sdb/DefinitionContent.idl b/offapi/com/sun/star/sdb/DefinitionContent.idl
index 4ff66c20b5ea..44e7e2217ec4 100644
--- a/offapi/com/sun/star/sdb/DefinitionContent.idl
+++ b/offapi/com/sun/star/sdb/DefinitionContent.idl
@@ -57,7 +57,7 @@ service DefinitionContent
     service ::com::sun::star::ucb::Content;
 
     /** provides access to the complete name of the content within its hierarchy
-        @since OOo 3.3
+        @since OpenOffice 3.3
     */
     interface ::com::sun::star::container::XHierarchicalName;
 };
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index cbef1f4d7295..3e6cb00f3c7d 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -40,7 +40,7 @@
     <p>
     Usually thrown if someone tries to save a document which hasn't a name yet.
     </p>
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 exception DocumentSaveRequest: com::sun::star::task::ClassifiedInteractionRequest
 {
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index 4fa822afe900..458615642eae 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -59,7 +59,7 @@ module com {  module sun {  module star {  module sdb {
 
     @see com::sun::star::sdb::XOfficeDatabaseDocument
     @see com::sun::star::document::OfficeDocument
-    @since OOo 2.0
+    @since OpenOffice 2.0
  */
 service OfficeDatabaseDocument
 {
@@ -74,13 +74,13 @@ service OfficeDatabaseDocument
     interface XOfficeDatabaseDocument;
 
     /** allows access to the Basic macros and dialogs possibly embedded in the document
-        @since OOo 3.1
+        @since OpenOffice 3.1
     */
     interface ::com::sun::star::document::XEmbeddedScripts;
 
     /** supplies a script provider which can be used to execute macros and scripts
         embedded in the document
-        @since OOo 3.1
+        @since OpenOffice 3.1
     */
     interface ::com::sun::star::script::provider::XScriptProviderSupplier;
 
@@ -98,7 +98,7 @@ service OfficeDatabaseDocument
         so the usual way of creating a document from scratch was to create it, set properties as
         needed, and store it.</p>
 
-        @since OOo 3.1
+        @since OpenOffice 3.1
     */
     interface ::com::sun::star::frame::XLoadable;
 
@@ -216,7 +216,7 @@ service OfficeDatabaseDocument
         </table>
         </p>
 
-        @since OOo 3.1
+        @since OpenOffice 3.1
     */
     interface ::com::sun::star::document::XDocumentEventBroadcaster;
 
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index 12db972c3c99..ec2440f6dc90 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -186,7 +186,7 @@ published service QueryDesign
     /** specifies whether the user enabled escape processing for the statement being designed.
 
         @see DataAccessDescriptor::EscapeProcessing
-        @since OOo 2.4
+        @since OpenOffice 2.4
     */
     [readonly, property, optional] boolean EscapeProcessing;
 };
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 75841b9b35da..b0efeb6bf1cf 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module sdb {
     @see com::sun::star::frame::XDispatch
     @see com::sun::star::frame::XDispatchProviderInterceptor
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 
 published service RelationDesign
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index 8a34a6e920f4..b30ae794e3ac 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module sdb {
     @see com::sun::star::frame::XDispatch
     @see com::sun::star::frame::XDispatchProviderInterceptor
 
-    @since OOo 1.1.2
+    @since OpenOffice 1.1.2
 */
 
 published service TableDesign
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
index a71baa298a43..2a83e161e722 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
@@ -44,7 +44,7 @@ interface XDatabaseRegistrationsListener;
     if possible at all, use this interface, instead of modifying or querying the configuration
     data directly.</p>
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
  */
 interface XDatabaseRegistrations
 {
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
index 4ae6250c5773..b3e505e82bf8 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module sdb {
 
     @see XDatabaseRegistrations
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
  */
 interface XDatabaseRegistrationsListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index ee4a8acf760c..b6b07da853c9 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module sdb {
     This continuation is typically used in conjunction with a
     <type scope="com::sun::star::sdb">DocumentSaveRequest</type>.
     </p>
-    @since OOo 2.0
+    @since OpenOffice 2.0
 */
 interface XInteractionDocumentSave: com::sun::star::task::XInteractionContinuation
 {
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
index 451e4be22b81..3b551d9cc8cb 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
@@ -38,7 +38,7 @@ interface XRowSetChangeListener;
 
     @see XRowSetSupplier
     @see XRowSetChangeListener
-    @since OOo 3.2
+    @since OpenOffice 3.2
  */
 interface XRowSetChangeBroadcaster
 {
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
index f748de5ac4a3..e7124022bf3e 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module sdb {
 
     @see XRowSetChangeBroadcaster
     @see XRowSetSupplier
-    @since OOo 3.2
+    @since OpenOffice 3.2
  */
     interface XRowSetChangeListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
index cf75e30f236f..f49fedcfeac0 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
@@ -38,7 +38,7 @@ interface XRowsChangeListener;
 
     @see XRowSetSupplier
     @see XRowsChangeListener
-    @since OOo 3.3
+    @since OpenOffice 3.3
  */
 interface XRowsChangeBroadcaster
 {
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 753b9ce4cf7e..74be15ae9b9a 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -211,7 +211,7 @@ published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
         @see XQueriesSupplier
         @see DatabaseDocument
 
-        @since OOo 2.0.4
+        @since OpenOffice 2.0.4
     */
     string getQueryWithSubstitution()
         raises (com::sun::star::sdbc::SQLException);
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index c2fba879cb68..a233a0eca970 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module sdb {
 
 /** allows operating on a sub document of an <type>OfficeDatabaseDocument</type>
 
-    @since OOo 3.1
+    @since OpenOffice 3.1
  */
 published interface XSubDocument
 {
diff --git a/offapi/com/sun/star/sdb/application/CopyTableOperation.idl b/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
index aa43425fc57d..4eed52c45a4c 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module sdb { module application {
 /** specifies the different basic operations a <type>CopyTableWizard</type>
     can do.
 
-    @since OOo 2.4
+    @since OpenOffice 2.4
 */
 constants CopyTableOperation
 {
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index e41a6b541078..328ad137f390 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -94,7 +94,7 @@ module com { module sun { module star { module sdb { module application {
     @see ::com::sun::star::sdb::DataAccessDescriptor::ConnectionResource
     @see ::com::sun::star::sdb::InteractionHandler
 
-    @since OOo 2.4
+    @since OpenOffice 2.4
  */
 service CopyTableWizard : XCopyTableWizard
 {
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 0c48c3b8b6e5..2265a7d25b74 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module sdb { module application {
 
 /** denotes different objects within a database document
 
-    @since OOo 2.2
+    @since OpenOffice 2.2
 
     @see DatabaseObjectContainer
  */
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl b/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
index ca624f8812f4..ec07f9c98607 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module sdb { module application {
 
     @see DatabaseObject
 
-    @since OOo 3.0
+    @since OpenOffice 3.0
  */
 constants DatabaseObjectContainer
 {
diff --git a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
index 2838a5c7fff3..7799fdb699a6 100644
--- a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module sdb { module application {
 
 /** denotes a named database object, or a named folder of database objects
 
-    @since OOo 3.0
+    @since OpenOffice 3.0
 */
 struct NamedDatabaseObject
 {
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index f5624a540a17..0be82aa8d1e1 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -53,7 +53,7 @@ interface XCopyTableListener;
     <p>The <code>copy table wizard</code> described by this interfaces cares for those,
     and other, settings.</p>
 
-    @since OOo 2.4
+    @since OpenOffice 2.4
  */
 interface XCopyTableWizard : ::com::sun::star::ui::dialogs::XExecutableDialog
 {
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index cd6815b9eadf..fb8d633f3b9f 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module sdb { module application {
     @see com::sun::star::frame::Controller
     @see com::sun::star::sdb::DatabaseDocument
 
-    @since OOo 2.2
+    @since OpenOffice 2.2
  */
 published interface XDatabaseDocumentUI
 {
@@ -109,7 +109,7 @@ published interface XDatabaseDocumentUI
         controllers (<type scope="com::sun::star::frame">XController</type>), or frames
         (<type scope="com::sun::star::frame">XFrame</type>).
 
-        @since OOo 3.0
+        @since OpenOffice 3.0
     */
     [attribute, readonly] sequence< ::com::sun::star::lang::XComponent >
             SubComponents;
@@ -157,7 +157,7 @@ published interface XDatabaseDocumentUI
         @return
             <TRUE/> if and only if both suspending and closing all sub components succeeds.
 
-        @since OOo 3.0
+        @since OpenOffice 3.0
     */
     boolean closeSubComponents();
 
diff --git a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
index f6b85333bec0..76e2138bdb4c 100644
--- a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
+++ b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
@@ -41,7 +41,7 @@ interface XDatabaseDocumentUI;
 
     @see com::sun::star::sdb::Connection
 
-    @since OOo 2.2
+    @since OpenOffice 2.2
  */
 interface XTableUIProvider
 {
diff --git a/offapi/com/sun/star/sdb/tools/CompositionType.idl b/offapi/com/sun/star/sdb/tools/CompositionType.idl
index c81276bbd917..f91db111ff19 100644
--- a/offapi/com/sun/star/sdb/tools/CompositionType.idl
+++ b/offapi/com/sun/star/sdb/tools/CompositionType.idl
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @see XTableName
 
-    @since OOo 2.0.4
+    @since OpenOffice 2.0.4
 */
 constants CompositionType
 {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index cf28efb2c57e..1c12db177cd1 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @see com::sun::star::sdbcx::XConnection
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XConnectionSupplier
 {
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index 52ed7c6074a1..8ac9124505b6 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -62,7 +62,7 @@ published interface XDataSourceMetaData;
     <p>Note that nearly all functionality provided by this interface is also
     available by other means, it's only provided here for convenience purposes.</p>
 
-    @since OOo 2.0.4
+    @since OpenOffice 2.0.4
 */
 published interface XConnectionTools
 {
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index ebe27178ca25..f344bcde3d95 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     @see com::sun::star::sdbcx::XAppend
     @see com::sun::star::sdbcx::XDrop
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XIndexAlteration
 {
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 0fc9a564ebf9..f96bd521aeed 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     @see com::sun::star::sdbcx::XAppend
     @see com::sun::star::sdbcx::XDrop
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XKeyAlteration
 {
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index aef03319b8fb..1a0ef1613611 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -64,7 +64,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @see XConnectionTools
 
-    @since OOo 2.0.4
+    @since OpenOffice 2.0.4
 */
 published interface XObjectNames
 {
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index 930696664a09..09c6d5ec43cd 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     @see com::sun::star::sdbcx::XAppend
     @see com::sun::star::sdbcx::XDrop
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XTableAlteration
 {
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 9414ceaa40b7..8e04f6335e0d 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -66,7 +66,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     @see com::sun::star::sdbc::XDatabaseMetaData
     @see com::sun::star::sdb::DataSource::Settings
 
-    @since OOo 2.0.4
+    @since OpenOffice 2.0.4
 */
 published interface XTableName
 {
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index 8486c556905e..3cd36e235c91 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @see com::sun::star::sdb::DataSource::Settings
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XTableRename
 {
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index ba0a6114cd2c..bcd800d20aa2 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module sdb { module tools {
     @see com::sun::star::sdb::DataSource::Settings
     @see com::sun::star::sdbcx::View
 
-    @since OOo 3.3
+    @since OpenOffice 3.3
 */
 interface XViewAccess
 {