diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml b/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml
index 0cadc44fba..0fb15a73ed 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml
@@ -11,28 +11,27 @@
     <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>
   </ows:ServiceIdentification>
   <ows:ServiceProvider>
-    <ows:ProviderName>lat/lon GmbH</ows:ProviderName>
-    <ows:ProviderSite xlink:href="http://www.lat-lon.de" />
+    <ows:ProviderName>deegree</ows:ProviderName>
+    <ows:ProviderSite xlink:href="https://www.deegree.org/" />
     <ows:ServiceContact>
-      <ows:IndividualName>Markus Schneider</ows:IndividualName>
-      <ows:PositionName>deegree TMC</ows:PositionName>
+      <ows:IndividualName>Gerhard Mercator</ows:IndividualName>
+      <ows:PositionName>Geograph</ows:PositionName>
       <ows:ContactInfo>
         <ows:Phone>
-          <ows:Voice>0228/18496-0</ows:Voice>
-          <ows:Facsimile>0228/18496-29</ows:Facsimile>
+          <ows:Voice>0123/123456</ows:Voice>
+          <ows:Facsimile>0123/123456</ows:Facsimile>
         </ows:Phone>
         <ows:Address>
-          <ows:DeliveryPoint>Aennchenstr. 19</ows:DeliveryPoint>
-          <ows:City>Bonn</ows:City>
-          <ows:AdministrativeArea>NRW</ows:AdministrativeArea>
-          <ows:PostalCode>53177</ows:PostalCode>
-          <ows:Country>Germany</ows:Country>
-          <ows:ElectronicMailAddress>info@lat-lon.de
-          </ows:ElectronicMailAddress>
+          <ows:DeliveryPoint>9450 SW Gemini Dr #42523</ows:DeliveryPoint>
+          <ows:City>Beaverton</ows:City>
+          <ows:AdministrativeArea>OR</ows:AdministrativeArea>
+          <ows:PostalCode>97008</ows:PostalCode>
+          <ows:Country>USA</ows:Country>
+          <ows:ElectronicMailAddress>info@deegree.org</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:href="http://www.deegree.org" />
         <ows:HoursOfService>24x7</ows:HoursOfService>
-        <ows:ContactInstructions>Do not hesitate to call</ows:ContactInstructions>
+        <ows:ContactInstructions>Do not hesitate to email</ows:ContactInstructions>
       </ows:ContactInfo>
       <ows:Role>PointOfContact</ows:Role>
     </ows:ServiceContact>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml
index 5dbd08cc7d..95ac883a0c 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml
@@ -384,31 +384,31 @@ xmlns:inspire_common CDATA #FIXED
 <WMT_MS_Capabilities updateSequence="1.1.0" version="1.1.1">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <Abstract>wms reference implementation</Abstract>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <KeywordList>
       <Keyword>deegree</Keyword>
-      <Keyword>wms</Keyword>
+      <Keyword>WMS</Keyword>
     </KeywordList>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.deegree.org:80/deegree-wms/services?"
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Poth</ContactPerson>
-        <ContactOrganization>lat/lon</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Technical Director</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0049228184960</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>00492281849629</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
     <Fees>none</Fees>
     <AccessConstraints>none</AccessConstraints>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml
index f209b4748b..4c377c1a4b 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml
@@ -6,31 +6,31 @@
 <WMT_MS_Capabilities updateSequence="1.1.0" version="1.1.1">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <Abstract>wms reference implementation</Abstract>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <KeywordList>
       <Keyword>deegree</Keyword>
-      <Keyword>wms</Keyword>
+      <Keyword>WMS</Keyword>
     </KeywordList>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.deegree.org:80/deegree-wms/services?"
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Poth</ContactPerson>
-        <ContactOrganization>lat/lon</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Technical Director</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0049228184960</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>00492281849629</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
     <Fees>none</Fees>
     <AccessConstraints>none</AccessConstraints>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml
index 32779daeb5..3881278279 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml
index 32779daeb5..3881278279 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml
index 1417760311..2fb996be0d 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml
index ff90280a64..63bb9e118d 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml
index e8d8aae34a..2763df25d0 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml
@@ -5,31 +5,31 @@
   xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">wms reference implementation</wms:Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">An example template for the deegree WMS</wms:Abstract>
     <wms:KeywordList xmlns:wms="http://www.opengis.net/wms">
       <wms:Keyword>deegree</wms:Keyword>
-      <wms:Keyword>wms</wms:Keyword>
+      <wms:Keyword>WMS</wms:Keyword>
     </wms:KeywordList>
-    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://demo.deegree.org/deegree-wms-ri-130/services?"
+    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <wms:ContactInformation xmlns:wms="http://www.opengis.net/wms">
       <wms:ContactPersonPrimary>
-        <wms:ContactPerson>Andreas Poth</wms:ContactPerson>
-        <wms:ContactOrganization>lat/lon</wms:ContactOrganization>
+        <wms:ContactPerson>Gerhard Mercator</wms:ContactPerson>
+        <wms:ContactOrganization>deegree</wms:ContactOrganization>
       </wms:ContactPersonPrimary>
-      <wms:ContactPosition>Technical Director</wms:ContactPosition>
+      <wms:ContactPosition>Geographer</wms:ContactPosition>
       <wms:ContactAddress>
         <wms:AddressType>postal</wms:AddressType>
-        <wms:Address>Aennchenstr. 19</wms:Address>
-        <wms:City>Bonn</wms:City>
-        <wms:StateOrProvince>NRW</wms:StateOrProvince>
-        <wms:PostCode>53177</wms:PostCode>
-        <wms:Country>Germany</wms:Country>
+        <wms:Address>9450 SW Gemini Dr #42523</wms:Address>
+        <wms:City>Beaverton</wms:City>
+        <wms:StateOrProvince>OR</wms:StateOrProvince>
+        <wms:PostCode>97008</wms:PostCode>
+        <wms:Country>USA</wms:Country>
       </wms:ContactAddress>
-      <wms:ContactVoiceTelephone>0049228184960</wms:ContactVoiceTelephone>
-      <wms:ContactFacsimileTelephone>00492281849629</wms:ContactFacsimileTelephone>
-      <wms:ContactElectronicMailAddress>info@lat-lon.de</wms:ContactElectronicMailAddress>
+      <wms:ContactVoiceTelephone>0123/123456</wms:ContactVoiceTelephone>
+      <wms:ContactFacsimileTelephone>0123/123456</wms:ContactFacsimileTelephone>
+      <wms:ContactElectronicMailAddress>info@deegree.org</wms:ContactElectronicMailAddress>
     </wms:ContactInformation>
     <wms:Fees xmlns:wms="http://www.opengis.net/wms">none</wms:Fees>
     <wms:AccessConstraints xmlns:wms="http://www.opengis.net/wms">none</wms:AccessConstraints>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130.xml
index 599554ea8f..e6af093e1c 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130.xml
@@ -5,31 +5,31 @@
   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">wms reference implementation</wms:Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">An example template for the deegree WMS</wms:Abstract>
     <wms:KeywordList xmlns:wms="http://www.opengis.net/wms">
       <wms:Keyword>deegree</wms:Keyword>
-      <wms:Keyword>wms</wms:Keyword>
+      <wms:Keyword>WMS</wms:Keyword>
     </wms:KeywordList>
-    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://demo.deegree.org/deegree-wms-ri-130/services?"
+    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <wms:ContactInformation xmlns:wms="http://www.opengis.net/wms">
       <wms:ContactPersonPrimary>
-        <wms:ContactPerson>Andreas Poth</wms:ContactPerson>
-        <wms:ContactOrganization>lat/lon</wms:ContactOrganization>
+        <wms:ContactPerson>Gerhard Mercator</wms:ContactPerson>
+        <wms:ContactOrganization>deegree</wms:ContactOrganization>
       </wms:ContactPersonPrimary>
-      <wms:ContactPosition>Technical Director</wms:ContactPosition>
+      <wms:ContactPosition>Geographer</wms:ContactPosition>
       <wms:ContactAddress>
         <wms:AddressType>postal</wms:AddressType>
-        <wms:Address>Aennchenstr. 19</wms:Address>
-        <wms:City>Bonn</wms:City>
-        <wms:StateOrProvince>NRW</wms:StateOrProvince>
-        <wms:PostCode>53177</wms:PostCode>
-        <wms:Country>Germany</wms:Country>
+        <wms:Address>9450 SW Gemini Dr #42523</wms:Address>
+        <wms:City>Beaverton</wms:City>
+        <wms:StateOrProvince>OR</wms:StateOrProvince>
+        <wms:PostCode>97008</wms:PostCode>
+        <wms:Country>USA</wms:Country>
       </wms:ContactAddress>
-      <wms:ContactVoiceTelephone>0049228184960</wms:ContactVoiceTelephone>
-      <wms:ContactFacsimileTelephone>00492281849629</wms:ContactFacsimileTelephone>
-      <wms:ContactElectronicMailAddress>info@lat-lon.de</wms:ContactElectronicMailAddress>
+      <wms:ContactVoiceTelephone>0123/123456</wms:ContactVoiceTelephone>
+      <wms:ContactFacsimileTelephone>0123/123456</wms:ContactFacsimileTelephone>
+      <wms:ContactElectronicMailAddress>info@deegree.org</wms:ContactElectronicMailAddress>
     </wms:ContactInformation>
     <wms:Fees xmlns:wms="http://www.opengis.net/wms">none</wms:Fees>
     <wms:AccessConstraints xmlns:wms="http://www.opengis.net/wms">none</wms:AccessConstraints>
diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/resources/org/deegree/protocol/wmts/client/wmts100_capabilities_example.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/resources/org/deegree/protocol/wmts/client/wmts100_capabilities_example.xml
index 7b81aa8ad9..bf6bf3af5b 100644
--- a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/resources/org/deegree/protocol/wmts/client/wmts100_capabilities_example.xml
+++ b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/resources/org/deegree/protocol/wmts/client/wmts100_capabilities_example.xml
@@ -3,33 +3,33 @@
   xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0"
   xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd">
   <ows:ServiceIdentification>
-    <ows:Title>deegree 3 Utah Demo</ows:Title>
-    <ows:Abstract>WMS and WFS demonstration with Utah data</ows:Abstract>
+    <ows:Title>deegree WMTS 1.0.0 capabilities</ows:Title>
+    <ows:Abstract>An example template for the deegree WMTS</ows:Abstract>
     <ows:ServiceType>WMTS</ows:ServiceType>
     <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
   </ows:ServiceIdentification>
   <ows:ServiceProvider>
-    <ows:ProviderName>lat/lon GmbH</ows:ProviderName>
-    <ows:ProviderSite xlink:href="http://www.lat-lon.de" />
+    <ows:ProviderName>deegree</ows:ProviderName>
+    <ows:ProviderSite xlink:href="https://www.deegree.org/" />
     <ows:ServiceContact>
-      <ows:IndividualName>Andreas Schmitz</ows:IndividualName>
-      <ows:PositionName>Software developer</ows:PositionName>
+      <ows:IndividualName>Gerhard Mercator</ows:IndividualName>
+      <ows:PositionName>Geograph</ows:PositionName>
       <ows:ContactInfo>
         <ows:Phone>
-          <ows:Voice>0228/18496-0</ows:Voice>
-          <ows:Facsimile>0228/18496-29</ows:Facsimile>
+          <ows:Voice>0123/123456</ows:Voice>
+          <ows:Facsimile>0123/123456</ows:Facsimile>
         </ows:Phone>
         <ows:Address>
-          <ows:DeliveryPoint>Aennchenstr. 19</ows:DeliveryPoint>
-          <ows:City>Bonn</ows:City>
-          <ows:AdministrativeArea>NRW</ows:AdministrativeArea>
-          <ows:PostalCode>53177</ows:PostalCode>
-          <ows:Country>Germany</ows:Country>
-          <ows:ElectronicMailAddress>info@lat-lon.de</ows:ElectronicMailAddress>
+          <ows:DeliveryPoint>9450 SW Gemini Dr #42523</ows:DeliveryPoint>
+          <ows:City>Beaverton</ows:City>
+          <ows:AdministrativeArea>OR</ows:AdministrativeArea>
+          <ows:PostalCode>97008</ows:PostalCode>
+          <ows:Country>USA</ows:Country>
+          <ows:ElectronicMailAddress>info@deegree.org</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:href="http://www.deegree.org" />
         <ows:HoursOfService>24x7</ows:HoursOfService>
-        <ows:ContactInstructions>Do not hesitate to call</ows:ContactInstructions>
+        <ows:ContactInstructions>Do not hesitate to email</ows:ContactInstructions>
       </ows:ContactInfo>
       <ows:Role>PointOfContact</ows:Role>
     </ows:ServiceContact>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/capabilities_example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/capabilities_example.xml
index 7b81aa8ad9..cefc359fe9 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/capabilities_example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/capabilities_example.xml
@@ -3,33 +3,33 @@
   xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0"
   xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd">
   <ows:ServiceIdentification>
-    <ows:Title>deegree 3 Utah Demo</ows:Title>
-    <ows:Abstract>WMS and WFS demonstration with Utah data</ows:Abstract>
+    <ows:Title>deegree WMTS 1.0.0 capabilities</ows:Title>
+    <ows:Abstract>An example template for the deegree WMTS</ows:Abstract>
     <ows:ServiceType>WMTS</ows:ServiceType>
     <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
   </ows:ServiceIdentification>
   <ows:ServiceProvider>
-    <ows:ProviderName>lat/lon GmbH</ows:ProviderName>
-    <ows:ProviderSite xlink:href="http://www.lat-lon.de" />
+    <ows:ProviderName>deegree</ows:ProviderName>
+    <ows:ProviderSite xlink:href="https://www.deegree.org/" />
     <ows:ServiceContact>
-      <ows:IndividualName>Andreas Schmitz</ows:IndividualName>
-      <ows:PositionName>Software developer</ows:PositionName>
+      <ows:IndividualName>Gerhard Mercator</ows:IndividualName>
+      <ows:PositionName>Geographer</ows:PositionName>
       <ows:ContactInfo>
         <ows:Phone>
-          <ows:Voice>0228/18496-0</ows:Voice>
-          <ows:Facsimile>0228/18496-29</ows:Facsimile>
+          <ows:Voice>0123/123456</ows:Voice>
+          <ows:Facsimile>0123/123456</ows:Facsimile>
         </ows:Phone>
         <ows:Address>
-          <ows:DeliveryPoint>Aennchenstr. 19</ows:DeliveryPoint>
-          <ows:City>Bonn</ows:City>
-          <ows:AdministrativeArea>NRW</ows:AdministrativeArea>
-          <ows:PostalCode>53177</ows:PostalCode>
-          <ows:Country>Germany</ows:Country>
-          <ows:ElectronicMailAddress>info@lat-lon.de</ows:ElectronicMailAddress>
+          <ows:DeliveryPoint>9450 SW Gemini Dr #42523</ows:DeliveryPoint>
+          <ows:City>Beaverton</ows:City>
+          <ows:AdministrativeArea>OR</ows:AdministrativeArea>
+          <ows:PostalCode>97008</ows:PostalCode>
+          <ows:Country>USA</ows:Country>
+          <ows:ElectronicMailAddress>info@deegree.org</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:href="http://www.deegree.org" />
         <ows:HoursOfService>24x7</ows:HoursOfService>
-        <ows:ContactInstructions>Do not hesitate to call</ows:ContactInstructions>
+        <ows:ContactInstructions>Do not hesitate to email</ows:ContactInstructions>
       </ows:ContactInfo>
       <ows:Role>PointOfContact</ows:Role>
     </ows:ServiceContact>
diff --git a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index b9de4470ff..6fa7837723 100644
--- a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -3,38 +3,35 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
   <ServiceIdentification>
-    <Title>deegree 3 demo service</Title>
-    <Title>You may supply more than one title (as in OWS 1.1.0)</Title>
-    <Abstract>This is the default deegree 3 service configuration. Change it as you like!</Abstract>
-    <Abstract>More abstracts are possible (as in OWS 1.1.0)</Abstract>
+    <Title>deegree services metadata</Title>
+    <Abstract>This is the default deegree service configuration</Abstract>
     <Keywords>
       <Keyword lang="en">OGC services</Keyword>
-      <Keyword lang="en">deegree 3</Keyword>
-      <Type codeSpace="whatever">TODO: Do we really need this element? What is it supposed to do?</Type>
+      <Keyword lang="en">deegree</Keyword>
     </Keywords>
-    <Fees>None, it's free</Fees>
-    <AccessConstraints>None.</AccessConstraints>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
     <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Christian Kiehle</IndividualName>
-      <PositionName>Project Manager</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>kiehle@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-services/deegree-services-wms/src/test/resources/org/deegree/services/wms/controller/capabilities/serialize/wmsCapabilities_130.xml b/deegree-services/deegree-services-wms/src/test/resources/org/deegree/services/wms/controller/capabilities/serialize/wmsCapabilities_130.xml
index fc02bdbf24..f4b439947f 100644
--- a/deegree-services/deegree-services-wms/src/test/resources/org/deegree/services/wms/controller/capabilities/serialize/wmsCapabilities_130.xml
+++ b/deegree-services/deegree-services-wms/src/test/resources/org/deegree/services/wms/controller/capabilities/serialize/wmsCapabilities_130.xml
@@ -4,26 +4,26 @@
   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo WMS</Title>
-    <Abstract>WMS demonstration with Utah data</Abstract>
-    <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org" />
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/capabilities.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/capabilities.xml
index 9c9e851211..231b154f31 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/capabilities.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/capabilities.xml
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <WMT_MS_Capabilities version="1.1.1" updateSequence="0">
   <Service>
-    <Name>OGC:WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.deegree.org"/>
+    <Name>WMS</Name>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat-lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index 33e26e9c4e..f9fc6f4f5e 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -7,29 +7,35 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree services metadata</Title>
+    <Abstract>This is the default deegree service configuration</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index c771c833d5..2ddc811517 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -5,25 +5,37 @@
     General service information for all services. Used in the GetCapabilities
     responses.
   -->
+
+  <ServiceIdentification>
+    <Title>deegree service metadata</Title>
+    <Abstract>This is the default deegree service configuration</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
+  </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/faultycaps.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/faultycaps.xml
index 588b7703ea..73212e7b98 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/faultycaps.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/faultycaps.xml
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE WMT_MS_Capabilities SYSTEM "http://deegree3-demo.deegree.org/utah-workspace/services?request=DTD" [<!ELEMENT VendorSpecificCapabilities EMPTY>]>
 <WMT_MS_Capabilities version="1.1.1" updateSequence="0">
-  <Service>
-    <Name>OGC:WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.deegree.org"/>
+    <Service>
+    <Name>WMS</Name>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
+    <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
index c8d3b824b0..79f0540f9a 100644
--- a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
@@ -2,30 +2,30 @@
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
+  
   <ServiceIdentification>
-    <Title>deegree 3 AIXM Service</Title>
+    <Title>deegree AIXM Service</Title>
     <Abstract>Test setup for the deployment of the AIXM application schema</Abstract>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Markus Schneider</IndividualName>
-      <PositionName>deegree TMC</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de
-      </ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
index 3cbbe8e6ca..e32ed78c25 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
@@ -5,31 +5,28 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 CITE Demonstration Suite</Title>
+    <Title>deegree CITE demonstration suite metadata</Title>
     <Abstract>deegree CITE Demonstration Suite</Abstract>
-    <Fees>none</Fees>
-    <AccessConstraints>none</AccessConstraints>
   </ServiceIdentification>
-
-  <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+  <<ServiceProvider>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Sebastian Goerke</IndividualName>
-      <PositionName>Consultant</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
index 37793a9fd7..d22709ebcf 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
@@ -5,37 +5,38 @@
     General service information for all services. Used in the GetCapabilities
     responses.
   -->
+  
   <ServiceIdentification>
-    <Title>The deegree CSW</Title>
+    <Title>deegree CSW metadata</Title>
     <Abstract>A web service used for delivering Catalogue information</Abstract>
     <Keywords>
       <Keyword>No validating schemas</Keyword>
-      <Keyword>Using deegree3 Catalogue API</Keyword>
+      <Keyword>Using deegree Catalogue API</Keyword>
       <Keyword>Fast</Keyword>
     </Keywords>
-    <Fees>None, it is free</Fees>
-    <AccessConstraints>Open to all</AccessConstraints>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Steffen Thomas</IndividualName>
-      <PositionName>deegree core developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de
-      </ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Bonn</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
index 581bb82e70..301364e6ea 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
@@ -6,30 +6,30 @@
     General service information for all services. Used in the GetCapabilities
     responses.
   -->
+  
   <ServiceIdentification>
-    <Title>deegree 3 GeoSciML Service</Title>
+    <Title>deegree GeoSciML service metadata</Title>
     <Abstract>Demonstrates the deployment of the GeoSciML application schema</Abstract>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Markus Schneider</IndividualName>
-      <PositionName>deegree TMC</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de
-      </ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
index 6297e26346..a31a2c8e11 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
@@ -7,31 +7,36 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree service metadata</Title>
+    <Abstract>This is the default deegree service configuration.</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
-
 </deegreeServicesMetadata>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
index 005d772d79..3c24262c8f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
@@ -7,31 +7,36 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo WFS</Title>
-    <Abstract>WFS demonstration with Utah data</Abstract>
+    <Title>deegree WFS metadata</Title>
+    <Abstract>This is the default deegree WFS configuration</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
-
 </deegreeServicesMetadata>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
index 005d772d79..3c24262c8f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
@@ -7,31 +7,36 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo WFS</Title>
-    <Abstract>WFS demonstration with Utah data</Abstract>
+    <Title>deegree WFS metadata</Title>
+    <Abstract>This is the default deegree WFS configuration</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
-
 </deegreeServicesMetadata>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
index 841990f138..7afdace067 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
@@ -7,31 +7,36 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo WMS</Title>
-    <Abstract>WMS demonstration with Utah data</Abstract>
+    <Title>deegree WMS metadata</Title>
+    <Abstract>This is the default deegree WMS configuration</Abstract><Keywords>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
-
 </deegreeServicesMetadata>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
index 08d70302b8..43ccdaf534 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
@@ -7,31 +7,36 @@
   -->
 
   <ServiceIdentification>
-    <Title>deegree 3 Utah Demo WMTS</Title>
-    <Abstract>WMTS demonstration with Utah data</Abstract>
+    <Title>deegree WMTS metadata</Title>
+    <Abstract>This is the default deegree WMTS configuration</Abstract>
+    <Keywords>
+      <Keyword lang="en">OGC services</Keyword>
+      <Keyword lang="en">deegree</Keyword>
+    </Keywords>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
+    <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
-
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Schmitz</IndividualName>
-      <PositionName>Software developer</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
-
 </deegreeServicesMetadata>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
index 30f85141ea..0fa5158245 100644
--- a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
@@ -6,39 +6,35 @@
     responses.
   -->
   <ServiceIdentification>
-    <Title>deegree 3 demo services</Title>
-    <Title>You may supply more than one title (as in OWS 1.1.0)</Title>
-    <Abstract>This is the default deegree 3 service configuration. Change it as you like!</Abstract>
-    <Abstract>More abstracts are possible (as in OWS 1.1.0)</Abstract>
+    <Title>deegree services metadata</Title>
+    <Abstract>This is the default deegree service configuration</Abstract>
     <Keywords>
       <Keyword lang="en">OGC services</Keyword>
-      <Keyword lang="en">deegree 3</Keyword>
-      <Type codeSpace="whatever">TODO: Do we really need this element? What is it supposed to do?</Type>
+      <Keyword lang="en">deegree</Keyword>
     </Keywords>
-    <Fees>None, it's free</Fees>
-    <AccessConstraints>None.</AccessConstraints>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
     <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat-lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Andreas Poth</IndividualName>
-      <PositionName>Technical Director</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>info@lat-lon.de
-      </ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Bonn</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Don't hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
index 1316ff35c2..6fa7837723 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
@@ -3,38 +3,35 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
   <ServiceIdentification>
-    <Title>deegree 3 demo service</Title>
-    <Title>You may supply more than one title (as in OWS 1.1.0)</Title>
-    <Abstract>This is the default deegree 3 service configuration. Change it as you like!</Abstract>
-    <Abstract>More abstracts are possible (as in OWS 1.1.0)</Abstract>
+    <Title>deegree services metadata</Title>
+    <Abstract>This is the default deegree service configuration</Abstract>
     <Keywords>
       <Keyword lang="en">OGC services</Keyword>
-      <Keyword lang="en">deegree 3</Keyword>
-      <Type codeSpace="whatever">TODO: Do we really need this element? What is it supposed to do?</Type>
+      <Keyword lang="en">deegree</Keyword>
     </Keywords>
-    <Fees>None, it is free</Fees>
-    <AccessConstraints>None.</AccessConstraints>
+    <Fees>None</Fees>
+    <AccessConstraints>None</AccessConstraints>
     <AccessConstraints>24x7</AccessConstraints>
   </ServiceIdentification>
   <ServiceProvider>
-    <ProviderName>lat/lon GmbH</ProviderName>
-    <ProviderSite>http://www.lat-lon.de</ProviderSite>
+    <ProviderName>deegree</ProviderName>
+    <ProviderSite>deegree.org</ProviderSite>
     <ServiceContact>
-      <IndividualName>Johannes Wilden</IndividualName>
-      <PositionName>Release Manager</PositionName>
-      <Phone>0228/18496-0</Phone>
-      <Facsimile>0228/18496-29</Facsimile>
-      <ElectronicMailAddress>wilden@lat-lon.de</ElectronicMailAddress>
+      <IndividualName>Gerhard Mercator</IndividualName>
+      <PositionName>Geographer</PositionName>
+      <Phone>0123/123456</Phone>
+      <Facsimile>0123/123456</Facsimile>
+      <ElectronicMailAddress>info@deegree.org</ElectronicMailAddress>
       <Address>
-        <DeliveryPoint>Aennchenstr. 19</DeliveryPoint>
-        <City>Bonn</City>
-        <AdministrativeArea>NRW</AdministrativeArea>
-        <PostalCode>53177</PostalCode>
-        <Country>Germany</Country>
+        <DeliveryPoint>9450 SW Gemini Dr #42523</DeliveryPoint>
+        <City>Beaverton</City>
+        <AdministrativeArea>OR</AdministrativeArea>
+        <PostalCode>97008</PostalCode>
+        <Country>USA</Country>
       </Address>
       <OnlineResource>http://www.deegree.org</OnlineResource>
       <HoursOfService>24x7</HoursOfService>
-      <ContactInstructions>Do not hesitate to call</ContactInstructions>
+      <ContactInstructions>Don't hesitate to email</ContactInstructions>
       <Role>PointOfContact</Role>
     </ServiceContact>
   </ServiceProvider>