diff --git a/akka-core/src/main/scala/actor/Supervisor.scala b/akka-core/src/main/scala/actor/Supervisor.scala
index c13a345efc..ecbbf9bb9d 100644
--- a/akka-core/src/main/scala/actor/Supervisor.scala
+++ b/akka-core/src/main/scala/actor/Supervisor.scala
@@ -134,7 +134,7 @@ sealed class Supervisor private[akka] (
     this
   }
 
-  def shutdown: Unit = supervisor.stop
+  def shutdown(): Unit = supervisor.stop
 
   def link(child: ActorRef) = supervisor.link(child)
 
@@ -183,7 +183,7 @@ final class SupervisorActor private[akka] (
   trapExit = trapExceptions
   faultHandler = Some(handler)
 
-  override def shutdown: Unit = shutdownLinkedActors
+  override def shutdown(): Unit = shutdownLinkedActors
 
   def receive = {
     case unknown => throw new SupervisorException(
diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
index 8d42b3c8fc..48b42847a0 100644
--- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@@ -133,7 +133,7 @@ class ExecutorBasedEventDrivenDispatcher(_name: String, throughput: Int = Dispat
 
   def usesActorMailbox = true
 
-  def ensureNotActive: Unit = if (active) throw new IllegalActorStateException(
+  def ensureNotActive(): Unit = if (active) throw new IllegalActorStateException(
     "Can't build a new thread pool for a dispatcher that is already up and running")
 
   private[akka] def init = withNewThreadPoolWithLinkedBlockingQueueWithUnboundedCapacity.buildThreadPool
diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
index a602eab223..94ef0a2e67 100644
--- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
@@ -162,7 +162,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher(_name: String) extends Mess
     references.clear
   }
 
-  def ensureNotActive: Unit = if (active) throw new IllegalActorStateException(
+  def ensureNotActive(): Unit = if (active) throw new IllegalActorStateException(
     "Can't build a new thread pool for a dispatcher that is already up and running")
 
   private[akka] def init = withNewThreadPoolWithLinkedBlockingQueueWithUnboundedCapacity.buildThreadPool
diff --git a/akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala
index 09961d8eb0..3e44cf9f6a 100644
--- a/akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcher.scala
@@ -139,7 +139,7 @@ class ReactorBasedThreadPoolEventDrivenDispatcher(_name: String)
 
   def usesActorMailbox = false
 
-  def ensureNotActive: Unit = if (active) throw new IllegalActorStateException(
+  def ensureNotActive(): Unit = if (active) throw new IllegalActorStateException(
     "Can't build a new thread pool for a dispatcher that is already up and running")
 
   class Demultiplexer(private val messageQueue: ReactiveMessageQueue) extends MessageDemultiplexer {
diff --git a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala
index 6f1d11e14e..a111ae87a5 100644
--- a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala
+++ b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala
@@ -31,7 +31,7 @@ trait ThreadPoolBuilder {
 
   def isShutdown = executor.isShutdown
 
-  def buildThreadPool: Unit = synchronized {
+  def buildThreadPool(): Unit = synchronized {
     ensureNotActive
     inProcessOfBuilding = false
     if (boundedExecutorBound > 0) {
@@ -152,7 +152,7 @@ trait ThreadPoolBuilder {
       "Is not in the process of building a thread pool, start building one by invoking one of the 'newThreadPool*' methods")
   }
 
-  def ensureNotActive: Unit
+  def ensureNotActive(): Unit
 
   /**
    * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
diff --git a/akka-core/src/main/scala/remote/Cluster.scala b/akka-core/src/main/scala/remote/Cluster.scala
index 4f2ece95fe..f1c3633944 100644
--- a/akka-core/src/main/scala/remote/Cluster.scala
+++ b/akka-core/src/main/scala/remote/Cluster.scala
@@ -251,7 +251,7 @@ object Cluster extends Cluster with Logging {
 
   def foreach(f: (RemoteAddress) => Unit): Unit = clusterActor.foreach(_.foreach(f))
 
-  def start: Unit = start(None)
+  def start(): Unit = start(None)
 
   def start(serializerClassLoader: Option[ClassLoader]): Unit = synchronized {
     log.info("Starting up Cluster Service...")
@@ -274,7 +274,7 @@ object Cluster extends Cluster with Logging {
     }
   }
 
-  def shutdown: Unit = synchronized {
+  def shutdown(): Unit = synchronized {
     log.info("Shutting down Cluster Service...")
     for {
       c <- clusterActorRef
diff --git a/akka-core/src/main/scala/remote/JGroupsClusterActor.scala b/akka-core/src/main/scala/remote/JGroupsClusterActor.scala
index 4d04d87063..847985e3d3 100644
--- a/akka-core/src/main/scala/remote/JGroupsClusterActor.scala
+++ b/akka-core/src/main/scala/remote/JGroupsClusterActor.scala
@@ -38,10 +38,10 @@ class JGroupsClusterActor extends BasicClusterActor {
         def suspect(a: Address): Unit =
           if (isActive) self ! Zombie(a)
 
-        def block: Unit =
+        def block(): Unit =
           log debug "UNSUPPORTED: JGroupsClusterActor::block" //TODO HotSwap to a buffering body
 
-        def unblock: Unit =
+        def unblock(): Unit =
           log debug "UNSUPPORTED: JGroupsClusterActor::unblock" //TODO HotSwap back and flush the buffer
       })
     })
@@ -52,7 +52,7 @@ class JGroupsClusterActor extends BasicClusterActor {
   protected def toOneNode(dest : Address, msg: Array[Byte]): Unit =
     for (c <- channel) c.send(new JG_MSG(dest, null, msg))
 
-  protected def toAllNodes(msg : Array[Byte]) : Unit =
+  protected def toAllNodes(msg : Array[Byte]): Unit =
     for (c <- channel) c.send(new JG_MSG(null, null, msg))
 
   override def shutdown = {
diff --git a/akka-core/src/main/scala/stm/Transaction.scala b/akka-core/src/main/scala/stm/Transaction.scala
index b4fb0cda4c..54f20a3504 100644
--- a/akka-core/src/main/scala/stm/Transaction.scala
+++ b/akka-core/src/main/scala/stm/Transaction.scala
@@ -191,13 +191,13 @@ trait Transactional {
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 trait Committable {
-  def commit: Unit
+  def commit(): Unit
 }
 
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 trait Abortable {
-  def abort: Unit
+  def abort(): Unit
 }
 
diff --git a/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala b/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
index 3603760953..8ad3e3f212 100644
--- a/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
+++ b/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
@@ -84,7 +84,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcherSpec extends JUnitSuite with
     fast.stop
   }
 
-  @Test def canNotUseActorsOfDifferentTypesInSameDispatcher: Unit = {
+  @Test def canNotUseActorsOfDifferentTypesInSameDispatcher(): Unit = {
     val first = actorOf[FirstActor]
     val second = actorOf[SecondActor]
 
@@ -94,7 +94,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcherSpec extends JUnitSuite with
     }
   }
 
-  @Test def canNotUseActorsOfDifferentSubTypesInSameDispatcher: Unit = {
+  @Test def canNotUseActorsOfDifferentSubTypesInSameDispatcher(): Unit = {
     val parent = actorOf[ParentActor]
     val child = actorOf[ChildActor]