diff --git a/akka-http/src/main/scala/EmbeddedAppServer.scala b/akka-http/src/main/scala/EmbeddedAppServer.scala
index 1b6f31e479..d46cb775c5 100644
--- a/akka-http/src/main/scala/EmbeddedAppServer.scala
+++ b/akka-http/src/main/scala/EmbeddedAppServer.scala
@@ -21,23 +21,25 @@ import org.eclipse.jetty.server.handler.{HandlerList, HandlerCollection, Context
  * Handles the Akka Comet Support (load/unload)
  */
 trait EmbeddedAppServer extends Bootable with Logging {
-  self : BootableActorLoaderService =>
+  self: BootableActorLoaderService =>
 
   import akka.config.Config._
 
-  val REST_HOSTNAME = config.getString("akka.rest.hostname", "localhost")
-  val REST_PORT = config.getInt("akka.rest.port", 9998)
+  val REST_HOSTNAME = config.getString("akka.http.hostname", "localhost")
+  val REST_PORT = config.getInt("akka.http.port", 9998)
+
+  val isRestEnabled = config.getList("akka.enabled-modules").exists(_ == "http")
 
   protected var server: Option[Server] = None
 
   abstract override def onLoad = {
     super.onLoad
-    if (config.getBool("akka.rest.service", true)) {
-      log.info("Attempting to start Akka REST service (Jersey)")
+    if (isRestEnabled) {
+      log.info("Attempting to start Akka HTTP service")
 
-      System.setProperty("jetty.port",REST_PORT.toString)
-      System.setProperty("jetty.host",REST_HOSTNAME)
-      System.setProperty("jetty.home",HOME.getOrElse(throwNoAkkaHomeException) + "/deploy/root")
+      System.setProperty("jetty.port", REST_PORT.toString)
+      System.setProperty("jetty.host", REST_HOSTNAME)
+      System.setProperty("jetty.home", HOME.getOrElse(throwNoAkkaHomeException) + "/deploy/root")
 
       val configuration = new XmlConfiguration(
         new File(HOME.getOrElse(throwNoAkkaHomeException) + "/config/microkernel-server.xml").toURI.toURL)
@@ -58,16 +60,15 @@ trait EmbeddedAppServer extends Bootable with Logging {
          s.start()
          s
       }
-      log.info("Akka REST service started (Jersey)")
+      log.info("Akka HTTP service started")
     }
   }
 
   abstract override def onUnload = {
     super.onUnload
-    server foreach { t => {
+    server foreach { t =>
       log.info("Shutting down REST service (Jersey)")
       t.stop()
-      }
     }
   }
 }
diff --git a/akka-http/src/main/scala/ListWriter.scala b/akka-http/src/main/scala/ListWriter.scala
index 3a2c69d02a..b2addd6cd7 100644
--- a/akka-http/src/main/scala/ListWriter.scala
+++ b/akka-http/src/main/scala/ListWriter.scala
@@ -1,10 +1,11 @@
 /**
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
-package akka.rest
+package akka.http
+
+import akka.serialization.Serializer
 
 import java.io.OutputStream
-import akka.serialization.Serializer
 import javax.ws.rs.core.{MultivaluedMap, MediaType}
 import javax.ws.rs.ext.{MessageBodyWriter, Provider}
 import javax.ws.rs.Produces
diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala
index b6aec9a1f0..e9152970fa 100644
--- a/akka-http/src/main/scala/Security.scala
+++ b/akka-http/src/main/scala/Security.scala
@@ -101,8 +101,8 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging {
   }
 
   lazy val authenticatorFQN = {
-    val auth = Config.config.getString("akka.rest.authenticator", "N/A")
-    if (auth == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'")
+    val auth = Config.config.getString("akka.http.authenticator", "N/A")
+    if (auth == "N/A") throw new IllegalActorStateException("The config option 'akka.http.authenticator' is not defined in 'akka.conf'")
     auth
   }
 
@@ -399,8 +399,8 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w
    * principal name for the HTTP kerberos service, i.e HTTP/  { server } @  { realm }
    */
   lazy val servicePrincipal = {
-    val p = Config.config.getString("akka.rest.kerberos.servicePrincipal", "N/A")
-    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.servicePrincipal' is not defined in 'akka.conf'")
+    val p = Config.config.getString("akka.http.kerberos.servicePrincipal", "N/A")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.http.kerberos.servicePrincipal' is not defined in 'akka.conf'")
     p
   }
 
@@ -408,21 +408,21 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w
    * keytab location with credentials for the service principal
    */
   lazy val keyTabLocation = {
-    val p = Config.config.getString("akka.rest.kerberos.keyTabLocation", "N/A")
-    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'")
+    val p = Config.config.getString("akka.http.kerberos.keyTabLocation", "N/A")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.http.kerberos.keyTabLocation' is not defined in 'akka.conf'")
     p
   }
 
   lazy val kerberosDebug = {
-    val p = Config.config.getString("akka.rest.kerberos.kerberosDebug", "N/A")
-    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.kerberosDebug' is not defined in 'akka.conf'")
+    val p = Config.config.getString("akka.http.kerberos.kerberosDebug", "N/A")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.http.kerberos.kerberosDebug' is not defined in 'akka.conf'")
     p
   }
 
   /**
    * is not used by this authenticator, so accept an empty value
    */
-  lazy val realm = Config.config.getString("akka.rest.kerberos.realm", "")
+  lazy val realm = Config.config.getString("akka.http.kerberos.realm", "")
 
   /**
    * verify the kerberos token from a client with the server