diff --git a/.travis.yml b/.travis.yml
index 564af9b04f..aa2f122f1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_script:
   - mkdir src
   - shopt -s extglob dotglob
   - mv !(src) src
-  - gclient config https://widevine-internal.googlesource.com/packager.git --name=src --unmanaged
+  - gclient config https://github.com/google/shaka-packager.git --name=src --unmanaged
   - gclient sync
   - cd src
   - ninja -C out/${BUILD_TYPE}
diff --git a/AUTHORS b/AUTHORS
index ce3ab7a05c..7e29e120bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-# This is the official list of edash-packager authors for copyright purposes.
+# This is the official list of shaka-packager authors for copyright purposes.
 # This file is distinct from the CONTRIBUTORS files.
 # See the latter for an explanation.
 #
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd3e2eabef..f6dad9c8ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -151,9 +151,9 @@ First public release.
 - Added mpd_generator driver program to generate mpd file from packager generated
   intermediate files.
 
-[1.4.0]: https://github.com/google/edash-packager/compare/v1.3.1...v1.4.0
-[1.3.1]: https://github.com/google/edash-packager/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/google/edash-packager/compare/v1.2.0...v1.3.0
-[1.2.1]: https://github.com/google/edash-packager/compare/v1.2.0...v1.2.1
-[1.2.0]: https://github.com/google/edash-packager/compare/v1.1...v1.2.0
-[1.1.0]: https://github.com/google/edash-packager/compare/v1.0...v1.1
+[1.4.0]: https://github.com/google/shaka-packager/compare/v1.3.1...v1.4.0
+[1.3.1]: https://github.com/google/shaka-packager/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/google/shaka-packager/compare/v1.2.0...v1.3.0
+[1.2.1]: https://github.com/google/shaka-packager/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/google/shaka-packager/compare/v1.1...v1.2.0
+[1.1.0]: https://github.com/google/shaka-packager/compare/v1.0...v1.1
diff --git a/Dockerfile b/Dockerfile
index 8e4ae74971..035320c8f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,10 @@ RUN apt-get install -y \
 RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 ENV PATH /depot_tools:$PATH
 
-# install edash-packager
-RUN mkdir edash_packager
-WORKDIR edash_packager
-RUN gclient config https://www.github.com/google/edash-packager.git --name=src
+# install shaka-packager
+RUN mkdir shaka_packager
+WORKDIR shaka_packager
+RUN gclient config https://www.github.com/google/shaka-packager.git --name=src
 RUN gclient sync --no-history
 RUN cd src && ninja -C out/Release
-ENV PATH /edash_packager/src/out/Release:$PATH
+ENV PATH /shaka_packager/src/out/Release:$PATH
diff --git a/README.md b/README.md
index 0592b30168..14a4572fb6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/google/edash-packager.svg?branch=master)](https://travis-ci.org/google/edash-packager)
+![Shaka Packager](docs/shaka-packager.png)
+
+[![Build Status](https://travis-ci.org/google/shaka-packager.svg?branch=master)](https://travis-ci.org/google/shaka-packager)
 
 Media packaging SDK intended for C++ programmers writing DASH packager applications with common encryption support, Widevine DRM support, Live, and Video-On-Demand.
 
@@ -20,16 +22,16 @@ Current supported codecs:
 ** I for input and O for output.
 ** We will update this table once new formats are supported.
 
-Right now this project is supported directly on Linux and MacOSX platforms only. One option to run edash-packager on other platforms is using [docker] (#Using docker for testing /development).
+Right now this project is supported directly on Linux and MacOSX platforms only. One option to run shaka-packager on other platforms is using [docker] (#Using docker for testing /development).
 
 
 # Mailing list #
 
-We have a [public mailing list](https://groups.google.com/forum/#!forum/edash-users) for discussion and announcements. To receive notifications about new versions, please join the list. You can also use the list to ask questions or discuss eDash Packager developments.
+We have a [public mailing list](https://groups.google.com/forum/#!forum/shaka-packager-users) for discussion and announcements. To receive notifications about new versions, please join the list. You can also use the list to ask questions or discuss Shaka Packager developments.
 
 # Setting up for development #
 
-1. Packager source is managed by Git at https://www.github.com/google/edash-packager. We use gclient tool from Chromium to manage third party libraries. You will need Git (v1.7.5 or above) installed on your machine to access the source code.
+1. Packager source is managed by Git at https://www.github.com/google/shaka-packager. We use gclient tool from Chromium to manage third party libraries. You will need Git (v1.7.5 or above) installed on your machine to access the source code.
 
 2. Install Chromium depot tools which contains gclient and ninja
 
@@ -38,9 +40,9 @@ We have a [public mailing list](https://groups.google.com/forum/#!forum/edash-us
 3. Get the source
 
   ```Shell
-  mkdir edash_packager
-  cd edash_packager
-  gclient config https://www.github.com/google/edash-packager.git --name=src
+  mkdir shaka_packager
+  cd shaka_packager
+  gclient config https://www.github.com/google/shaka-packager.git --name=src
   gclient sync
   ```
   To sync to a particular commit or version, use 'gclient sync -r \<revision\>', e.g.
@@ -81,7 +83,7 @@ We have a [public mailing list](https://groups.google.com/forum/#!forum/edash-us
 
 6. Contributing
 
-  See https://github.com/google/edash-packager/blob/master/CONTRIBUTING.md for details.
+  See https://github.com/google/shaka-packager/blob/master/CONTRIBUTING.md for details.
 
 
 # Using docker for testing / development #
@@ -95,19 +97,19 @@ We have a [public mailing list](https://groups.google.com/forum/#!forum/edash-us
   2.a. Pull prebuilt image from Dockerhub
 
     ```Shell
-    docker pull google/edash-packager
+    docker pull google/shaka-packager
     ```
 
   2.b. Build an image locally
 
     ```Shell
-    docker build -t google/edash-packager github.com/google/edash-packager.git
+    docker build -t google/shaka-packager github.com/google/shaka-packager.git
     ```
 
 3. Run the container (`your_media_path` should be your media folder)
 
   ```Shell
-  docker run -v /your_media_path/:/media -it --rm google/edash-packager
+  docker run -v /your_media_path/:/media -it --rm google/shaka-packager
   ```
 
 4. Testing
@@ -141,7 +143,7 @@ Demuxer and Muxer are connected using MediaStream. MediaStream wraps the element
 
 MpdBuilder is responsible for the creation of Media Presentation Description as specified in ISO/IEC 23009-1 DASH MPD spec.
 
-Refer to [Design](docs/design.md), [API](https://google.github.io/edash-packager/docs) for details.
+Refer to [Design](docs/design.md), [API](https://google.github.io/shaka-packager/docs) for details.
 
 
 # DASH-IF IOP Compliance #
diff --git a/docs/design.md b/docs/design.md
index 6945761fa3..9e85a7d765 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -14,7 +14,7 @@ MpdBuilder is responsible for the creation of Media Presentation Description as
 
 Supported source formats: ISO BMFF (both fragmented and non-fragmented), MPEG-2 TS, IPTV (MPEG-2 TS over UDP), and WVM (Widevine); the only output format supported currently is fragmented ISO BMFF with CENC. Support for more formats will be added soon.
 
-API document is available at https://google.github.io/edash-packager/docs.
+API document is available at https://google.github.io/shaka-packager/docs.
 
 ##Creating Demuxer##
 
diff --git a/docs/linux_profiling.md b/docs/linux_profiling.md
index 9f1e94b97f..5173d7acec 100644
--- a/docs/linux_profiling.md
+++ b/docs/linux_profiling.md
@@ -3,7 +3,7 @@
 Profiling code is enabled when the `use_allocator` variable in gyp is set to
 `tcmalloc` (currently the default) and `profiling` variable in gyp is set to
 `1`. That will build the tcmalloc library, including the cpu profiling and heap
-profiling code into edash-packager, e.g.
+profiling code into shaka-packager, e.g.
 
     GYP_DEFINES='profiling=1 use_allocator="tcmalloc"' gclient runhooks
 
@@ -14,7 +14,7 @@ frame pointers in some of the libraries. A workaround is to use the
 
 ## CPU Profiling
 
-In order to enable cpu profiling, run edash-packager with the environment
+In order to enable cpu profiling, run shaka-packager with the environment
 variable `CPUPROFILE` set to a filename. For example:
 
     CPUPROFILE=/tmp/cpuprofile out/Release/packager
@@ -34,7 +34,7 @@ http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html.
 
 ## Heap Profiling
 
-To turn on the heap profiler on edash-packager, use the `HEAPPROFILE`
+To turn on the heap profiler on shaka-packager, use the `HEAPPROFILE`
 environment variable to specify a filename for the heap profile. For example:
 
     HEAPPROFILE=/tmp/heapprofile out/Release/packager
diff --git a/docs/shaka-packager.png b/docs/shaka-packager.png
new file mode 100644
index 0000000000..f60cd29deb
Binary files /dev/null and b/docs/shaka-packager.png differ