diff --git a/README.md b/README.md
index dec164d..2640827 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Record and share your terminal sessions, the right way.
 asciinema is a free and open source solution for recording terminal sessions
 and sharing them on the web.
 
-This is the source code of asciinema.org (formerly ascii.io) website. If you're
-looking for asciinema's terminal recorder go here:
-[asciinema/asciinema-cli](https://github.com/asciinema/asciinema)
+This is the source code of asciinema.org website. If you're looking for
+asciinema's terminal recorder go here:
+[asciinema/asciinema](https://github.com/asciinema/asciinema)
 
 ## Setup instructions
 
diff --git a/app/views/docs/how-it-works.html.slim b/app/views/docs/how-it-works.html.slim
index e352a82..160e7b1 100644
--- a/app/views/docs/how-it-works.html.slim
+++ b/app/views/docs/how-it-works.html.slim
@@ -51,7 +51,7 @@ markdown:
   part.
 
   For the implementation details check out [recorder source
-  code](https://github.com/asciinema/asciinema-cli).
+  code](https://github.com/asciinema/asciinema).
 
   ## Playback
 
diff --git a/app/views/docs/installation.html.slim b/app/views/docs/installation.html.slim
index 2ff76c2..5ae8564 100644
--- a/app/views/docs/installation.html.slim
+++ b/app/views/docs/installation.html.slim
@@ -10,7 +10,7 @@ markdown:
   ## Manual download
 
   You can
-  [download the latest binary](https://github.com/asciinema/asciinema-cli/releases)
+  [download the latest binary](https://github.com/asciinema/asciinema/releases)
   for your platform and place it in your `$PATH`.
 
   ## Using package manager
@@ -64,4 +64,4 @@ markdown:
   ## From source
 
   For instructions on building asciinema from source please refer to the
-  [README file](https://github.com/asciinema/asciinema-cli/blob/master/README.md).
+  [README file](https://github.com/asciinema/asciinema/blob/master/README.md).
diff --git a/app/views/pages/about.html.slim b/app/views/pages/about.html.slim
index 202a259..9b6df64 100644
--- a/app/views/pages/about.html.slim
+++ b/app/views/pages/about.html.slim
@@ -14,7 +14,7 @@
 
       asciinema project is built of several sub-projects:
 
-      * command-line based terminal session recorder, `asciinema` ([source code](https://github.com/asciinema/asciinema-cli))
+      * command-line based terminal session recorder, `asciinema` ([source code](https://github.com/asciinema/asciinema))
       * asciinema.org - a website with an API ([source code](https://github.com/asciinema/asciinema.org))
       * javascript player ([source code](https://github.com/asciinema/asciinema-player))
 
@@ -41,7 +41,7 @@
 
       As the service is built of several parts there are separate bug trackers:
 
-      * [github.com/asciinema/asciinema-cli/issues](https://github.com/asciinema/asciinema-cli/issues) - for recorder issues and ideas
+      * [github.com/asciinema/asciinema/issues](https://github.com/asciinema/asciinema/issues) - for recorder issues and ideas
       * [github.com/asciinema/asciinema.org/issues](https://github.com/asciinema/asciinema.org/issues) - for website/embedding issues and ideas
       * [github.com/asciinema/asciinema-player/issues](https://github.com/asciinema/asciinema-player/issues) - for player issues and ideas
 
diff --git a/app/views/pages/contributing.html.slim b/app/views/pages/contributing.html.slim
index 4d337fb..d9d0d18 100644
--- a/app/views/pages/contributing.html.slim
+++ b/app/views/pages/contributing.html.slim
@@ -102,7 +102,7 @@
 
       ul
         li
-          a href="https://github.com/asciinema/asciinema-cli/issues" github.com/asciinema/asciinema-cli/issues
+          a href="https://github.com/asciinema/asciinema/issues" github.com/asciinema/asciinema/issues
           '  - issues and ideas for the command line recorder,
 
         li