diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 4b715511fc1..7d66e4d11bc 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -127,9 +127,9 @@ class ListController < ApplicationController
     discourse_expires_in 1.minute
 
     @title = @category.name
-    @link = "#{Discourse.base_url}/category/#{@category.slug_for_url}"
+    @link = "#{Discourse.base_url}/c/#{@category.slug_for_url}"
     @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}"
-    @atom_link = "#{Discourse.base_url}/category/#{@category.slug_for_url}.rss"
+    @atom_link = "#{Discourse.base_url}/c/#{@category.slug_for_url}.rss"
     @topic_list = TopicQuery.new.list_new_in_category(@category)
 
     render 'list', formats: [:rss]
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 1ee491eccc8..ad9266aa138 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -1,6 +1,6 @@
 <% @list.categories.each do |c| %>
   <div class="category">
-    <h2><a href="/category/<%= c.slug.blank? ? c.id : c.slug %>"><%= c.name %></a></h2>
+    <h2><a href="/c/<%= c.slug.blank? ? c.id : c.slug %>"><%= c.name %></a></h2>
     <div class="topic-list">
       <%- if c.displayable_topics.present? %>
         <% c.displayable_topics.each do |t| %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 0dd0088e608..9bdda7085aa 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -2,7 +2,7 @@
    <%= render_topic_title(@topic_view.topic) %>
 </h2>
 <% if c = @topic_view.topic.category %>
-  <a href="/category/<%= c.slug.blank? ? c.id : c.slug %>"><%= c.name %></a>
+  <a href="/c/<%= c.slug.blank? ? c.id : c.slug %>"><%= c.name %></a>
 <% end %>
 <hr/>
 
diff --git a/lib/tasks/integration.rake b/lib/tasks/integration.rake
index 528a955b360..c2f6b8a304e 100644
--- a/lib/tasks/integration.rake
+++ b/lib/tasks/integration.rake
@@ -4,7 +4,7 @@ desc 'Creates the integration fixtures. Requires a development instance running.
 task 'integration:create_fixtures' => :environment do
 
   fixtures = {
-    discovery: ["/latest.json", "/categories.json", "/category/bug/l/latest.json"],
+    discovery: ["/latest.json", "/categories.json", "/c/bug/l/latest.json"],
     topic: ["/t/280.json"],
     user: ["/users/eviltrout.json",
            "/user_actions.json",