diff --git a/lib/docs.rb b/lib/docs.rb
index f8ab6a03..a09aae76 100644
--- a/lib/docs.rb
+++ b/lib/docs.rb
@@ -112,31 +112,31 @@ module Docs
     {
       'angular' => 'ng',
       'angular.js' => 'ng',
-      'backbone.js' => 'bb',
-      'c++' => 'cpp',
+      'backbone' => 'bb',
+      'cpp' => 'c++',
       'coffeescript' => 'cs',
       'crystal' => 'cr',
       'elixir' => 'ex',
       'javascript' => 'js',
       'julia' => 'jl',
       'jquery' => '$',
-      'knockout.js' => 'ko',
+      'knockout' => 'ko',
       'kubernetes' => 'k8s',
       'less' => 'ls',
       'lodash' => '_',
-      'löve' => 'love',
+      'love' => 'löve',
       'marionette' => 'mn',
       'markdown' => 'md',
       'matplotlib' => 'mpl',
       'modernizr' => 'mdr',
-      'moment.js' => 'mt',
+      'moment' => 'mt',
       'openjdk' => 'java',
       'nginx' => 'ngx',
       'numpy' => 'np',
       'pandas' => 'pd',
       'postgresql' => 'pg',
       'python' => 'py',
-      'ruby.on.rails' => 'ror',
+      'rails' => 'ror',
       'ruby' => 'rb',
       'rust' => 'rs',
       'sass' => 'scss',
diff --git a/lib/docs/core/manifest.rb b/lib/docs/core/manifest.rb
index ac3162ca..80dc45ba 100644
--- a/lib/docs/core/manifest.rb
+++ b/lib/docs/core/manifest.rb
@@ -20,7 +20,7 @@ module Docs
         if doc.options[:attribution].is_a?(String)
           json[:attribution] = doc.options[:attribution].strip
         end
-        json[:alias] = Docs.aliases[doc.slug]
+        json[:alias] = Docs.aliases[doc.slug[/^[^~]+/, 0]]
         result << json
       end
     end