diff --git a/.travis.yml b/.travis.yml
index af678cb7e..4a957d544 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ after_success:
       make install DESTDIR=../../kcov-build &&
       cd ../.. &&
       rm -rf kcov-master &&
-      for file in target/debug/actix_http-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
+      for file in target/debug/actix_web-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
       for file in target/debug/test_*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
       bash <(curl -s https://codecov.io/bash) &&
       echo "Uploaded code coverage"
diff --git a/Cargo.toml b/Cargo.toml
index 8b00260c1..f940803da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,20 +1,19 @@
 [package]
-name = "actix-http"
+name = "actix-web"
 version = "0.1.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-description = "Actix http support"
+description = "Actix web framework"
 readme = "README.md"
-keywords = ["actor", "http"]
-homepage = "https://github.com/fafhrd91/actix-http"
-repository = "https://github.com/fafhrd91/actix-http.git"
-documentation = "https://fafhrd91.github.io/actix-http/actix-http/"
+keywords = ["actor", "http", "web"]
+homepage = "https://github.com/fafhrd91/actix-web"
+repository = "https://github.com/fafhrd91/actix-web.git"
 categories = ["network-programming", "asynchronous"]
 license = "Apache-2.0"
 exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
 build = "build.rs"
 
 [lib]
-name = "actix_http"
+name = "actix_web"
 path = "src/lib.rs"
 
 [[bin]]
diff --git a/README.md b/README.md
index 022bd00e8..091a630b4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Actix http is a server http framework for Actix framework.
 
-* [API Documentation](http://fafhrd91.github.io/actix-http/actix_http/)
+* [API Documentation](http://fafhrd91.github.io/actix-web/actix_web/)
 * Cargo package: [actix-http](https://crates.io/crates/actix-http)
 * Minimum supported Rust version: 1.20 or later
 
@@ -15,29 +15,29 @@ Actix http is licensed under the [Apache-2.0 license](http://opensource.org/lice
   * HTTP 1.1 and 1.0 support
   * Streaming and pipelining support
   * Keep-alive and slow requests support
-  * [WebSockets support](https://fafhrd91.github.io/actix-http/actix_http/ws/index.html)
-  * [Configurable request routing](https://fafhrd91.github.io/actix-http/actix_http/struct.RoutingMap.html)
+  * [WebSockets support](https://fafhrd91.github.io/actix-web/actix_web/ws/index.html)
+  * [Configurable request routing](https://fafhrd91.github.io/actix-web/actix_web/struct.RoutingMap.html)
 
 ## Usage
 
-To use `actix-http`, add this to your `Cargo.toml`:
+To use `actix-web`, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-actix-http = { git = "https://github.com/fafhrd91/actix-http.git" }
+actix-web = { git = "https://github.com/fafhrd91/actix-web.git" }
 ```
 
 ## Example
 
 ```rust
 extern crate actix;
-extern crate actix_http;
+extern crate actix_web;
 extern crate futures;
 use std::net;
 use std::str::FromStr;
 
 use actix::prelude::*;
-use actix_http::*;
+use actix_web::*;
 
 // Route
 struct MyRoute;
diff --git a/src/dev.rs b/src/dev.rs
index 11e097bf3..32942fe74 100644
--- a/src/dev.rs
+++ b/src/dev.rs
@@ -1,11 +1,11 @@
-//! The `actix-http` prelude for library developers
+//! The `actix-web` prelude for library developers
 //!
 //! The purpose of this module is to alleviate imports of many common actix traits
 //! by adding a glob import to the top of actix heavy modules:
 //!
 //! ```
 //! # #![allow(unused_imports)]
-//! use actix_http::dev::*;
+//! use actix_web::dev::*;
 //! ```
 pub use ws;
 pub use httpcodes;
diff --git a/src/main.rs b/src/main.rs
index 97e18c51d..0fd4e2bca 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 // #![feature(try_trait)]
 #![allow(dead_code, unused_variables)]
 extern crate actix;
-extern crate actix_http;
+extern crate actix_web;
 extern crate tokio_core;
 extern crate env_logger;
 
@@ -9,7 +9,7 @@ use std::net;
 use std::str::FromStr;
 
 use actix::prelude::*;
-use actix_http::*;
+use actix_web::*;
 
 struct MyRoute {req: Option<HttpRequest>}
 
diff --git a/src/ws.rs b/src/ws.rs
index 55e31568a..58130430d 100644
--- a/src/ws.rs
+++ b/src/ws.rs
@@ -7,9 +7,9 @@
 //!
 //! ```rust
 //! extern crate actix;
-//! extern crate actix_http;
+//! extern crate actix_web;
 //! use actix::prelude::*;
-//! use actix_http::*;
+//! use actix_web::*;
 //!
 //! // WebSocket Route
 //! struct WsRoute;