diff --git a/LICENSE b/LICENSE
index a72ed18..1a1d8e0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015 wywy GmbH
+   Copyright 2015 wywy
 
    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/README.md b/README.md
index 1b8bca3..ec46996 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# wywygmbh/fluentd Puppet Module
+# wywy/fluentd Puppet Module
 
-[![GitHub version](https://badge.fury.io/gh/wywygmbh%2Fpuppet-fluentd.svg)](https://github.com/wywygmbh/puppet-fluentd)
-[![Build Status](https://travis-ci.org/wywygmbh/puppet-fluentd.svg?branch=master)](https://travis-ci.org/wywygmbh/puppet-fluentd)
+[![GitHub version](https://badge.fury.io/gh/wywy%2Fpuppet-fluentd.svg)](https://github.com/wywy/puppet-fluentd)
+[![Build Status](https://travis-ci.org/wywy/puppet-fluentd.svg?branch=master)](https://travis-ci.org/wywy/puppet-fluentd)
 
 
 
@@ -296,7 +296,7 @@ bundle exec rake beaker BEAKER_set=centos-70-x64
 
 ## License
 
-Copyright 2015 wywy GmbH
+Copyright 2015 wywy
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -310,4 +310,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-This Puppet module is being actively maintained by some fellow puppeteers at [wywy GmbH](http://wywy.com/).
+This Puppet module is being actively maintained by some fellow puppeteers at [wywy](http://wywy.com/).
diff --git a/manifests/filter.pp b/manifests/filter.pp
index 6462244..a079bf4 100644
--- a/manifests/filter.pp
+++ b/manifests/filter.pp
@@ -35,7 +35,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2015 wywy GmbH, unless otherwise noted.
+# Copyright 2015 wywy, unless otherwise noted.
 #
 define fluentd::filter (
   $ensure   = present,
diff --git a/manifests/init.pp b/manifests/init.pp
index 583ded3..6a452c4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -62,7 +62,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2015 wywy GmbH, unless otherwise noted.
+# Copyright 2015 wywy, unless otherwise noted.
 #
 class fluentd (
   $repo_manage             = $::fluentd::params::repo_manage,
diff --git a/manifests/match.pp b/manifests/match.pp
index 2e6a768..096d7d3 100644
--- a/manifests/match.pp
+++ b/manifests/match.pp
@@ -40,7 +40,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2015 wywy GmbH, unless otherwise noted.
+# Copyright 2015 wywy, unless otherwise noted.
 #
 define fluentd::match (
   $ensure   = present,
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 4760686..6930e1c 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -23,7 +23,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2015 wywy GmbH, unless otherwise noted.
+# Copyright 2015 wywy, unless otherwise noted.
 #
 define fluentd::plugin (
   $ensure = present,
diff --git a/manifests/source.pp b/manifests/source.pp
index e5a2e61..6a7f386 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -31,7 +31,7 @@
 # Copyright
 # ---------
 #
-# Copyright 2015 wywy GmbH, unless otherwise noted.
+# Copyright 2015 wywy, unless otherwise noted.
 #
 define fluentd::source (
   $ensure   = present,
diff --git a/metadata.json b/metadata.json
index 62543d8..147fe96 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,12 @@
 {
   "name": "wywygmbh-fluentd",
   "version": "0.5.6",
-  "author": "wywy GmbH",
+  "author": "wywy",
   "summary": "Generic module for fluentd (td-agent).",
   "license": "Apache-2.0",
-  "source": "https://github.com/wywygmbh/puppet-fluentd",
-  "project_page": "https://github.com/wywygmbh/puppet-fluentd",
-  "issues_url": "https://github.com/wywygmbh/puppet-fluentd/issues",
+  "source": "https://github.com/wywy/puppet-fluentd",
+  "project_page": "https://github.com/wywy/puppet-fluentd",
+  "issues_url": "https://github.com/wywy/puppet-fluentd/issues",
   "tags": ["fluentd", "td-agent"],
   "operatingsystem_support": [
     {