64 files changed, 44 insertions, 44 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java
index 5beafe71e24..05628a72ed0 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java
@@ -22,7 +22,6 @@ package org.sonar.core.persistence;
 import com.google.common.collect.ImmutableList;
 import org.sonar.core.dashboard.ActiveDashboardDao;
 import org.sonar.core.dashboard.DashboardDao;
-import org.sonar.core.debt.db.CharacteristicDao;
 import org.sonar.core.duplication.DuplicationDao;
 import org.sonar.core.graph.jdbc.GraphDao;
 import org.sonar.core.issue.db.*;
@@ -42,6 +41,7 @@ import org.sonar.core.rule.RuleDao;
 import org.sonar.core.rule.RuleTagDao;
 import org.sonar.core.source.db.SnapshotDataDao;
 import org.sonar.core.source.db.SnapshotSourceDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
 import org.sonar.core.template.LoadedTemplateDao;
 import org.sonar.core.user.*;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
index f1fd87442c5..8325bd831cd 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
@@ -36,8 +36,6 @@ import org.sonar.core.component.ComponentDto;
 import org.sonar.core.component.db.ComponentMapper;
 import org.sonar.core.config.Logback;
 import org.sonar.core.dashboard.*;
-import org.sonar.core.debt.db.CharacteristicDto;
-import org.sonar.core.debt.db.CharacteristicMapper;
 import org.sonar.core.dependency.DependencyDto;
 import org.sonar.core.dependency.DependencyMapper;
 import org.sonar.core.dependency.ResourceSnapshotDto;
@@ -65,6 +63,8 @@ import org.sonar.core.rule.*;
 import org.sonar.core.source.db.SnapshotDataDto;
 import org.sonar.core.source.db.SnapshotDataMapper;
 import org.sonar.core.source.db.SnapshotSourceMapper;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicMapper;
 import org.sonar.core.template.LoadedTemplateDto;
 import org.sonar.core.template.LoadedTemplateMapper;
 import org.sonar.core.user.*;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java
index 6a702d68d23..9ed88aa6004 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.ibatis.session.SqlSession;
@@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.ServerExtension;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.List;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java
index 343714038ff..384584d0c9e 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.stax2.XMLInputFactory2;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java
index ca4de29cabe..d6bf39e74f3 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java
index eb9fe925ef2..823064f6204 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 
 import org.sonar.api.rule.RuleKey;
@@ -27,8 +27,8 @@ import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.technicaldebt.server.Characteristic;
 import org.sonar.api.technicaldebt.server.TechnicalDebtManager;
 import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java
index 4cb950dc926..6c9c50d55e4 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java
index 927e3753ff1..20ab3c0f3c6 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java
index f5703a43f71..fef9f7b23cd 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -31,9 +31,9 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.java
index 92b1f07a6f4..d5a098a2e45 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Maps;
 import org.sonar.api.rule.RuleKey;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
index 6c46bf9fda0..12c307dd004 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
@@ -38,7 +38,7 @@ import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import javax.annotation.CheckForNull;
 import javax.xml.stream.XMLInputFactory;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java
index 923287699cc..6e6ff49879a 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java
index 23eb8a252fd..18a1bb9034d 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java
index 1e5243b4be0..7ab1b291874 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import java.util.List;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java
index 46a651d70ec..815db165b0b 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/package-info.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
 @ParametersAreNonnullByDefault
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt.db;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java
index b003c97e676..268f4dbbc54 100644
--- a/sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java
@@ -17,8 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 @ParametersAreNonnullByDefault
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml
index ff16da14c8b..2988115ae16 100644
--- a/sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd">
 
-<mapper namespace="org.sonar.core.debt.db.CharacteristicMapper">
+<mapper namespace="org.sonar.core.technicaldebt.db.CharacteristicMapper">
 
   <sql id="characteristicColumns">
     c.id,
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java
index 4030cc8c3c5..814e12fa54f 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
@@ -32,9 +32,9 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.utils.ValidationMessages;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.Collections;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java
index c68f4ace3d5..ef655066c4b 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java
index 9e8d7c953c4..822c4682419 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 
 public class DebtModelPluginRepositoryTest {
 
-  private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/debt/TechnicalDebtModelRepositoryTest/";
+  private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/";
 
   private DebtModelPluginRepository modelFinder;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java
index ef7001eadf5..9095488504c 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,8 @@ import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.technicaldebt.server.Characteristic;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.util.List;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java
index a3c9dd745b8..ef857e167d1 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java
index 8caa1a4c127..64865e9dc5b 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java
index 0244c420646..b49190b6f2f 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
@@ -36,9 +36,9 @@ import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic;
 import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement;
 import org.sonar.api.utils.ValidationMessages;
 import org.sonar.api.utils.internal.WorkDuration;
-import org.sonar.core.debt.db.CharacteristicDao;
-import org.sonar.core.debt.db.CharacteristicDto;
 import org.sonar.core.persistence.MyBatis;
+import org.sonar.core.technicaldebt.db.CharacteristicDao;
+import org.sonar.core.technicaldebt.db.CharacteristicDto;
 
 import java.io.Reader;
 import java.util.Collections;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.java
index 0cb884e894d..7185f7910c1 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.collect.Lists;
 import org.fest.assertions.Assertions;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
index ad7f8d0b808..64c5dea9492 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt;
+package org.sonar.core.technicaldebt;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java
index 928f8de3c55..0e4341ab81c 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java
index 7867f132795..f6730185360 100644
--- a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.debt.db;
+package org.sonar.core.technicaldebt.db;
 
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml
index 3abb870623d..3abb870623d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml
index bc7f7569560..bc7f7569560 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
index 9ebc69b94a6..9ebc69b94a6 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
index 4b8ae3f6475..4b8ae3f6475 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml
index bb6bdbb4afb..bb6bdbb4afb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml
index bcf3ed867d3..bcf3ed867d3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml
index 6c7d153992c..6c7d153992c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_constant_issue.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_constant_issue.xml
index 86b1f551fbe..86b1f551fbe 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_constant_issue.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_constant_issue.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear.xml
index f641a5185ec..f641a5185ec 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml
index d1af28f5a4c..d1af28f5a4c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_rules.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_rules.xml
index d035d7bde00..d035d7bde00 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_rules.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml
index 3254fef60ce..3254fef60ce 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml
index f05e51228b3..f05e51228b3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/csharp-model.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/csharp-model.xml
index e4569a2a7bf..e4569a2a7bf 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/csharp-model.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/csharp-model.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/java-model.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/java-model.xml
index 0b37f562107..0b37f562107 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/java-model.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/java-model.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml
index bcf3ed867d3..bcf3ed867d3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/import_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml
index bc7f7569560..bc7f7569560 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/import_characteristics.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml
index 6c7d153992c..6c7d153992c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml
index 4b8ae3f6475..4b8ae3f6475 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml
index 9ebc69b94a6..9ebc69b94a6 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml
index f641a5185ec..f641a5185ec 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml
index d12f70d0e2d..d12f70d0e2d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
index 2898f458e3f..2898f458e3f 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml
index bb6bdbb4afb..bb6bdbb4afb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml
index f83ca7952da..f83ca7952da 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable-result.xml
index 81b97e0b518..81b97e0b518 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable-result.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable.xml
index a970b324456..a970b324456 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_characteristic-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml
index b6e2d5df640..b6e2d5df640 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_characteristic-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_requirement-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_requirement-result.xml
index 2b1ccb8fd6b..2b1ccb8fd6b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_requirement-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_requirement-result.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml
index c8200af2825..c8200af2825 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml
index 00a47fd34cc..00a47fd34cc 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml
index d84c39d5d41..d84c39d5d41 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml
index 026a50563e0..026a50563e0 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml
index b4817ece8fa..b4817ece8fa 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement-result.xml
index 71c4150f0cf..71c4150f0cf 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement-result.xml
diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement.xml
index 2b1ccb8fd6b..2b1ccb8fd6b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement.xml