From 61d010dd62efa456810423fd44bee9b7de7ea14d Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 27 Sep 2011 16:45:03 +0200
Subject: [PATCH] Updates XSD files and also some XML files

Also adds `coreObject.xsd` file. `styleattributes.xsd` isn't updated since no package installation plugin class exists yet.
---
 XSD/acpmenu.xsd                               |  95 ++++++++-------
 XSD/clipboardaction.xsd                       |  94 ++++++++-------
 XSD/clipboarditemtype.xsd                     |   6 +-
 XSD/coreObject.xsd                            |  37 ++++++
 XSD/cronjob.xsd                               |  13 +-
 XSD/eventlistener.xsd                         | 113 +++++++++---------
 XSD/language.xsd                              |  53 ++++----
 XSD/option.xsd                                |  75 ++++++++++++
 XSD/options.xsd                               |  80 -------------
 XSD/optiontypes.xsd                           |  34 +++---
 XSD/package.xsd                               |  29 +++--
 ...{pip.xsd => packageInstallationPlugin.xsd} |   3 +-
 XSD/packageUpdateServer.xsd                   |  47 ++++++--
 XSD/pagelocation.xsd                          |  81 +++++++------
 XSD/pagemenu.xsd                              |  95 ++++++++-------
 XSD/types.xsd                                 |   7 +-
 XSD/userGroupOption.xsd                       |  73 +++++++++++
 XSD/userOption.xsd                            |  94 +++++++++++++++
 XSD/usergroupoptions.xsd                      |  78 ------------
 XSD/useroptions.xsd                           |  99 ---------------
 com.woltlab.wcf/acpmenu.xml                   |   2 +-
 com.woltlab.wcf/clipboardaction.xml           |   2 +-
 com.woltlab.wcf/clipboarditemtype.xml         |   2 +-
 com.woltlab.wcf/coreobject.xml                |   2 +-
 com.woltlab.wcf/eventlistener.xml             |   2 +-
 com.woltlab.wcf/option.xml                    |   4 +-
 com.woltlab.wcf/package.xml                   |  16 +--
 ...{pip.xml => packageInstallationPlugin.xml} |   2 +-
 com.woltlab.wcf/usergroupoption.xml           |   2 +-
 com.woltlab.wcf/useroption.xml                |   2 +-
 30 files changed, 647 insertions(+), 595 deletions(-)
 create mode 100644 XSD/coreObject.xsd
 create mode 100644 XSD/option.xsd
 delete mode 100644 XSD/options.xsd
 rename XSD/{pip.xsd => packageInstallationPlugin.xsd} (85%)
 create mode 100644 XSD/userGroupOption.xsd
 create mode 100644 XSD/userOption.xsd
 delete mode 100644 XSD/usergroupoptions.xsd
 delete mode 100644 XSD/useroptions.xsd
 rename com.woltlab.wcf/{pip.xml => packageInstallationPlugin.xml} (95%)

diff --git a/XSD/acpmenu.xsd b/XSD/acpmenu.xsd
index f992c0ff30..115f4a83fc 100644
--- a/XSD/acpmenu.xsd
+++ b/XSD/acpmenu.xsd
@@ -1,51 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The file "acpmenu.xsd" is used for xml-files which installs, updates or deletes acp-menu items.  -->
+<!-- This file is used for xml files which install, update or delete acp menu items. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-          <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                <xs:sequence>
-                        <xs:element name="acpmenuitem" type="acpmenuitem_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                <xs:sequence>
-                        <xs:element name="acpmenuitem" type="acpmenuitem_delete" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        <!-- Represents an acpmenuitem which will be deleted. The node needs the attribute "name". -->
-        <xs:complexType name="acpmenuitem_delete">
-                <xs:attribute name="name" type="woltlab_varchar" use="required" />
-        </xs:complexType>
-        
-        <!-- Represents an acpmenuitem which will be installed or updated. Extends the type "acpmenuitem_delete". -->
-        <xs:complexType name="acpmenuitem_import">
-                <xs:complexContent>
-                        <xs:extension base="acpmenuitem_delete">
-                                    <xs:all>
-                                        <xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="link" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="permissions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="options" type="xs:string" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-        </xs:complexType>
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element type -->
+	<xs:complexType name="import">
+		<xs:sequence>
+			<xs:element name="acpmenuitem" type="acpmenuitem_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- delete element type -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="acpmenuitem" type="acpmenuitem_delete" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- deleted acp menu item element type -->
+	<xs:complexType name="acpmenuitem_delete">
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
+	</xs:complexType>
+	
+	<!-- imported/updated acp menu item element type -->
+	<xs:complexType name="acpmenuitem_import">
+		<xs:complexContent>
+			<xs:extension base="acpmenuitem_delete">
+				<xs:all>
+					<xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="link" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="permissions" type="xs:string" minOccurs="0" />
+					<xs:element name="options" type="xs:string" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/clipboardaction.xsd b/XSD/clipboardaction.xsd
index 09e2147d99..84bf526cac 100644
--- a/XSD/clipboardaction.xsd
+++ b/XSD/clipboardaction.xsd
@@ -1,47 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file is used for xml files which install, update or delete clip board actions. -->
 <xs:schema id="data" targetNamespace="http://www.woltlab.com" xmlns="http://www.woltlab.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified">
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="actionclassname" type="xs:string" minOccurs="0" />
-        <xs:element name="showorder" type="xs:string" minOccurs="0" />
-        <xs:element name="pages" minOccurs="0" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="page" nillable="true" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:simpleContent>
-                    <xs:extension base="xs:string">
-                    </xs:extension>
-                  </xs:simpleContent>
-                </xs:complexType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-      <xs:attribute name="name" form="unqualified" type="xs:string" />
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="data">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="action" />
-        <xs:element name="import">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element ref="action" minOccurs="0" maxOccurs="unbounded" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="delete">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element ref="action" minOccurs="0" maxOccurs="unbounded" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
+	<!-- action element -->
+	<xs:element name="action">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="actionclassname" type="xs:string" minOccurs="0" />
+				<xs:element name="showorder" type="xs:string" minOccurs="0" />
+				<xs:element name="pages" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="page" nillable="true" minOccurs="0" maxOccurs="unbounded">
+								<xs:complexType>
+									<xs:simpleContent>
+										<xs:extension base="xs:string">
+										</xs:extension>
+									</xs:simpleContent>
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="name" form="unqualified" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element ref="action" />
+				<xs:element name="import">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element ref="action" minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="delete">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element ref="action" minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:choice>
+		</xs:complexType>
+	</xs:element>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/clipboarditemtype.xsd b/XSD/clipboarditemtype.xsd
index 55a781ca4e..043110f108 100644
--- a/XSD/clipboarditemtype.xsd
+++ b/XSD/clipboarditemtype.xsd
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file is used for xml files which install, update or delete clip board item types. -->
 <xs:schema id="data" targetNamespace="http://www.woltlab.com" xmlns="http://www.woltlab.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified">
+	<!-- type element -->
 	<xs:element name="type">
 		<xs:complexType>
 			<xs:sequence>
@@ -8,6 +10,8 @@
 			<xs:attribute name="name" form="unqualified" type="xs:string" />
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- data element -->
 	<xs:element name="data">
 		<xs:complexType>
 			<xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/XSD/coreObject.xsd b/XSD/coreObject.xsd
new file mode 100644
index 0000000000..245c70cfad
--- /dev/null
+++ b/XSD/coreObject.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!-- This file is used for xml files which install or delete core objects. -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data node -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element type -->
+	<xs:complexType name="import">
+		<xs:sequence>
+			<xs:element name="coreobject" type="coreObject" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- delete element type -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="coreobject" type="coreObject" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	    
+	<!-- core object element type -->
+	<xs:complexType name="coreObject">
+		<xs:all>
+			<xs:element name="objectname" maxOccurs="1" minOccurs="1" type="woltlab_varchar" />
+		</xs:all>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/XSD/cronjob.xsd b/XSD/cronjob.xsd
index 5927e7539b..c0bddf2065 100644
--- a/XSD/cronjob.xsd
+++ b/XSD/cronjob.xsd
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!-- The file "cronjobs.xsd" is used for xml-files which installs, updates or deletes searchable cronjobs.  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-	
 	<!-- include types -->
 	<xs:include schemaLocation="types.xsd" />
 	
-	<!-- Represents the data-node. -->
+	<!-- data element -->
 	<xs:element name="data">
 		<xs:complexType>
 			<xs:all>
@@ -15,23 +14,23 @@
 		</xs:complexType>
 	</xs:element>
 	
-	<!-- Represents the import-node. -->
+	<!-- import element type -->
 	<xs:complexType name="import">
 		<xs:sequence>
-				<xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
+			<xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- Represents the delete-node. -->
+	<!-- delete element type -->
 	<xs:complexType name="delete">
 		<xs:sequence>
 			<xs:element name="cronjob" type="cronjob" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- Represents a cronjob which will be installed,updated or deleted. Extends the type "cronjob_delete". -->
+	<!-- cronjob element type -->
 	<xs:complexType name="cronjob">
-		<xs:all>                                        
+		<xs:all>
 			<xs:element name="classname" type="woltlab_varchar_nullable" minOccurs="0" />
 			<xs:element name="description" type="woltlab_varchar_nullable" minOccurs="0" />
 			<xs:element name="startminute" type="woltlab_varchar" minOccurs="1" />
diff --git a/XSD/eventlistener.xsd b/XSD/eventlistener.xsd
index be64f2629e..89d364c33b 100644
--- a/XSD/eventlistener.xsd
+++ b/XSD/eventlistener.xsd
@@ -1,62 +1,61 @@
 <?xml version="1.0"?>
-<!-- The file "eventlistener.xsd" is used for xml-files which installs, updates or deletes  event listeners. -->
+<!-- This file is used for xml files which install, update or delete event listeners. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-         <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                <xs:sequence>
-                        <xs:element name="eventlistener" type="eventlistener" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-         <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                <xs:sequence>
-                        <xs:element name="eventlistener" type="eventlistener" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-            
-        <!-- Represents a eventlistener which will be installed, updated or deleted. -->
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data node -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element type -->
+	<xs:complexType name="import">
+		<xs:sequence>
+			<xs:element name="eventlistener" type="eventlistener" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- delete element type -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="eventlistener" type="eventlistener" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	    
+	<!-- event listener element type -->
 	<xs:complexType name="eventlistener">
-                <xs:all>
-                        <xs:element name="eventclassname" minOccurs="0">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:minLength value="0" />
-                                                <xs:maxLength value="80" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="eventname" minOccurs="0">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:minLength value="0" />
-                                                <xs:maxLength value="50" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="listenerclassname" minOccurs="0">
-                                <xs:simpleType>
-                                        <xs:restriction base="xs:string">
-                                                <xs:minLength value="0" />
-                                                <xs:maxLength value="200" />
-                                        </xs:restriction>
-                                </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="inherit" type="woltlab_boolean" minOccurs="0" />
-                </xs:all>
+		<xs:all>
+			<xs:element name="eventclassname" minOccurs="0">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:minLength value="0" />
+						<xs:maxLength value="80" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="eventname" minOccurs="0">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:minLength value="0" />
+						<xs:maxLength value="50" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="listenerclassname" minOccurs="0">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:minLength value="0" />
+						<xs:maxLength value="200" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="inherit" type="woltlab_boolean" minOccurs="0" />
+		</xs:all>
 	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/language.xsd b/XSD/language.xsd
index d76ac2a875..a088fc5958 100644
--- a/XSD/language.xsd
+++ b/XSD/language.xsd
@@ -1,30 +1,29 @@
 <?xml version="1.0"?>
-<!-- The file "language.xsd" is used for xml-files which installs or updates language items.  -->
+<!-- This file is used for xml files which install or update language items. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="language">
-                <xs:complexType>
-                         <xs:sequence>
-                                <xs:element name="category" type="category" maxOccurs="unbounded" />
-                        </xs:sequence>
-                        <xs:attribute name="languagecode" type="woltlab_varchar" use="required" />
-                </xs:complexType>
-        </xs:element>
-        
-         <!-- Represents a language-category-node. -->
-        <xs:complexType name="category">
-                <xs:sequence>
-                        <xs:element name="item" type="item" maxOccurs="unbounded" />
-                </xs:sequence>
-                <xs:attribute name="name" type="woltlab_varchar" use="required" />
-        </xs:complexType>
-        
-         <!-- Represents a language-item-node. -->
-        <xs:complexType name="item" mixed="true">
-                <xs:attribute name="name" type="woltlab_varchar" use="required" />
-        </xs:complexType>
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="language">
+		<xs:complexType>
+			 <xs:sequence>
+				<xs:element name="category" type="category" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="languagecode" type="woltlab_varchar" use="required" />
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- language category element type -->
+	<xs:complexType name="category">
+		<xs:sequence>
+			<xs:element name="item" type="item" maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
+	</xs:complexType>
+	
+	<!-- language item element type -->
+	<xs:complexType name="item" mixed="true">
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
+	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/option.xsd b/XSD/option.xsd
new file mode 100644
index 0000000000..57b163bb8e
--- /dev/null
+++ b/XSD/option.xsd
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!-- The file "option.xsd" is used for xml-files which installs, updates or deletes options.  -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- include option types -->
+	<xs:include schemaLocation="optionTypes.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element type -->
+	<xs:complexType name="import">
+		 <xs:all>
+			<xs:element name="categories" type="categories_import" minOccurs="0" />
+			<xs:element name="options" type="options_import" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+	
+	<!-- categories import element type -->
+	<xs:complexType name="categories_import">
+		<xs:sequence>
+			<xs:element name="category" type="category_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated category element type -->
+	<xs:complexType name="category_import">
+		<xs:complexContent>
+			<xs:extension base="category_delete">
+				<xs:all>
+					<xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="options" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="permissions" type="woltlab_varchar_nullable" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<!-- options import element type -->
+	<xs:complexType name="options_import">
+		<xs:sequence>
+			<xs:element name="option" type="option_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated element type -->
+	<xs:complexType name="option_import">
+		<xs:complexContent>
+			<xs:extension base="option_delete">
+				<xs:all>
+					<xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
+					<xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
+					<xs:element name="validationpattern" type="xs:string" minOccurs="0" />				   
+					<xs:element name="selectoptions" type="xs:string" minOccurs="0" />
+					<xs:element name="enableoptions" type="xs:string" minOccurs="0" />
+					<xs:element name="hidden" type="woltlab_boolean" minOccurs="0" />					
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="options" type="xs:string" minOccurs="0" />
+					<xs:element name="permissions" type="xs:string" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/XSD/options.xsd b/XSD/options.xsd
deleted file mode 100644
index d53011d5e6..0000000000
--- a/XSD/options.xsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!-- The file "option.xsd" is used for xml-files which installs, updates or deletes options.  -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-         <!-- include option types -->
-        <xs:include schemaLocation="optiontypes.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-        <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                 <xs:all>
-                        <xs:element name="categories" type="categories_import" minOccurs="0" />
-                        <xs:element name="options" type="options_import" minOccurs="0" />
-                </xs:all>
-        </xs:complexType>
-        
-        <!-- Represents the import-categories-node. -->
-        <xs:complexType name="categories_import">
-                <xs:sequence>
-                        <xs:element name="category" type="category_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents a category which will be installed or updated. Extends the type "category_delete". -->
-	<xs:complexType name="category_import">
-                <xs:complexContent>
-                        <xs:extension base="category_delete">
-                                <xs:all>
-                                        <xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="options" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="permissions" type="woltlab_varchar_nullable" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-        
-        
-        <!-- Represents the import-options-node. -->
-        <xs:complexType name="options_import">
-                <xs:sequence>
-                        <xs:element name="option" type="option_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents an option which will be installed or updated. Extends the type "option_delete". -->
-	<xs:complexType name="option_import">
-                <xs:complexContent>
-                        <xs:extension base="option_delete">
-                                <xs:all>
-                                        <xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
-                                        <xs:element name="validationpattern" type="xs:string" minOccurs="0" />                                   
-                                        <xs:element name="selectoptions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="enableoptions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="hidden" type="woltlab_boolean" minOccurs="0" />                                        
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="options" type="xs:string" minOccurs="0" />
-                                        <xs:element name="permissions" type="xs:string" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/XSD/optiontypes.xsd b/XSD/optiontypes.xsd
index 6a237ef6ed..eea3bb411c 100644
--- a/XSD/optiontypes.xsd
+++ b/XSD/optiontypes.xsd
@@ -1,25 +1,23 @@
 <?xml version="1.0"?>
-<!-- The file "option.xsd" is used for xml-files which installs, updates or deletes options.  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                 <xs:choice maxOccurs="unbounded">
-                        <xs:element name="optioncategory" type="category_delete" minOccurs="0" />
-                        <xs:element name="option" type="option_delete" minOccurs="0" />
-                </xs:choice>
-        </xs:complexType>
-        
-        <!-- Represents a category which will be deleted. The node requires the attribute "name". -->
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- delete element -->
+	<xs:complexType name="delete">
+		 <xs:choice maxOccurs="unbounded">
+			<xs:element name="optioncategory" type="category_delete" minOccurs="0" />
+			<xs:element name="option" type="option_delete" minOccurs="0" />
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- deleted category element type -->
 	<xs:complexType name="category_delete">
-                <xs:attribute name="name" type="woltlab_varchar" use="required" />
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
 	</xs:complexType>
-        
-         <!-- Represents an option which will be deleted. The node requires the attribute "name". -->
+	
+	<!-- deleted option element type -->
 	<xs:complexType name="option_delete">
-                <xs:attribute name="name" type="woltlab_varchar" use="required" />
+		<xs:attribute name="name" type="woltlab_varchar" use="required" />
 	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/package.xsd b/XSD/package.xsd
index 64b1b478c3..67ed0b3cf5 100644
--- a/XSD/package.xsd
+++ b/XSD/package.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-	<!-- include WoltLab data types -->
+	<!-- include types -->
 	<xs:include schemaLocation="types.xsd" />
 	
-	<!-- data node -->
+	<!-- data element -->
 	<xs:element name="package">
 		<xs:complexType>
 			<xs:choice maxOccurs="unbounded">
@@ -18,7 +18,7 @@
 		</xs:complexType>
 	</xs:element>
 	
-	<!-- simplePackage element -->
+	<!-- simple package element -->
 	<xs:complexType name="simplePackage">
 		<xs:simpleContent>
 			<xs:extension base="xs:string">
@@ -28,8 +28,7 @@
 		</xs:simpleContent>
 	</xs:complexType>
 	
-	
-	<!-- optionalPackage element -->
+	<!-- optional package element -->
 	<xs:complexType name="optionalPackage">
 		<xs:simpleContent>
 			<xs:extension base="xs:string">
@@ -39,7 +38,7 @@
 		</xs:simpleContent>
 	</xs:complexType>
 	
-	<!-- excludedPackage element -->
+	<!-- excluded package element -->
 	<xs:complexType name="excludedPackage">
 		<xs:simpleContent>
 			<xs:extension base="xs:string">
@@ -48,24 +47,24 @@
 		</xs:simpleContent>
 	</xs:complexType>
 	
-	<!-- instructions node -->
+	<!-- instructions elements -->
 	<xs:complexType name="instructions">
 		<xs:sequence>
 			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip" />
 		</xs:sequence>
-		<xs:attribute name="type" type="instructionsType" use="required" />
+		<xs:attribute name="type" type="instructionType" use="required" />
 		<xs:attribute name="fromversion" type="woltlab_varchar" />
 	</xs:complexType>
 	
-	<!-- instructionsType attribute -->
-	<xs:simpleType name="instructionsType">
+	<!-- instruction type attribute -->
+	<xs:simpleType name="instructionType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="install" />
 			<xs:enumeration value="update" />
 		</xs:restriction>
 	</xs:simpleType>
 	
-	<!-- packageInformation node -->
+	<!-- package information element -->
 	<xs:complexType name="packageInformation">
 		<xs:sequence>
 			<xs:element name="packagename" minOccurs="1" maxOccurs="unbounded">
@@ -95,7 +94,7 @@
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- authorInformation node -->
+	<!-- author information element -->
 	<xs:complexType name="authorInformation">
 		<xs:all>
 			<xs:element name="author" type="woltlab_varchar" minOccurs="1" />
@@ -103,21 +102,21 @@
 		</xs:all>
 	</xs:complexType>
 	
-	<!-- requiredPackages node -->
+	<!-- required packages element -->
 	<xs:complexType name="requiredPackages">
 		<xs:sequence>
 			<xs:element name="requiredpackage" type="simplePackage" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- optionalPackages node -->
+	<!-- optional packages element -->
 	<xs:complexType name="optionalPackages">
 		<xs:sequence>
 			<xs:element name="optionalpackage" type="optionalPackage" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	
-	<!-- excludedPackages node -->
+	<!-- excluded packages element -->
 	<xs:complexType name="excludedPackages">
 		<xs:sequence>
 			<xs:element name="excludedpackage" type="excludedPackage" minOccurs="0" maxOccurs="unbounded" />
diff --git a/XSD/pip.xsd b/XSD/packageInstallationPlugin.xsd
similarity index 85%
rename from XSD/pip.xsd
rename to XSD/packageInstallationPlugin.xsd
index c7e3da26c7..e7befd17b8 100644
--- a/XSD/pip.xsd
+++ b/XSD/packageInstallationPlugin.xsd
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file is used for xml files which install or update package installation plugins. -->
 <xs:schema id="data" targetNamespace="http://www.woltlab.com" xmlns="http://www.woltlab.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified">
 	<xs:element name="data">
 		<xs:complexType>
diff --git a/XSD/packageUpdateServer.xsd b/XSD/packageUpdateServer.xsd
index 07fe0a3f27..6ed4c11cdb 100644
--- a/XSD/packageUpdateServer.xsd
+++ b/XSD/packageUpdateServer.xsd
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is used for package server xml files. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
 	<!-- include types -->
 	<xs:include schemaLocation="types.xsd" />
 	
-	<!-- section tag -->
+	<!-- section element -->
 	<xs:element name="section">
 		<xs:complexType>
 			<xs:sequence>
@@ -17,16 +18,16 @@
 	<xs:element name="package">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element ref="packageinformation" />
-				<xs:element ref="authorinformation" />
+				<xs:element ref="packageInformation" />
+				<xs:element ref="authorInformation" />
 				<xs:element ref="versions" />
 			</xs:sequence>
 			<xs:attribute name="name" use="required" type="woltlab_varchar" />
 		</xs:complexType>
 	</xs:element>
 	
-	<!-- package -->
-	<xs:element name="packageinformation">
+	<!-- package information element -->
+	<xs:element name="packageInformation">
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element ref="packagename" />
@@ -38,13 +39,21 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- package name element -->
 	<xs:element name="packagename" type="woltlab_varchar" />
+	
+	<!-- package description element -->
 	<xs:element name="packagedescription" type="woltlab_varchar" />
+	
+	<!-- plugin element -->
 	<xs:element name="plugin" type="woltlab_varchar" />
+	
+	<!-- standalone element -->
 	<xs:element name="standalone" type="woltlab_boolean" />
 	
-	<!-- author -->
-	<xs:element name="authorinformation">
+	<!-- author information element -->
+	<xs:element name="authorInformation">
 		<xs:complexType>
 			<xs:sequence>
 				<xs:element ref="author" />
@@ -52,10 +61,14 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- author element -->
 	<xs:element name="author" type="xs:string" />
+	
+	<!-- author url element -->
 	<xs:element name="authorurl" type="xs:anyURI" />
 	
-	<!-- versions -->
+	<!-- versions element -->
 	<xs:element name="versions">
 		<xs:complexType>
 			<xs:sequence>
@@ -63,6 +76,8 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- version element -->
 	<xs:element name="version">
 		<xs:complexType>
 			<xs:sequence>
@@ -76,6 +91,8 @@
 			<xs:attribute name="name" use="required" />
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- from versions element -->
 	<xs:element name="fromversions">
 		<xs:complexType>
 			<xs:sequence>
@@ -83,7 +100,11 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- fromversion element -->
 	<xs:element name="fromversion" type="xs:string" />
+	
+	<!-- required packages element -->
 	<xs:element name="requiredpackages">
 		<xs:complexType>
 			<xs:sequence>
@@ -91,6 +112,8 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- required package element -->
 	<xs:element name="requiredpackage">
 		<xs:complexType>
 			<xs:simpleContent>
@@ -100,8 +123,16 @@
 			</xs:simpleContent>
 		</xs:complexType>
 	</xs:element>
+	
+	<!-- update type element -->
 	<xs:element name="updatetype" type="xs:NCName" />
+	
+	<!-- timestamp element -->
 	<xs:element name="timestamp" type="xs:integer" />
+	
+	<!-- version type element -->
 	<xs:element name="versiontype" type="xs:NCName" />
+	
+	<!-- license element -->
 	<xs:element name="license" type="xs:NCName" />
 </xs:schema>
diff --git a/XSD/pagelocation.xsd b/XSD/pagelocation.xsd
index 8f879704e4..1779f2802d 100644
--- a/XSD/pagelocation.xsd
+++ b/XSD/pagelocation.xsd
@@ -1,48 +1,47 @@
 <?xml version="1.0"?>
-<!-- The file "pagelocation.xsd" is used for xml-files which installs, updates or deletes page locations.  -->
+<!-- This file is used for xml files which install, update or delete page locations.  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-         <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                <xs:sequence>
-                        <xs:element name="pagelocation" type="pagelocation_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-         <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                <xs:sequence>
-                        <xs:element name="pagelocation" type="pagelocation_delete" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        <!-- Represents a pagelocation which will be deleted. The node needs the attribute "name". -->
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element -->
+	<xs:complexType name="import">
+		<xs:sequence>
+			<xs:element name="pagelocation" type="pagelocation_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- delete element -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="pagelocation" type="pagelocation_delete" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- deleted page location element type -->
 	<xs:complexType name="pagelocation_delete">
 		  <xs:attribute name="name" type="woltlab_varchar" use="required" />
-	</xs:complexType>        
-        
-         <!-- Represents a pagelocation which will be installed or updated. Extends the type "pagelocation_delete". -->
+	</xs:complexType>	
+	
+	<!-- imported/updated page location element type -->
 	<xs:complexType name="pagelocation_import">
-                <xs:complexContent>
-                        <xs:extension base="pagelocation_delete">
-                                <xs:all>
-                                        <xs:element name="pattern" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="classpath" type="woltlab_varchar_nullable" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
+		<xs:complexContent>
+			<xs:extension base="pagelocation_delete">
+				<xs:all>
+					<xs:element name="pattern" type="woltlab_varchar" minOccurs="1" />
+					<xs:element name="classpath" type="woltlab_varchar_nullable" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
 	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/pagemenu.xsd b/XSD/pagemenu.xsd
index 60177e38b4..854e8578da 100644
--- a/XSD/pagemenu.xsd
+++ b/XSD/pagemenu.xsd
@@ -1,58 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The file "pagemenu.xsd" is used for xml-files which installs, updates or deletes header menu items.  -->
+<!-- This file is used for xml-files which install, update or delete page menu items. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-         <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                <xs:sequence>
-                        <xs:element name="pagemenuitem" type="pagemenuitem_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-         <!-- Represents the delete-node. -->
-        <xs:complexType name="delete">
-                <xs:sequence>
-                        <xs:element name="pagemenuitem" type="pagemenuitem_delete" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        <!-- Represents a pagemenuitem which will be deleted. The node needs the attribute "name". -->
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element -->
+	<xs:complexType name="import">
+		<xs:sequence>
+			<xs:element name="pagemenuitem" type="pagemenuitem_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- delete element -->
+	<xs:complexType name="delete">
+		<xs:sequence>
+			<xs:element name="pagemenuitem" type="pagemenuitem_delete" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- deleted page menu item element -->
 	<xs:complexType name="pagemenuitem_delete">
 		  <xs:attribute name="name" type="woltlab_varchar" use="required" />
-	</xs:complexType>        
-        
-         <!-- Represents a pagemenuitem which will be installed or updated. Extends the type "pagemenu_delete". -->
+	</xs:complexType>	
+	
+	<!-- imported/updated page menu item element -->
 	<xs:complexType name="pagemenuitem_import">
-                <xs:complexContent>
-                        <xs:extension base="pagemenuitem_delete">
-                                <xs:all>
-                                        <xs:element name="link" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="options" type="xs:string" minOccurs="0" />
-                                        <xs:element name="permissions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="position" minOccurs="0">
-                                        	<xs:simpleType>
-	                                        	<xs:restriction base="xs:string">
-	                                        		<xs:enumeration value="header" />
-	                                        		<xs:enumeration value="footer" />
+		<xs:complexContent>
+			<xs:extension base="pagemenuitem_delete">
+				<xs:all>
+					<xs:element name="link" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="options" type="xs:string" minOccurs="0" />
+					<xs:element name="permissions" type="xs:string" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="position" minOccurs="0">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="header" />
+								<xs:enumeration value="footer" />
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
 	</xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/XSD/types.xsd b/XSD/types.xsd
index 708a1c5d4a..60c7ef224e 100644
--- a/XSD/types.xsd
+++ b/XSD/types.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-	
-        <!-- Defines a string with a minimum length of 1 and a maximum length of 255 signs. -->
+	<!-- string type with a minimum length of 1 and a maximum length of 255 characters -->
 	<xs:simpleType name="woltlab_varchar">
 		<xs:restriction base="xs:string">
 			<xs:minLength value="1"/>
@@ -9,7 +8,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	
-        <!-- Defines a string with a minimum length of 0 and a maximum length of 255 signs. -->
+	<!-- string type with a minimum length of 0 and a maximum length of 255 signs -->
 	<xs:simpleType name="woltlab_varchar_nullable">
 		<xs:restriction base="xs:string">
 			<xs:minLength value="0" />
@@ -17,7 +16,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	
-	<!-- Defines a boolean type which only accepts a '0' or a '1'. -->
+	<!-- boolean type which only accepts '0' or '1' -->
 	<xs:simpleType name="woltlab_boolean">
 		<xs:restriction base="xs:integer">
 			<xs:minInclusive value="0" />
diff --git a/XSD/userGroupOption.xsd b/XSD/userGroupOption.xsd
new file mode 100644
index 0000000000..3984502c96
--- /dev/null
+++ b/XSD/userGroupOption.xsd
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!-- This file is used for xml files which install, update or delete user group options. -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	 <!-- include option types -->
+	<xs:include schemaLocation="optionTypes.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element -->
+	<xs:complexType name="import">
+		 <xs:all>
+			<xs:element name="categories" type="categories_import" minOccurs="0" />
+			<xs:element name="options" type="options_import" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+	
+	<!-- categories import element type -->
+	<xs:complexType name="categories_import">
+		<xs:sequence>
+			<xs:element name="category" type="category_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated category element type -->
+	<xs:complexType name="category_import">
+		<xs:complexContent>
+			<xs:extension base="category_delete">
+				<xs:all>
+					<xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="options" type="woltlab_varchar_nullable" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<!-- options import element type -->
+	<xs:complexType name="options_import">
+		<xs:sequence>
+			<xs:element name="option" type="option_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated element type -->
+	<xs:complexType name="option_import">
+		<xs:complexContent>
+			<xs:extension base="option_delete">
+				<xs:all>
+					<xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
+					<xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
+					<xs:element name="validationpattern" type="xs:string" minOccurs="0" />
+					<xs:element name="enableoptions" type="xs:string" minOccurs="0" />				       
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="options" type="xs:string" minOccurs="0" />
+					<xs:element name="permissions" type="xs:string" minOccurs="0" />
+					<xs:element name="admindefaultvalue" type="xs:string" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/XSD/userOption.xsd b/XSD/userOption.xsd
new file mode 100644
index 0000000000..e29381140b
--- /dev/null
+++ b/XSD/userOption.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!-- This file is used for xml files which install, update or delete user options. -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
+	<!-- include types -->
+	<xs:include schemaLocation="types.xsd" />
+	
+	<!-- include option types -->
+	<xs:include schemaLocation="optionTypes.xsd" />
+	
+	<!-- data element -->
+	<xs:element name="data">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="import" type="import" minOccurs="0" />
+				<xs:element name="delete" type="delete" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- import element -->
+	<xs:complexType name="import">
+		 <xs:all>
+			<xs:element name="categories" type="categories_import" minOccurs="0" />
+			<xs:element name="options" type="options_import" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+	
+	<!-- categories import element type -->
+	<xs:complexType name="categories_import">
+		<xs:sequence>
+			<xs:element name="category" type="category_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated category element type -->
+	<xs:complexType name="category_import">
+		<xs:complexContent>
+			<xs:extension base="category_delete">
+				<xs:all>
+					<xs:element name="icon" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="menuicon" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<!-- options import element type -->
+	<xs:complexType name="options_import">
+		<xs:sequence>
+			<xs:element name="option" type="option_import" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- imported/updated element type -->
+	<xs:complexType name="option_import">
+		<xs:complexContent>
+			<xs:extension base="option_delete">
+				<xs:all>
+					<xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
+					<xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
+					<xs:element name="validationpattern" type="xs:string" minOccurs="0" />
+					<xs:element name="outputclass" type="woltlab_varchar_nullable" minOccurs="0" />
+					<xs:element name="selectoptions" type="xs:string" minOccurs="0" />
+					<xs:element name="enableoptions" type="xs:string" minOccurs="0" />
+					<xs:element name="required" type="woltlab_boolean" minOccurs="0" />
+					<xs:element name="editable" minOccurs="0" >
+						<xs:simpleType>
+							<xs:restriction base="xs:integer">
+								<xs:minInclusive value="0" />
+								<xs:maxInclusive value="4" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="visible" minOccurs="0">
+						<xs:simpleType>
+							<xs:restriction base="xs:integer">
+								<xs:minInclusive value="0" />
+								<xs:maxInclusive value="4" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="searchable" type="woltlab_boolean" minOccurs="0" />
+					<xs:element name="deactivated" type="woltlab_boolean" minOccurs="0" />
+					<xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
+					<xs:element name="options" type="xs:string" minOccurs="0" />
+					<xs:element name="permissions" type="xs:string" minOccurs="0" />
+				</xs:all>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/XSD/usergroupoptions.xsd b/XSD/usergroupoptions.xsd
deleted file mode 100644
index 728268f8c5..0000000000
--- a/XSD/usergroupoptions.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!-- The file "option.xsd" is used for xml-files which installs, updates or deletes options.  -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-         <!-- include option types -->
-        <xs:include schemaLocation="optiontypes.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-        <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                 <xs:all>
-                        <xs:element name="categories" type="categories_import" minOccurs="0" />
-                        <xs:element name="options" type="options_import" minOccurs="0" />
-                </xs:all>
-        </xs:complexType>
-        
-        <!-- Represents the import-categories-node. -->
-        <xs:complexType name="categories_import">
-                <xs:sequence>
-                        <xs:element name="category" type="category_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents a category which will be installed or updated. Extends the type "category_delete". -->
-	<xs:complexType name="category_import">
-                <xs:complexContent>
-                        <xs:extension base="category_delete">
-                                <xs:all>
-                                        <xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="options" type="woltlab_varchar_nullable" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-        
-        
-        <!-- Represents the import-options-node. -->
-        <xs:complexType name="options_import">
-                <xs:sequence>
-                        <xs:element name="option" type="option_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents an option which will be installed or updated. Extends the type "category_delete". -->
-	<xs:complexType name="option_import">
-                <xs:complexContent>
-                        <xs:extension base="option_delete">
-                                <xs:all>
-                                        <xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
-                                        <xs:element name="validationpattern" type="xs:string" minOccurs="0" />
-                                        <xs:element name="enableoptions" type="xs:string" minOccurs="0" />                                       
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                        <xs:element name="options" type="xs:string" minOccurs="0" />
-					<xs:element name="permissions" type="xs:string" minOccurs="0" />
-					<xs:element name="admindefaultvalue" type="xs:string" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/XSD/useroptions.xsd b/XSD/useroptions.xsd
deleted file mode 100644
index a672b7f40d..0000000000
--- a/XSD/useroptions.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<!-- The file "option.xsd" is used for xml-files which installs, updates or deletes options.  -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.woltlab.com" targetNamespace="http://www.woltlab.com" elementFormDefault="qualified">
-        
-        <!-- include types -->
-        <xs:include schemaLocation="types.xsd" />
-         <!-- include option types -->
-        <xs:include schemaLocation="optiontypes.xsd" />
-        
-        <!-- Represents the data-node. -->
-        <xs:element name="data">
-                <xs:complexType>
-                        <xs:all>
-                                <xs:element name="import" type="import" minOccurs="0" />
-                                <xs:element name="delete" type="delete" minOccurs="0" />
-                        </xs:all>
-                </xs:complexType>
-        </xs:element>
-        
-        <!-- Represents the import-node. -->
-        <xs:complexType name="import">
-                 <xs:all>
-                        <xs:element name="categories" type="categories_import" minOccurs="0" />
-                        <xs:element name="options" type="options_import" minOccurs="0" />
-                </xs:all>
-        </xs:complexType>
-        
-        <!-- Represents the import-categories-node. -->
-        <xs:complexType name="categories_import">
-                <xs:sequence>
-                        <xs:element name="category" type="category_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents a category which will be installed or updated. Extends the type "category_delete". -->
-	<xs:complexType name="category_import">
-                <xs:complexContent>
-                        <xs:extension base="category_delete">
-                                <xs:all>
-                                        <xs:element name="icon" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="menuicon" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="parent" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-        
-        
-        <!-- Represents the import-options-node. -->
-        <xs:complexType name="options_import">
-                <xs:sequence>
-                        <xs:element name="option" type="option_import" maxOccurs="unbounded" />
-                </xs:sequence>
-        </xs:complexType>
-        
-        
-	
-	<!-- Represents an option which will be installed or updated. Extends the type "category_delete". -->
-	<xs:complexType name="option_import">
-                <xs:complexContent>
-                        <xs:extension base="option_delete">
-                                <xs:all>
-                                        <xs:element name="categoryname" type="woltlab_varchar" minOccurs="1" />
-                                        <xs:element name="optiontype" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="defaultvalue" type="xs:string" minOccurs="0" />
-                                        <xs:element name="validationpattern" type="xs:string" minOccurs="0" />
-                                        <xs:element name="outputclass" type="woltlab_varchar_nullable" minOccurs="0" />
-                                        <xs:element name="selectoptions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="enableoptions" type="xs:string" minOccurs="0" />
-                                        <xs:element name="required" type="woltlab_boolean" minOccurs="0" />
-                                        <xs:element name="editable" minOccurs="0" >
-						<xs:simpleType>
-                                                        <xs:restriction base="xs:integer">
-                                                                <xs:minInclusive value="0" />
-                                                                <xs:maxInclusive value="4" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:element>
-                                        <xs:element name="visible" minOccurs="0">
-                                                <xs:simpleType>
-                                                        <xs:restriction base="xs:integer">
-                                                                <xs:minInclusive value="0" />
-                                                                <xs:maxInclusive value="4" />
-                                                        </xs:restriction>
-                                                </xs:simpleType>
-                                        </xs:element>
-                                        <xs:element name="searchable" type="woltlab_boolean" minOccurs="0" />
-                                        <xs:element name="deactivated" type="woltlab_boolean" minOccurs="0" />
-                                        <xs:element name="showorder" type="xs:unsignedInt" minOccurs="0" />
-					<xs:element name="options" type="xs:string" minOccurs="0" />
-					<xs:element name="permissions" type="xs:string" minOccurs="0" />
-                                </xs:all>
-                        </xs:extension>
-                </xs:complexContent>
-	</xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/com.woltlab.wcf/acpmenu.xml b/com.woltlab.wcf/acpmenu.xml
index 895e1ff223..6ee1be7e60 100644
--- a/com.woltlab.wcf/acpmenu.xml
+++ b/com.woltlab.wcf/acpmenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/acpmenu.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/acpMenu.xsd">
 	<import>
 		<acpmenuitem name="wcf.acp.menu.link.system">
 			<showorder>1</showorder>
diff --git a/com.woltlab.wcf/clipboardaction.xml b/com.woltlab.wcf/clipboardaction.xml
index 6f3702e0d3..6b249b34f1 100644
--- a/com.woltlab.wcf/clipboardaction.xml
+++ b/com.woltlab.wcf/clipboardaction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/clipboardaction.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/clipBoardAction.xsd">
 	<import>
 		<action name="assignToGroup">
 			<actionclassname><![CDATA[wcf\system\clipboard\action\UserClipboardAction]]></actionclassname>
diff --git a/com.woltlab.wcf/clipboarditemtype.xml b/com.woltlab.wcf/clipboarditemtype.xml
index b51e7d4d00..83007820f7 100644
--- a/com.woltlab.wcf/clipboarditemtype.xml
+++ b/com.woltlab.wcf/clipboarditemtype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/clipboarditemtype.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/clipBoardItemType.xsd">
 	<import>
 		<type name="com.woltlab.wcf.user">
 			<listclassname><![CDATA[wcf\data\user\UserList]]></listclassname>
diff --git a/com.woltlab.wcf/coreobject.xml b/com.woltlab.wcf/coreobject.xml
index ef99971238..9fab9c63ba 100644
--- a/com.woltlab.wcf/coreobject.xml
+++ b/com.woltlab.wcf/coreobject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/coreobject.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/coreObject.xsd">
 	<import>
 		<coreobject>
 			<objectname><![CDATA[wcf\system\breadcrumb\Breadcrumbs]]></objectname>
diff --git a/com.woltlab.wcf/eventlistener.xml b/com.woltlab.wcf/eventlistener.xml
index 8d2f3688b9..bfae4e17db 100644
--- a/com.woltlab.wcf/eventlistener.xml
+++ b/com.woltlab.wcf/eventlistener.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/eventlistener.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/eventListener.xsd">
 	<import>
 		<eventlistener>
 			<eventclassname>wcf\page\AbstractPage</eventclassname>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index a2b7589ccf..fd4d387793 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/options.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/option.xsd">
 	<import>
 		<categories>
 			<!-- modules -->
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 74a48400e5..0643accf88 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -15,17 +15,17 @@
 	</authorinformation>
 	
 	<instructions type="install">
-		<instruction type="packageinstallationplugin">pip.xml</instruction>
-		<instruction type="acpmenu">acpmenu.xml</instruction>
-		<instruction type="usergroupoption">usergroupoption.xml</instruction>
+		<instruction type="packageinstallationplugin">packageInstallationPlugin.xml</instruction>
+		<instruction type="acpmenu">acpMenu.xml</instruction>
+		<instruction type="usergroupoption">userGroupOption.xml</instruction>
 		<instruction type="option">option.xml</instruction>
-		<instruction type="useroption">useroption.xml</instruction>
+		<instruction type="useroption">userOption.xml</instruction>
 		<instruction type="template">template.tar</instruction>
-		<instruction type="eventlistener">eventlistener.xml</instruction>
+		<instruction type="eventlistener">eventListener.xml</instruction>
 		<instruction type="script">acp/install.php</instruction>
 		<instruction type="cronjob">cronjob.xml</instruction>
-		<instruction type="coreobject">coreobject.xml</instruction>
-		<instruction type="clipboardaction">clipboardaction.xml</instruction>
-		<instruction type="clipboarditemtype">clipboarditemtype.xml</instruction>
+		<instruction type="coreobject">coreObject.xml</instruction>
+		<instruction type="clipboardaction">clipBoardAction.xml</instruction>
+		<instruction type="clipboarditemtype">clipBoardItemType.xml</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/pip.xml b/com.woltlab.wcf/packageInstallationPlugin.xml
similarity index 95%
rename from com.woltlab.wcf/pip.xml
rename to com.woltlab.wcf/packageInstallationPlugin.xml
index 9778467768..5fd4223568 100644
--- a/com.woltlab.wcf/pip.xml
+++ b/com.woltlab.wcf/packageInstallationPlugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/pip.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/packageInstallationPlugin.xsd">
 	<import>
 		<pip name="acpmenu">wcf\system\package\plugin\ACPMenuPackageInstallationPlugin</pip>
 		<pip name="acptemplate">wcf\system\package\plugin\ACPTemplatePackageInstallationPlugin</pip>
diff --git a/com.woltlab.wcf/usergroupoption.xml b/com.woltlab.wcf/usergroupoption.xml
index a3385b99dc..a369ca2cf4 100644
--- a/com.woltlab.wcf/usergroupoption.xml
+++ b/com.woltlab.wcf/usergroupoption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/usergroupoptions.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/userGroupOption.xsd">
 	<import>
 		<categories>
 			<category name="user"></category>
diff --git a/com.woltlab.wcf/useroption.xml b/com.woltlab.wcf/useroption.xml
index 1a44a63642..e2be324da7 100644
--- a/com.woltlab.wcf/useroption.xml
+++ b/com.woltlab.wcf/useroption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/useroptions.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/userOption.xsd">
 	<import>
 		<categories>
 			<category name="hidden"></category>
-- 
2.20.1