killbill-aplcache

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuite.java b/util/src/test/java/com/ning/billing/KillbillTestSuite.java
index b3bc530..dc61c5e 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuite.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuite.java
@@ -27,14 +27,14 @@ public class KillbillTestSuite {
     private static final Logger log = LoggerFactory.getLogger(KillbillTestSuite.class);
 
     @BeforeMethod(alwaysRun = true)
-    public void startTest(final Method method) throws Exception {
+    public void startTestSuite(final Method method) throws Exception {
         log.info("***************************************************************************************************");
         log.info("*** Starting test {}:{}", method.getDeclaringClass().getName(), method.getName());
         log.info("***************************************************************************************************");
     }
 
     @AfterMethod(alwaysRun = true)
-    public void endTest(final Method method) throws Exception {
+    public void endTestSuite(final Method method) throws Exception {
         log.info("***************************************************************************************************");
         log.info("***   Ending test {}:{}", method.getDeclaringClass().getName(), method.getName());
         log.info("***************************************************************************************************");

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
index 163164e..9189fe5 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
@@ -34,14 +34,14 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
     }
 
     @BeforeSuite(groups = "slow")
-    public void startMysql() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
+    public void startMysqlBeforeTestSuite() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
         helper.startMysql();
         helper.initDb();
         helper.cleanupAllTables();
     }
 
     @BeforeMethod(groups = "slow")
-    public void cleanup() {
+    public void cleanupTablesBetweenMethods() {
         try {
             helper.cleanupAllTables();
         } catch (Exception ignored) {
@@ -49,7 +49,7 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
     }
 
     @AfterSuite(groups = "slow")
-    public void shutdownMysql() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
+    public void shutdownMysqlAfterTestSuite() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
         try {
             helper.cleanupAllTables();
             helper.stopMysql();