1.1 --- a/hintsimpl/nbproject/genfiles.properties	Sun Oct 16 19:56:30 2011 +0200
     1.2 +++ b/hintsimpl/nbproject/genfiles.properties	Mon Oct 17 15:25:39 2011 +0200
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
     1.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     1.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     1.7 -nbproject/build-impl.xml.data.CRC32=5252e7c1
     1.8 +nbproject/build-impl.xml.data.CRC32=2dfd5d11
     1.9  nbproject/build-impl.xml.script.CRC32=9204f652
    1.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
    1.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47

     2.1 --- a/hintsimpl/nbproject/project.xml	Sun Oct 16 19:56:30 2011 +0200
     2.2 +++ b/hintsimpl/nbproject/project.xml	Mon Oct 17 15:25:39 2011 +0200
     2.3 @@ -254,12 +254,12 @@
     2.4                          <compile-dependency/>
     2.5                      </test-dependency>
     2.6                      <test-dependency>
     2.7 -                        <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
     2.8 +                        <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
     2.9 +                        <recursive/>
    2.10                          <compile-dependency/>
    2.11 -                        <test/>
    2.12                      </test-dependency>
    2.13                      <test-dependency>
    2.14 -                        <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
    2.15 +                        <code-name-base>org.netbeans.modules.java.hints.declarative.test</code-name-base>
    2.16                          <recursive/>
    2.17                          <compile-dependency/>
    2.18                      </test-dependency>

     3.1 --- a/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/HintsTest.java	Sun Oct 16 19:56:30 2011 +0200
     3.2 +++ b/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/HintsTest.java	Mon Oct 17 15:25:39 2011 +0200
     3.3 @@ -40,7 +40,7 @@
     3.4  package org.netbeans.modules.jackpot30.hintsimpl;
     3.5  
     3.6  import junit.framework.TestSuite;
     3.7 -import org.netbeans.modules.jackpot30.file.test.spi.DeclarativeHintsTestBase;
     3.8 +import org.netbeans.modules.java.hints.declarative.test.api.DeclarativeHintsTestBase;
     3.9  
    3.10  /**
    3.11   *