diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
index c4e1a5940b2d..5d371e48b731 100644
--- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
+++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
@@ -107,8 +107,6 @@ public class GraphicalDifferenceCheck
      *
      * @param _sInputFile       the original document
      * @param _sReferencePath   the directory where the document will print as file or export as pdf.
-     *
-     * @throws  ConvWatchException if the are problems, see containing message
      */
     public static boolean isReferenceExists(String _sInputFile, String _sReferencePath, GraphicalTestArguments _aGTA)
         {
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index cf347cce6389..5d6132341b69 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -54,7 +54,7 @@ import com.sun.star.uno.Type;
  *
  * @see MultiMethodTest
  * @see #testProperty(String)
- * @see #testProperty(String, Propertytester)
+ * @see #testProperty(String, PropertyTester)
  * @see #getNewValue
  * @see #compare
  * @see #toString(Object)
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 78019ae01947..4654014f327e 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -889,7 +889,7 @@ public class utils {
      * @param expand the string to expand
      * @throws java.lang.Exception was thrown on any exception
      * @return return the expanded string
-     * @see com.sun.star.util.theMacroExpander
+     * @see com.sun.star.util.XMacroExpander
      */
     public static String expandMacro(XMultiServiceFactory xMSF, String expand) throws java.lang.Exception {
         try {
diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
index 86a20de32633..ae5c85747ab5 100644
--- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
+++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
@@ -60,7 +60,7 @@ import com.sun.star.beans.PropertyValue;
 *
 * @see com.sun.star.text.NumberingLevel
 * @see com.sun.star.test.ParagraphProperties
-* @see ifc.text._ParagraphProperties
+* @see ifc.style._ParagraphProperties
 */
 public class _NumberingLevel {
 
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
index 0c88f0a28355..fbf6a94db84d 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
@@ -58,16 +58,16 @@ import lib.TestParameters;
 public class CachedContentResultSetFactory extends TestCase {
 
     /**
-    * Creating a Testenvironment for the interfaces to be tested.
+    * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
     * <code>com.sun.star.ucb.CachedContentResultSetFactory</code>. <p>
     *     Object relations created :
     * <ul>
     *  <li> <code>'CachedContentResultSetStub'</code> for
-    *      {@link ifc.XCachedContentResultSetFactory} : the destination
+    *      {@link ifc.ucb._XCachedContentResultSetFactory} : the destination
     *   interface requires as its parameter an instance of
     *   <code>CachedContentResultSetStub</code> service. It is created
-    *   using <code>UniversalContentBroker</code> and queriing it for
+    *   using <code>UniversalContentBroker</code> and querying it for
     *   <code>PackageContent</code> which represents JAR file mentioned
     *   above. Then the dynamic list of file contents (entries) is retrieved,
     *   and a static list is created from it. Using
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
index 24d151c5be9f..27db3a10d8d4 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
@@ -57,16 +57,16 @@ import lib.TestParameters;
 public class CachedContentResultSetStubFactory extends TestCase {
 
     /**
-    * Creating a Testenvironment for the interfaces to be tested.
+    * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
     * <code>com.sun.star.ucb.CachedContentResultSetStubFactory</code>. <p>
     *     Object relations created :
     * <ul>
     *  <li> <code>'ContentResultSet'</code> for
-    *      {@link ifc.XCachedContentResultSetStubFactory} : the destination
+    *      {@link ifc.ucb._XCachedContentResultSetStubFactory} : the destination
     *   interface requires as its parameter an instance of
     *   <code>ContentResultSet</code> service. It is created
-    *   using <code>UniversalContentBroker</code> and queriing it for
+    *   using <code>UniversalContentBroker</code> and querying it for
     *   <code>PackageContent</code> which represents JAR file mentioned
     *   above. Then the dynamic list of file contents (entries) is retrieved,
     *   and a static list is created from it. It represents
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
index c092967b70d5..68e053daebb2 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
@@ -57,13 +57,13 @@ import lib.TestParameters;
 public class CachedDynamicResultSetFactory extends TestCase {
 
     /**
-    * Creating a Testenvironment for the interfaces to be tested.
+    * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
     * <code>com.sun.star.ucb.CachedDynamicResultSetFactory</code>. <p>
     *     Object relations created :
     * <ul>
     *  <li> <code>'CachedDynamicResultSetStub'</code> for
-    *      {@link ifc.XCachedDynamicResultSetFactory} : the destination
+    *      {@link ifc.ucb._XCachedDynamicResultSetFactory} : the destination
     *   interface requires as its parameter an instance of
     *   <code>CachedDynamicResultSetStub</code> service. It is created
     *   using <code>UniversalContentBroker</code> and queriing it for
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
index 1f29cf1556e6..af216c672a3f 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
@@ -56,16 +56,16 @@ import lib.TestParameters;
 public class CachedDynamicResultSetStubFactory extends TestCase {
 
     /**
-    * Creating a Testenvironment for the interfaces to be tested.
+    * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
     * <code>com.sun.star.ucb.CachedDynamicResultSetStubFactory</code>. <p>
     *     Object relations created :
     * <ul>
     *  <li> <code>'DynamicResultSet'</code> for
-    *      {@link ifc.XCachedDynamicResultSetStubFactory} : the destination
+    *      {@link ifc.ucb._XCachedDynamicResultSetStubFactory} : the destination
     *   interface requires as its parameter an instance of
     *   <code>DynamicResultSet</code> service. It is created
-    *   using <code>UniversalContentBroker</code> and queriing it for
+    *   using <code>UniversalContentBroker</code> and querying it for
     *   <code>PackageContent</code> which represents JAR file mentioned
     *   above. Then the dynamic list of file contents (entries) is retrieved.
     *  </li>
diff --git a/qadevOOo/tests/java/mod/_fop/FolderPicker.java b/qadevOOo/tests/java/mod/_fop/FolderPicker.java
index 4af8ffe86b79..597a8006837d 100644
--- a/qadevOOo/tests/java/mod/_fop/FolderPicker.java
+++ b/qadevOOo/tests/java/mod/_fop/FolderPicker.java
@@ -49,11 +49,11 @@ import com.sun.star.uno.XInterface;
 * @see com.sun.star.ui.XFolderPicker
 * @see com.sun.star.lang.XTypeProvider
 * @see com.sun.star.ui.FolderPicker
-* @see ifc.ui._XExecutableDialog
+* @see ifc.ui.dialogs._XExecutableDialog
 * @see ifc.lang._XComponent
 * @see ifc.lang._XServiceInfo
 * @see ifc.ui._XFolderPickerNotifier
-* @see ifc.ui._XFolderPicker
+* @see ifc.ui.dialogs._XFolderPicker
 * @see ifc.lang._XTypeProvider
 */
 public class FolderPicker extends TestCase {
diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java
index e9c2c209347b..e54adfae90de 100644
--- a/qadevOOo/tests/java/mod/_fps/FilePicker.java
+++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java
@@ -55,15 +55,15 @@ import com.sun.star.uno.XInterface;
 * @see com.sun.star.lang.XComponent
 * @see com.sun.star.ui.XFilePickerNotifier
 * @see com.sun.star.ui.XFilePicker
-* @see ifc.ui._XFilePicker
+* @see ifc.ui.dialogs._XFilePicker
 * @see ifc.lang._XInitialization
 * @see ifc.lang._XServiceInfo
 * @see ifc.lang._XTypeProvider
-* @see ifc.ui._XExecutableDialog
-* @see ifc.ui._XFilePickerControlAccess
-* @see ifc.ui._XFilterManager
+* @see ifc.ui.dialogs._XExecutableDialog
+* @see ifc.ui.dialogs._XFilePickerControlAccess
+* @see ifc.ui.dialogs._XFilterManager
 * @see ifc.lang._XComponent
-* @see ifc.ui._XFilePickerNotifier
+* @see ifc.ui.dialogs._XFilePickerNotifier
 */
 public class FilePicker extends TestCase {
 
@@ -77,10 +77,10 @@ public class FilePicker extends TestCase {
     *      {@link ifc.lang._XInitialization} : argument
     *    for creating dialog from teamplate. </li>
     *  <li> <code>'XFilePickerControlAccess.ControlID'</code> for
-    *      {@link ifc.ui._XFilePickerControlAccess} : here
+    *      {@link ifc.ui.dialogs._XFilePickerControlAccess} : here
     *    it is identifier of check box.</li>
     *  <li> <code>'XFilePickerControlAccess.ControlValue'</code> for
-    *      {@link ifc.ui._XFilePickerControlAccess} :
+    *      {@link ifc.ui.dialogs._XFilePickerControlAccess} :
     *      The value for control to set (since the initial value
     *      of the control is empty) .</li>
     * </ul>
diff --git a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java
index e9f3701b37b4..5b6321816d3a 100644
--- a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java
@@ -44,7 +44,6 @@ public class LayoutManager extends TestCase {
      * Cleanup: close the created document
      * @param tParam The test parameters.
      * @param log The log writer.
-     * @return The test environment.
      */
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
diff --git a/qadevOOo/tests/java/mod/_inv/Invocation.java b/qadevOOo/tests/java/mod/_inv/Invocation.java
index ff9a3f87b45b..c91a25b01037 100644
--- a/qadevOOo/tests/java/mod/_inv/Invocation.java
+++ b/qadevOOo/tests/java/mod/_inv/Invocation.java
@@ -47,19 +47,19 @@ public class Invocation extends TestCase {
     *     Object relations created :
     * <ul>
     *  <li> <code>'XSingleServiceFactory.createInstance.negative'</code> :
-    *   for interface {@link _ifc.lang.XSingleServiceFactory} ;
+    *   for interface {@link ifc.lang._XSingleServiceFactory} ;
     *   <code>String</code> relation; If its value 'true' then
     *   <code>createInstance</code> method for the object isn't
     *   supported. In this case object doesn't support this method.</li>
     *  <li> <code>'XSingleServiceFactory.arguments'</code> :
-    *   for interface {@link _ifc.lang.XSingleServiceFactory} ;
+    *   for interface {@link ifc.lang._XSingleServiceFactory} ;
     *   has <code>Object[]</code> type. This relation is used as
     *   a parameter for <code>createInstanceWithArguments</code>
     *   method call. If this relation doesn't exist test pass
-    *   zerro length array as argument. Here
+    *   zero length array as argument. Here
     *   <code>com.sun.star.io.Pipe</code> instance is passed.</li>
     *  <li> <code>'XSingleServiceFactory.MustSupport'</code> :
-    *   for interface {@link _ifc.lang.XSingleServiceFactory}.
+    *   for interface {@link ifc.lang._XSingleServiceFactory}.
     *   Specifies that created instance must support
     *   <code>com.sun.star.script.XInvocation</code> interface.
     * </ul>
diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java
index 7fb3a1308e7a..d1a4dac1050c 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java
@@ -137,7 +137,7 @@ public class DrawController_HandoutView extends TestCase {
     *      {@link ifc.frame._XController}(the current controller of the second
     *      created document) </li>
     *  <li> <code>'DrawPage'</code> for
-    *      {@link ifc.drawing.DrawingDocumentDrawView}(the draw page which will
+    *      {@link ifc.drawing._DrawingDocumentDrawView}(the draw page which will
     *      be new current page) </li>
     * </ul>
     * @see com.sun.star.frame.XModel
diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java
index 88ac142779fe..69b43dd777d0 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java
@@ -137,7 +137,7 @@ public class DrawController_NotesView extends TestCase {
     *      {@link ifc.frame._XController}(the current controller of the second
     *      created document) </li>
     *  <li> <code>'DrawPage'</code> for
-    *      {@link ifc.drawing.DrawingDocumentDrawView}(the draw page which will
+    *      {@link ifc.drawing._DrawingDocumentDrawView}(the draw page which will
     *      be new current page) </li>
     * </ul>
     * @see com.sun.star.frame.XModel
diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
index a63f29bbc0ba..2580717d8c49 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
@@ -137,7 +137,7 @@ public class DrawController_OutlineView extends TestCase {
     *      {@link ifc.frame._XController}(the current controller of the second
     *      created document) </li>
     *  <li> <code>'DrawPage'</code> for
-    *      {@link ifc.drawing.DrawingDocumentDrawView}(the draw page which will
+    *      {@link ifc.drawing._DrawingDocumentDrawView}(the draw page which will
     *      be new current page) </li>
     * </ul>
     * @see com.sun.star.frame.XModel
diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java
index 3fafbcb99954..4398a659f686 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java
@@ -137,7 +137,7 @@ public class DrawController_PresentationView extends TestCase {
     *      {@link ifc.frame._XController}(the current controller of the second
     *      created document) </li>
     *  <li> <code>'DrawPage'</code> for
-    *      {@link ifc.drawing.DrawingDocumentDrawView}(the draw page which will
+    *      {@link ifc.drawing._DrawingDocumentDrawView}(the draw page which will
     *      be new current page) </li>
     * </ul>
     * @see com.sun.star.frame.XModel
diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
index 1b8bcc50fc95..ae3a1e46ef22 100644
--- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
+++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
@@ -134,7 +134,7 @@ public class SdUnoDrawView extends TestCase {
     *      {@link ifc.frame._XController}(the current controller of the second
     *      created document) </li>
     *  <li> <code>'DrawPage'</code> for
-    *      {@link ifc.drawing.DrawingDocumentDrawView}(the draw page which will
+    *      {@link ifc.drawing._DrawingDocumentDrawView}(the draw page which will
     *      be new current page) </li>
     * </ul>
     * @see com.sun.star.frame.XModel