diff --git a/Rakefile b/Rakefile
index 293ccde..e0c18d2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ namespace :style do
     FoodCritic::Rake::LintTask.new(:chef) do |t|
       t.options = {
         fail_tags: ['any'],
-        progress: true
+        progress: true,
       }
     end
   rescue LoadError
diff --git a/attributes/default.rb b/attributes/default.rb
index 906df9e..16e6819 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Attributes:: default
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/libraries/default.rb b/libraries/default.rb
index 6028c17..f8958f6 100644
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Library:: default
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/providers/default.rb b/providers/default.rb
index bfa9ea7..ff0a56f 100644
--- a/providers/default.rb
+++ b/providers/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Provider:: default
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/config.rb b/recipes/config.rb
index e8e04c4..13b460f 100644
--- a/recipes/config.rb
+++ b/recipes/config.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Recipe:: config
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/default.rb b/recipes/default.rb
index 74bd1e8..a2d8db5 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Recipe:: default
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resources/default.rb b/resources/default.rb
index 9cd0c9d..9ce0124 100644
--- a/resources/default.rb
+++ b/resources/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Resource:: default
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resources/ipaddr.rb b/resources/ipaddr.rb
index cbfb2e8..6009da6 100644
--- a/resources/ipaddr.rb
+++ b/resources/ipaddr.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: heartbeat
+# Cookbook:: heartbeat
 # Resource:: ipaddr
 #
-# Copyright 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tasks/maintainers.rb b/tasks/maintainers.rb
index 1ce3302..de46133 100644
--- a/tasks/maintainers.rb
+++ b/tasks/maintainers.rb
@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
+# Copyright:: 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");