diff --git a/LICENSE b/LICENSE
index 072f9ef..aa0a85b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,9 +201,9 @@
    limitations under the License.
    
 =======================================================================
-Fluentd Plugin for Kubernetes Objects:
+Fluentd Plugin for Kubernetes Metrics:
 
-The Fluentd Plugin for Kubernetes Objects project contains
+The Fluentd Plugin for Kubernetes Metrics project contains
 subcomponents with separate copyright notices and license terms.
 Your use of the source code for the these subcomponents is subject
 to the terms and conditions of the following licenses.
@@ -214,20 +214,55 @@ Apache License 2.0
 The following components are provided under the Apache License 2.0. See project link for details.
 
     (Apache License 2.0) fluentd (https://github.com/fluent/fluentd/blob/master/LICENSE)
+    (Apache License 2.0) thread_safe (https://github.com/ruby-concurrency/thread_safe/blob/master/LICENSE)
+    (Apache License 2.0) msgpack (https://github.com/msgpack/msgpack-ruby/blob/master/LICENSE)
+    (Apache License 2.0) serverengine (https://github.com/treasure-data/serverengine/blob/master/LICENSE)
+    (Apache License 2.0) addressable (https://github.com/sporkmonger/addressable/blob/master/LICENSE.txt)
 
 ========================================================================
 MIT licenses
 ========================================================================
 The following components are provided under the MIT License. See project link for details.
 
-    (MIT License) kubeclient (https://github.com/abonas/kubeclient/blob/master/LICENSE.txt)
     (MIT License) bundler (https://github.com/bundler/bundler/blob/master/LICENSE.md)
     (MIT License) rake (https://github.com/ruby/rake/blob/master/MIT-LICENSE)
     (MIT License) webmock (https://github.com/bblimke/webmock/blob/master/LICENSE)
-    (MIT License) minitest (https://github.com/seattlerb/minitest/blob/master/README.rdoc#license)
+    (MIT License) simplecov (https://github.com/colszowka/simplecov/blob/master/LICENSE)
+    (MIT License) webmock (https://github.com/bblimke/webmock/blob/master/LICENSE)
+    (MIT License) multi_json (https://github.com/intridea/multi_json/blob/master/LICENSE.md)
+    (MIT License) kubeclient (https://github.com/abonas/kubeclient/blob/master/LICENSE.txt)
+    (MIT License) oj (https://github.com/ohler55/oj/blob/master/LICENSE)
+    (MIT License) public_suffix (https://github.com/weppos/publicsuffix-ruby/blob/master/LICENSE.txt)
+    (MIT License) cool.io (https://github.com/tarcieri/cool.io/blob/master/LICENSE)
+    (MIT License) crack (https://github.com/jnunemaker/crack/blob/master/LICENSE)
+    (MIT License) safe_yaml (https://github.com/dtao/safe_yaml/blob/master/LICENSE.txt)
+    (MIT License) dig_rb (https://github.com/jrochkind/dig_rb/blob/master/LICENSE.txt)
+    (MIT License) docile (https://github.com/ms-ati/docile/blob/master/LICENSE)
+    (MIT License) unf_ext (https://github.com/knu/ruby-unf_ext/blob/master/LICENSE.txt)
+    (MIT License) http_parser.rb (https://github.com/tmm1/http_parser.rb/blob/master/LICENSE-MIT)
+    (MIT License) sigdump (https://github.com/frsyuki/sigdump/blob/master/LICENSE)
+    (MIT License) tzinfo (https://github.com/tzinfo/tzinfo/blob/master/LICENSE)
+    (MIT License) tzinfo-data (https://github.com/tzinfo/tzinfo-data/blob/master/LICENSE)
+    (MIT License) yajl-ruby (https://github.com/brianmario/yajl-ruby/blob/master/LICENSE)
+    (MIT License) http-cookie (https://github.com/sparklemotion/http-cookie/blob/master/LICENSE.txt)
+    (MIT License) http-form_data (https://github.com/httprb/form_data/blob/master/LICENSE.txt)
+    (MIT License) http (https://github.com/httprb/http/blob/master/LICENSE.txt)
+    (MIT License) recursive-open-struct (https://github.com/aetherknight/recursive-open-struct/blob/master/LICENSE.txt)
+    (MIT License) mime-types-data (https://github.com/mime-types/mime-types-data/blob/master/Licence.md)
+    (MIT License) mime-types (https://github.com/mime-types/ruby-mime-types/blob/master/Licence.md)
+    (MIT License) netrc (https://github.com/heroku/netrc/blob/master/LICENSE.md)
+    (MIT License) rest-client (https://github.com/rest-client/rest-client/blob/master/LICENSE)
+    (MIT License) hashdiff (https://github.com/liufengyun/hashdiff/blob/master/LICENSE)
+    (MIT License) simplecov-html (https://github.com/colszowka/simplecov-html/blob/master/LICENSE)
 
 ========================================================================
-For test-unit:
+BSD Licenses
 ========================================================================
-
-See https://github.com/test-unit/test-unit/blob/master/COPYING
+The following components are provided under the BSD license. See project link for details.
+
+    (BSD License) power_assert (https://github.com/k-tsj/power_assert/blob/master/BSDL)
+    (BSD License) strptime (https://github.com/nurse/strptime/blob/master/LICENSE.txt)
+    (BSD License) unf (https://github.com/knu/ruby-unf/blob/master/LICENSE)
+    (BSD License) domain_name (https://github.com/knu/ruby-domain_name/blob/master/LICENSE.txt)
+    (BSD License) json (https://www.ruby-lang.org/en/about/license.txt)
+    (BSD License) test-unit (https://github.com/test-unit/test-unit)
\ No newline at end of file
diff --git a/README.md b/README.md
index b55064c..1026f3a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![CircleCI](https://circleci.com/gh/git-lfs/git-lfs.svg?style=shield&circle-token=856152c2b02bfd236f54d21e1f581f3e4ebf47ad)](https://circleci.com/gh/splunk/fluent-plugin-kubernetes-metrics)
-# fluent-plugin-kubernetes-metrics
+# Fluentd Plugin for Kubernetes Metrics
 
 The [Fluentd](https://fluentd.org/) input plugin collects kubernetes cluster metrics which are exposed by the [Kubelet API](https://kubernetes.io/docs/admin/kubelet/) and forwards them to fluentd.
 The plugin collects metrics from: