diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 7b1265e..9b30214 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -39,7 +39,7 @@
             developer {
                 id 'glaforge'
                 name 'Guillaume Laforge'
-                organization 'SpringSource'
+                organization = 'Google'
                 roles {
                     role 'Developer'
                 }
@@ -48,7 +48,7 @@
                 id 'bob'
                 name 'bob mcwhirter'
                 email 'bob@werken.com'
-                organization 'The Werken Company'
+                organization = 'The Werken Company'
                 roles {
                     role 'Founder'
                 }
@@ -57,7 +57,7 @@
                 id 'jstrachan'
                 name 'James Strachan'
                 email 'james@coredevelopers.com'
-                organization 'Core Developers Network'
+                organization = 'Core Developers Network'
                 roles {
                     role 'Founder'
                 }
@@ -65,7 +65,7 @@
             developer {
                 id 'joe'
                 name 'Joe Walnes'
-                organization 'ThoughtWorks'
+                organization = 'ThoughtWorks'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -73,7 +73,7 @@
             developer {
                 id 'skizz'
                 name 'Chris Stevenson'
-                organization 'ThoughtWorks'
+                organization = 'ThoughtWorks'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -81,7 +81,7 @@
             developer {
                 id 'jamiemc'
                 name 'Jamie McCrindle'
-                organization 'Three'
+                organization = 'Three'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -89,7 +89,7 @@
             developer {
                 id 'mattf'
                 name 'Matt Foemmel'
-                organization 'ThoughtWorks'
+                organization = 'ThoughtWorks'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -141,7 +141,7 @@
                 id 'jwilson'
                 name 'John Wilson'
                 email 'tug@wilson.co.uk'
-                organization 'The Wilson Partnership'
+                organization = 'The Wilson Partnership'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -158,7 +158,7 @@
                 id 'ckl'
                 name 'Christiaan ten Klooster'
                 email 'ckl@dacelo.nl'
-                organization 'Dacelo WebDevelopment'
+                organization = 'Dacelo WebDevelopment'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -167,7 +167,7 @@
                 id 'goetze'
                 name 'Steve Goetze'
                 email 'goetze@dovetail.com'
-                organization 'Dovetailed Technologies, LLC'
+                organization = 'Dovetailed Technologies, LLC'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -176,7 +176,7 @@
                 id 'bran'
                 name 'Bing Ran'
                 email 'b55r@sina.com'
-                organization 'Leadingcare'
+                organization = 'Leadingcare'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -185,7 +185,7 @@
                 id 'jez'
                 name 'Jeremy Rayner'
                 email 'jeremy.rayner@gmail.com'
-                organization 'javanicus'
+                organization = 'javanicus'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -210,7 +210,7 @@
                 id 'russel'
                 name 'Russel Winder'
                 email 'russel@winder.org.uk'
-                organization 'Concertant LLP & It\'z Interactive Ltd'
+                organization = 'Concertant LLP & It\'z Interactive Ltd'
                 roles {
                     role 'Developer'
                     role 'Founder of Gant'
@@ -228,7 +228,7 @@
                 id 'cstein'
                 name 'Christian Stein'
                 email 'sormuras@gmx.de'
-                organization 'CTSR.de'
+                organization = 'CTSR.de'
                 roles {
                     role 'Developer Emeritus'
                 }
@@ -236,8 +236,7 @@
             developer {
                 id 'mittie'
                 name 'Dierk Koenig'
-                email 'dierk.koenig@canoo.com'
-                organization 'Canoo Engineering AG'
+                organization = 'Karakun AG'
                 roles {
                     role 'Developer'
                 }
@@ -246,7 +245,7 @@
                 id 'paulk'
                 name 'Paul King'
                 email 'paulk@asert.com.au'
-                organization 'OCI, Australia'
+                organization = 'OCI, Australia'
                 roles {
                     role 'Project Manager'
                     role 'Developer'
@@ -309,7 +308,7 @@
                 id 'jimwhite'
                 name 'Jim White'
                 email 'jim@pagesmiths.com'
-                organization 'IFCX.org'
+                organization = 'IFCX.org'
                 roles {
                     role 'Developer'
                 }
@@ -377,7 +376,7 @@
             developer {
                 id 'emilles'
                 name 'Eric Milles'
-                organization 'Thomson Reuters'
+                organization = 'Thomson Reuters'
                 roles {
                     role 'Developer'
                 }