diff --git a/akka-actors/src/main/scala/actor/Actor.scala b/akka-actors/src/main/scala/actor/Actor.scala
index ca81a55131..0802719a64 100644
--- a/akka-actors/src/main/scala/actor/Actor.scala
+++ b/akka-actors/src/main/scala/actor/Actor.scala
@@ -21,7 +21,7 @@ import se.scalablesolutions.akka.util.Logging
 
 import org.codehaus.aspectwerkz.joinpoint.{MethodRtti, JoinPoint}
 
-import org.multiverse.utils.TransactionThreadLocal._
+import org.multiverse.utils.ThreadLocalTransaction._
 
 sealed abstract class LifecycleMessage
 case class Init(config: AnyRef) extends LifecycleMessage
diff --git a/akka-actors/src/main/scala/stm/Transaction.scala b/akka-actors/src/main/scala/stm/Transaction.scala
index 5b4f0717cf..29230e2d2b 100644
--- a/akka-actors/src/main/scala/stm/Transaction.scala
+++ b/akka-actors/src/main/scala/stm/Transaction.scala
@@ -12,7 +12,7 @@ import se.scalablesolutions.akka.util.Logging
 
 import org.multiverse.api.{Stm, Transaction => MultiverseTransaction}
 import org.multiverse.api.GlobalStmInstance.getGlobalStmInstance
-import org.multiverse.utils.TransactionThreadLocal._
+import org.multiverse.utils.ThreadLocalTransaction._
 import org.multiverse.templates.OrElseTemplate
 
 import scala.collection.mutable.HashMap
diff --git a/akka-actors/src/main/scala/stm/TransactionManagement.scala b/akka-actors/src/main/scala/stm/TransactionManagement.scala
index 2d92b7fa56..64ac76cbe6 100644
--- a/akka-actors/src/main/scala/stm/TransactionManagement.scala
+++ b/akka-actors/src/main/scala/stm/TransactionManagement.scala
@@ -12,7 +12,7 @@ import org.codehaus.aspectwerkz.proxy.Uuid
 
 import scala.collection.mutable.HashSet
 
-import org.multiverse.utils.TransactionThreadLocal._
+import org.multiverse.utils.ThreadLocalTransaction._
 
 class StmException(msg: String) extends RuntimeException(msg)
 
diff --git a/akka-actors/src/main/scala/stm/TransactionalState.scala b/akka-actors/src/main/scala/stm/TransactionalState.scala
index 1633203d7d..2081e04fdd 100644
--- a/akka-actors/src/main/scala/stm/TransactionalState.scala
+++ b/akka-actors/src/main/scala/stm/TransactionalState.scala
@@ -77,7 +77,7 @@ object TransactionalRef {
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 class TransactionalRef[T] extends Transactional {
-  import org.multiverse.utils.TransactionThreadLocal._
+  import org.multiverse.utils.ThreadLocalTransaction._
 
   private[this] val ref: Ref[T] = atomic { new Ref }
 
diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/stm/AtomicTemplate.java b/akka-util-java/src/main/java/se/scalablesolutions/akka/stm/AtomicTemplate.java
index 66adc5a6aa..d01d1c12a4 100644
--- a/akka-util-java/src/main/java/se/scalablesolutions/akka/stm/AtomicTemplate.java
+++ b/akka-util-java/src/main/java/se/scalablesolutions/akka/stm/AtomicTemplate.java
@@ -9,8 +9,8 @@ import org.multiverse.api.exceptions.LoadException;
 import org.multiverse.api.exceptions.RetryError;
 import org.multiverse.api.exceptions.TooManyRetriesException;
 import static org.multiverse.api.GlobalStmInstance.getGlobalStmInstance;
-import static org.multiverse.utils.TransactionThreadLocal.getThreadLocalTransaction;
-import static org.multiverse.utils.TransactionThreadLocal.setThreadLocalTransaction;
+import static org.multiverse.utils.ThreadLocalTransaction.getThreadLocalTransaction;
+import static org.multiverse.utils.ThreadLocalTransaction.setThreadLocalTransaction;
 
 import static java.lang.String.format;
 import java.util.logging.Logger;
@@ -60,7 +60,7 @@ public abstract class AtomicTemplate<E> {
 
     /**
      * Creates a new AtomicTemplate that uses the STM stored in the GlobalStm and works the the {@link
-     * org.multiverse.utils.TransactionThreadLocal}.
+     * org.multiverse.utils.ThreadLocalTransaction}.
      */
     public AtomicTemplate() {
         this(getGlobalStmInstance());
@@ -72,7 +72,7 @@ public abstract class AtomicTemplate<E> {
 
     /**
      * Creates a new AtomicTemplate using the provided stm. The transaction used is stores/retrieved from the {@link
-     * org.multiverse.utils.TransactionThreadLocal}.
+     * org.multiverse.utils.ThreadLocalTransaction}.
      *
      * @param stm the stm to use for transactions.
      * @throws NullPointerException if stm is null.
@@ -274,7 +274,7 @@ public abstract class AtomicTemplate<E> {
                         if (abort) {
                             t.abort();
                             if (reset) {
-                                t.reset();
+                                t.restart();
                             }
                         }
                     }