diff --git a/omnibus/cookbooks/omnibus-supermarket/.rubocop.yml b/omnibus/cookbooks/omnibus-supermarket/.rubocop.yml
deleted file mode 100644
index a8d544c82..000000000
--- a/omnibus/cookbooks/omnibus-supermarket/.rubocop.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Layout/IndentHash:
-  EnforcedStyle: consistent
\ No newline at end of file
diff --git a/omnibus/cookbooks/omnibus-supermarket/recipes/app.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/app.rb
index 20ba80530..adf719f30 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/app.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/app.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: app
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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.
@@ -72,7 +72,7 @@
   user node['supermarket']['user']
 end
 
-# Cookbook data is uploaded to /opt/supermarket/embedded/service/supermarket/public/system
+# tar files for cookbooks are uploaded to /opt/supermarket/embedded/service/supermarket/public/system
 directory node['supermarket']['data_directory'] do
   owner node['supermarket']['user']
   group node['supermarket']['group']
diff --git a/omnibus/cookbooks/omnibus-supermarket/recipes/config.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/config.rb
index 4642b5011..21e9e4d9f 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/config.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/config.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: config
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/cookbook_test.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/cookbook_test.rb
index 0509f9b08..9c3a17564 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/cookbook_test.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/cookbook_test.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: omnibus-supermarket
+# Cookbook:: omnibus-supermarket
 # Recipe:: cookbook_test
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/database.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/database.rb
index 39148d22b..aa107e09f 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/database.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/database.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: database
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/default.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/default.rb
index 720c5b287..aa10d0adc 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/default.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: default
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/log_management.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/log_management.rb
index fda8921a5..b44cd7717 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/log_management.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/log_management.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: log_management
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright:: 2015 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/omnibus/cookbooks/omnibus-supermarket/recipes/nginx.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/nginx.rb
index 551ad55da..36e709259 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/nginx.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/nginx.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: nginx
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/postgresql.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/postgresql.rb
index 32dc12f36..c136bd9c9 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/postgresql.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/postgresql.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: postgresql
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/rails.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/rails.rb
index d0f1296d7..e64c7f0e9 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/rails.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/rails.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: rails
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/redis.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/redis.rb
index d5a97525a..4ee5e1a8d 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/redis.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/redis.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: redis
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/show_config.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/show_config.rb
index 067ae9bb7..ca2338660 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/show_config.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/show_config.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: show_config
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/sidekiq.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/sidekiq.rb
index 030bda47c..197a3fba2 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/sidekiq.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/sidekiq.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: sidekiq
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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/omnibus/cookbooks/omnibus-supermarket/recipes/ssl.rb b/omnibus/cookbooks/omnibus-supermarket/recipes/ssl.rb
index ecf3a9210..8e3a2f514 100644
--- a/omnibus/cookbooks/omnibus-supermarket/recipes/ssl.rb
+++ b/omnibus/cookbooks/omnibus-supermarket/recipes/ssl.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: supermarket
+# Cookbook:: supermarket
 # Recipe:: ssl
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright:: 2014 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.