diff --git a/lib/docs/filters/angular/entries.rb b/lib/docs/filters/angular/entries.rb
index 9f22e923..63c1c797 100644
--- a/lib/docs/filters/angular/entries.rb
+++ b/lib/docs/filters/angular/entries.rb
@@ -2,7 +2,12 @@ module Docs
   class Angular
     class EntriesFilter < Docs::EntriesFilter
       def get_name
-        name = at_css('header.hero h1').content.strip
+        if slug.start_with?('tutorial') || slug.start_with?('guide')
+          name = at_css('.nav-list-item.is-selected').content.strip
+        else
+          name = at_css('header.hero h1').content.strip
+        end
+
         name = name.split(':').first
 
         if mod
diff --git a/lib/docs/scrapers/angular.rb b/lib/docs/scrapers/angular.rb
index 810aeb10..30bc4afc 100644
--- a/lib/docs/scrapers/angular.rb
+++ b/lib/docs/scrapers/angular.rb
@@ -42,7 +42,7 @@ module Docs
     end
 
     version '2.0 TypeScript' do
-      self.release = '2.0.0rc5'
+      self.release = '2.0.0rc6'
       self.base_url = "https://angular.io/docs/ts/latest/"
     end