diff --git a/Teknik/Areas/API/Controllers/APIv1Controller.cs b/Teknik/Areas/API/Controllers/APIv1Controller.cs
index 7501dda..e06b2ff 100644
--- a/Teknik/Areas/API/Controllers/APIv1Controller.cs
+++ b/Teknik/Areas/API/Controllers/APIv1Controller.cs
@@ -107,7 +107,7 @@ namespace Teknik.Areas.API.Controllers
                                 }
 
                                 // Pull all the information together 
-                                string fullUrl = Url.SubRouteUrl("upload", "Upload.Download", new { file = upload.Url });
+                                string fullUrl = Url.SubRouteUrl("u", "Upload.Download", new { file = upload.Url });
                                 var returnData = new
                                 {
                                     url = (model.saveKey || string.IsNullOrEmpty(model.key)) ? fullUrl : fullUrl + "#" + model.key,
@@ -169,7 +169,7 @@ namespace Teknik.Areas.API.Controllers
                         result = new
                         {
                             id = paste.Url,
-                            url = Url.SubRouteUrl("paste", "Paste.View", new { type = "Full", url = paste.Url, password = model.password }),
+                            url = Url.SubRouteUrl("p", "Paste.View", new { type = "Full", url = paste.Url, password = model.password }),
                             title = paste.Title,
                             syntax = paste.Syntax,
                             expiration = paste.ExpireDate,
diff --git a/Teknik/Areas/Paste/Views/Paste/Full.cshtml b/Teknik/Areas/Paste/Views/Paste/Full.cshtml
index e71eb91..f207a2b 100644
--- a/Teknik/Areas/Paste/Views/Paste/Full.cshtml
+++ b/Teknik/Areas/Paste/Views/Paste/Full.cshtml
@@ -19,9 +19,9 @@
     <div class="row">
         <div class="col-sm-12 pull-left">
             <div class="btn-group" role="group">
-                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("paste", "Paste.Simple", new { url = Model.Url })">Simple</a>
-                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("paste", "Paste.Raw", new { url = Model.Url })">Raw</a>
-                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("paste", "Paste.Download", new { url = Model.Url })">Download</a>
+                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("p", "Paste.Simple", new { url = Model.Url })">Simple</a>
+                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("p", "Paste.Raw", new { url = Model.Url })">Raw</a>
+                <a role="button" class="btn btn-default" href="@Url.SubRouteUrl("p", "Paste.Download", new { url = Model.Url })">Download</a>
                 <button type="button" class="btn btn-default" id="create-vault" data-paste-url="@Model.Url" data-paste-title="@((string.IsNullOrEmpty(Model.Title)) ? "Untitled" : Model.Title)">Create Vault</button>
                 @if (User.Identity.IsAuthenticated && Model.Vaults != null && Model.Vaults.Any())
                 {