diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94dc116..9ad3b47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 - Dropped support for Ruby 2.3 and 2.4
 - It's now recommended to use eager loading to prevent `uninitialized component` issues
   (see [#121](https://github.com/komposable/komponent/issues/121) for background).
-  
+
   The install generator has been updated. When upgrading, please make sure you replace:
 
       config.autoload_paths << config.root.join("app/frontend/components")
@@ -19,6 +19,9 @@
 - Support for Rails 6
 - Refactoring to use `Utils` in `InstallGenerator` and prevent code duplication
 
+**Bug fixes:**
+- Fixed empty `h1` in generated `_examples.html.*` file
+
 ## v3.0.0.beta1 (2019-02-28)
 
 **Breaking changes:**
diff --git a/lib/generators/component/templates/examples.html.erb.erb b/lib/generators/component/templates/examples.html.erb.erb
index 54c8aa3..02f3c42 100644
--- a/lib/generators/component/templates/examples.html.erb.erb
+++ b/lib/generators/component/templates/examples.html.erb.erb
@@ -1,3 +1,3 @@
-<h1><%= @component_name %></h1>
+<h1 class="komponent-title"><%%= @component.title %></h1>
 
 <%%= cdoc "<%= component_name %>" %>
diff --git a/lib/generators/component/templates/examples.html.haml.erb b/lib/generators/component/templates/examples.html.haml.erb
index 851eec6..864d952 100644
--- a/lib/generators/component/templates/examples.html.haml.erb
+++ b/lib/generators/component/templates/examples.html.haml.erb
@@ -1,3 +1,3 @@
-%h1 <%= @component_name %>
+%h1.komponent-title= @component.title
 
 = cdoc "<%= component_name %>"
diff --git a/lib/generators/component/templates/examples.html.slim.erb b/lib/generators/component/templates/examples.html.slim.erb
index 050dc7b..7e5f617 100644
--- a/lib/generators/component/templates/examples.html.slim.erb
+++ b/lib/generators/component/templates/examples.html.slim.erb
@@ -1,3 +1,3 @@
-h1 <%= @component_name %>
+h1.komponent-title= @component.title
 
 = cdoc "<%= component_name %>"
diff --git a/lib/generators/komponent/examples_generator.rb b/lib/generators/komponent/examples_generator.rb
index bef5c02..11b4dfa 100644
--- a/lib/generators/komponent/examples_generator.rb
+++ b/lib/generators/komponent/examples_generator.rb
@@ -31,8 +31,6 @@ def component_path(component_name)
       private
 
       def create_examples_view_file(component_name)
-        @component_name = split_name(component_name).last.underscore
-
         template "examples.html.#{template_engine}.erb", component_path(component_name) + "_examples.html.#{template_engine}"
       end
     end