diff --git a/akka-actors/src/main/scala/actor/ActorRegistry.scala b/akka-actors/src/main/scala/actor/ActorRegistry.scala
index 2a534918d1..6247d4d93e 100755
--- a/akka-actors/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-actors/src/main/scala/actor/ActorRegistry.scala
@@ -16,18 +16,20 @@ import scala.collection.jcl.HashMap
 object ActorRegistry extends Logging {
   private val actors = new HashMap[String, List[Actor]]
 
-  def actorsFor(clazz: Class[_]): List[Actor] = synchronized {
-    actors.get(clazz.getName) match {
+  def actorsFor(fqn : String): List[Actor] = synchronized {
+    actors.get(fqn) match {
       case None => Nil
       case Some(instances) => instances
     }
   }
-
+ 
+  def actorsFor(clazz: Class[_]) : List[Actor] = actorsFor(clazz.getName)
+  
   def register(actor: Actor) = synchronized {
     val name = actor.getClass.getName
     actors.get(name) match {
       case Some(instances) => actors + (name -> (actor :: instances))
-      case None =>            actors + (name -> (actor :: Nil))
+      case None => actors + (name -> (actor :: Nil))
     }
   }
 }
diff --git a/akka-actors/src/main/scala/actor/Scheduler.scala b/akka-actors/src/main/scala/actor/Scheduler.scala
index 42e4b7485a..03404eda9d 100644
--- a/akka-actors/src/main/scala/actor/Scheduler.scala
+++ b/akka-actors/src/main/scala/actor/Scheduler.scala
@@ -11,11 +11,12 @@
  * limitations under the License.
  */
 
-package se.scalablesolutions.akka.util
+package se.scalablesolutions.akka.actor
 
 import java.util.concurrent._
-import actor.{OneForOneStrategy, Actor}
 import config.ScalaConfig._
+import _root_.se.scalablesolutions.akka.util.{Logging}
+
 
 import org.scala_tools.javautils.Imports._
 
diff --git a/akka-actors/src/test/scala/AllTest.scala b/akka-actors/src/test/scala/AllTest.scala
index 0132daea26..6e782232e7 100644
--- a/akka-actors/src/test/scala/AllTest.scala
+++ b/akka-actors/src/test/scala/AllTest.scala
@@ -4,9 +4,8 @@ import junit.framework.Test
 import junit.framework.TestCase
 import junit.framework.TestSuite
 
-import actor.{ActorSpec, RemoteActorSpec, InMemoryActorSpec, SupervisorSpec, RemoteSupervisorSpec}
+import actor.{ActorSpec, RemoteActorSpec, InMemoryActorSpec, SupervisorSpec, RemoteSupervisorSpec,SchedulerSpec}
 import reactor.{EventBasedSingleThreadDispatcherTest, EventBasedThreadPoolDispatcherTest}
-import util.SchedulerSpec
 
 object AllTest extends TestCase {
   def suite(): Test = {
diff --git a/akka-actors/src/test/scala/SchedulerSpec.scala b/akka-actors/src/test/scala/SchedulerSpec.scala
index c1ee474ecf..b7b801bce6 100644
--- a/akka-actors/src/test/scala/SchedulerSpec.scala
+++ b/akka-actors/src/test/scala/SchedulerSpec.scala
@@ -1,6 +1,4 @@
-package se.scalablesolutions.akka.util
-
-import se.scalablesolutions.akka.actor.Actor
+package se.scalablesolutions.akka.actor
 
 import java.util.concurrent.TimeUnit