diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
index ee7ce62a1..805b29aa0 100644
--- a/rdf/zeugnis.rdf.php
+++ b/rdf/zeugnis.rdf.php
@@ -186,7 +186,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "\n		<anrede>".$row->anrede."</anrede>";
 		$xml .= "\n		<vorname>".$row->vorname."</vorname>";
 		$xml .= "		<nachname>".$row->nachname."</nachname>";
-		$xml .= "		<name>".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.mb_strtoupper($row->nachname).($row->titelpost!=''?', '.$row->titelpost:''))."</name>";
+		$xml .= "		<name>".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.$row->nachname.($row->titelpost!=''?', '.$row->titelpost:''))."</name>";
 		$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
 		$xml .= "		<gebdatum>".$gebdatum."</gebdatum>";
 		$xml .= "		<matrikelnr>".trim($row->matrikelnr)."</matrikelnr>";
diff --git a/system/xsl/ZeugnisEngNeu_0.xsl b/system/xsl/ZeugnisEngNeu_0.xsl
index cbe495b24..361fc76ee 100644
--- a/system/xsl/ZeugnisEngNeu_0.xsl
+++ b/system/xsl/ZeugnisEngNeu_0.xsl
@@ -446,13 +446,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P14">Course</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">1</text:span></text:p>
+                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">1</text:span></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">2</text:span></text:p>
+                        <text:p text:style-name="P15">ECTS</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
+                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">2</text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
                 <xsl:apply-templates select="unterrichtsfach"/>
@@ -464,19 +464,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P13">-</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
+                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9"><xsl:value-of select="ects_gesamt"/></text:p>
+                        <text:p text:style-name="P9">-</text:p>
                     </table:table-cell>
                 </table:table-row>            
                 <xsl:apply-templates select="fussnote"/> 
             </table:table>
             <text:p text:style-name="P26"/>
-            <text:p text:style-name="P22">¹ Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
-            <text:p text:style-name="P22">² 1 Semester period per week = 45 minutes</text:p>
             <text:p text:style-name="P7"/>
             <xsl:if test="abschlusspruefung_typ">
 	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -549,21 +549,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
         <text:p text:style-name="P9">
-        <xsl:if test="note=''">
+        <xsl:if test="sws=''">
 			<xsl:text>-</xsl:text>
 		</xsl:if>
-		<xsl:value-of select="note"/>
+		<xsl:value-of select="sws"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="sws=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
         <text:p text:style-name="P9">
 	        <xsl:if test="ects=''">
 				<xsl:text>-</xsl:text>
@@ -571,6 +563,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<xsl:value-of select="ects"/>
 		</text:p>
     </table:table-cell>
+    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+        <text:p text:style-name="P9">
+	        <xsl:if test="note=''">
+				<xsl:text>-</xsl:text>
+			</xsl:if>
+			<xsl:value-of select="note"/>
+		</text:p>
+    </table:table-cell>
 </table:table-row>
 </xsl:template>
 <xsl:template match="fussnote">
@@ -649,19 +649,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
+        	<xsl:value-of select="sws"/>
 		</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
+        	<xsl:value-of select="ects"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
+        	<xsl:if test="../projektarbeit_note_anzeige='true'">
+				<xsl:value-of select="note"/>
+			</xsl:if>
         </text:p>
     </table:table-cell>
 </table:table-row>
diff --git a/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl b/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl
index 4afd673f2..3240ac416 100644
--- a/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl
+++ b/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl
@@ -434,13 +434,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P14">Course</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">1</text:span></text:p>
+                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">1</text:span></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">SP/W<text:span text:style-name="T4">2</text:span></text:p>
+                        <text:p text:style-name="P15">ECTS</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
-                        <text:p text:style-name="P15">ECTS</text:p>
+                        <text:p text:style-name="P15">Grade<text:span text:style-name="T4">2</text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
                 <xsl:apply-templates select="unterrichtsfach"/>
@@ -452,19 +452,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P13">-</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
+                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9"><xsl:value-of select="ects_gesamt"/></text:p>
+                        <text:p text:style-name="P9">-</text:p>
                     </table:table-cell>
                 </table:table-row>            
                 <xsl:apply-templates select="fussnote"/> 
             </table:table>
             <text:p text:style-name="P26"/>
-            <text:p text:style-name="P22">¹ Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
+            <text:p text:style-name="P22">¹ 1 Semester period per week = 45 minutes</text:p>
+            <text:p text:style-name="P22">² Grades:<text:tab/>excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar),</text:p>
             <text:p text:style-name="P22">
                 <text:tab/>Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg)</text:p>
-            <text:p text:style-name="P22">² 1 Semester period per week = 45 minutes</text:p>
             <text:p text:style-name="P7"/>
             <xsl:if test="abschlusspruefung_typ">
 	            <table:table table:name="Tabelle2" table:style-name="Tabelle2">
@@ -537,21 +537,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
         <text:p text:style-name="P9">
-        <xsl:if test="note=''">
+        <xsl:if test="sws=''">
 			<xsl:text>-</xsl:text>
 		</xsl:if>
-		<xsl:value-of select="note"/>
+		<xsl:value-of select="sws"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="sws=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
         <text:p text:style-name="P9">
 	        <xsl:if test="ects=''">
 				<xsl:text>-</xsl:text>
@@ -559,6 +551,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<xsl:value-of select="ects"/>
 		</text:p>
     </table:table-cell>
+    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+        <text:p text:style-name="P9">
+	        <xsl:if test="note=''">
+				<xsl:text>-</xsl:text>
+			</xsl:if>
+			<xsl:value-of select="note"/>
+		</text:p>
+    </table:table-cell>
 </table:table-row>
 </xsl:template>
 <xsl:template match="fussnote">
@@ -637,19 +637,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
+        	<xsl:value-of select="sws"/>
 		</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
+        	<xsl:value-of select="ects"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
+        	<xsl:if test="../projektarbeit_note_anzeige='true'">
+				<xsl:value-of select="note"/>
+			</xsl:if>
         </text:p>
     </table:table-cell>
 </table:table-row>
diff --git a/system/xsl/ZeugnisNeu_0.xsl b/system/xsl/ZeugnisNeu_0.xsl
index 81718283f..9d531ab1b 100644
--- a/system/xsl/ZeugnisNeu_0.xsl
+++ b/system/xsl/ZeugnisNeu_0.xsl
@@ -416,15 +416,15 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P14">Lehrveranstaltung</text:p>
                     </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">Note</text:p>
-                    </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P15">SWS</text:p>
                     </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
+                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P15">ECTS</text:p>
                     </table:table-cell>
+                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
+                        <text:p text:style-name="P15">Note</text:p>
+                    </table:table-cell>
                 </table:table-row>
                 <xsl:apply-templates select="unterrichtsfach"/>
                 <table:table-row>
@@ -435,10 +435,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P13">-</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
+                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9"><xsl:value-of select="ects_gesamt"/></text:p>
+                        <text:p text:style-name="P9">-</text:p>
                     </table:table-cell>
                 </table:table-row>            
                 <xsl:apply-templates select="fussnote"/> 
@@ -494,21 +494,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
         <text:p text:style-name="P9">
-        <xsl:if test="note=''">
+        <xsl:if test="sws=''">
 			<xsl:text>-</xsl:text>
 		</xsl:if>
-		<xsl:value-of select="note"/>
+		<xsl:value-of select="sws"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="sws=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
         <text:p text:style-name="P9">
 	        <xsl:if test="ects=''">
 				<xsl:text>-</xsl:text>
@@ -516,6 +508,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<xsl:value-of select="ects"/>
 		</text:p>
     </table:table-cell>
+    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+        <text:p text:style-name="P9">
+	        <xsl:if test="note=''">
+				<xsl:text>-</xsl:text>
+			</xsl:if>
+			<xsl:value-of select="note"/>
+		</text:p>
+    </table:table-cell>
 </table:table-row>
 </xsl:template>
 <xsl:template match="fussnote">
@@ -542,19 +542,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
+        	<xsl:value-of select="sws"/>
 		</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
+        	<xsl:value-of select="ects"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
+        	<xsl:if test="../projektarbeit_note_anzeige='true'">
+				<xsl:value-of select="note"/>
+			</xsl:if>
         </text:p>
     </table:table-cell>
 </table:table-row>
diff --git a/system/xsl/ZeugnisNeu_Lehrgaenge.xsl b/system/xsl/ZeugnisNeu_Lehrgaenge.xsl
index 99fc13d81..1974c4671 100644
--- a/system/xsl/ZeugnisNeu_Lehrgaenge.xsl
+++ b/system/xsl/ZeugnisNeu_Lehrgaenge.xsl
@@ -416,15 +416,15 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P14">Lehrveranstaltung</text:p>
                     </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-                        <text:p text:style-name="P15">Note</text:p>
-                    </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P15">SWS</text:p>
                     </table:table-cell>
-                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
+                    <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
                         <text:p text:style-name="P15">ECTS</text:p>
                     </table:table-cell>
+                    <table:table-cell table:style-name="Tabelle1.D1" office:value-type="string">
+                        <text:p text:style-name="P15">Note</text:p>
+                    </table:table-cell>
                 </table:table-row>
                 <xsl:apply-templates select="unterrichtsfach"/>
                 <table:table-row>
@@ -435,10 +435,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                         <text:p text:style-name="P13">-</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
-                        <text:p text:style-name="P13">-</text:p>
+                        <text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
-                        <text:p text:style-name="P9"><xsl:value-of select="ects_gesamt"/></text:p>
+                        <text:p text:style-name="P9">-</text:p>
                     </table:table-cell>
                 </table:table-row>            
                 <xsl:apply-templates select="fussnote"/> 
@@ -494,21 +494,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B2" office:value-type="string">
         <text:p text:style-name="P9">
-        <xsl:if test="note=''">
+        <xsl:if test="sws=''">
 			<xsl:text>-</xsl:text>
 		</xsl:if>
-		<xsl:value-of select="note"/>
+		<xsl:value-of select="sws"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C2" office:value-type="string">
-        <text:p text:style-name="P9">
-	        <xsl:if test="sws=''">
-				<xsl:text>-</xsl:text>
-			</xsl:if>
-			<xsl:value-of select="sws"/>
-		</text:p>
-    </table:table-cell>
-    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
         <text:p text:style-name="P9">
 	        <xsl:if test="ects=''">
 				<xsl:text>-</xsl:text>
@@ -516,6 +508,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
 			<xsl:value-of select="ects"/>
 		</text:p>
     </table:table-cell>
+    <table:table-cell table:style-name="Tabelle1.D2" office:value-type="string">
+        <text:p text:style-name="P9">
+	        <xsl:if test="note=''">
+				<xsl:text>-</xsl:text>
+			</xsl:if>
+			<xsl:value-of select="note"/>
+		</text:p>
+    </table:table-cell>
 </table:table-row>
 </xsl:template>
 <xsl:template match="fussnote">
@@ -542,19 +542,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.B8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:if test="../projektarbeit_note_anzeige='true'">
-				<xsl:value-of select="note"/>
-			</xsl:if>
+        	<xsl:value-of select="sws"/>
 		</text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.C8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="sws"/>
+        	<xsl:value-of select="ects"/>
         </text:p>
     </table:table-cell>
     <table:table-cell table:style-name="Tabelle1.D8" office:value-type="string">
         <text:p text:style-name="P13">
-        	<xsl:value-of select="ects"/>
+        	<xsl:if test="../projektarbeit_note_anzeige='true'">
+				<xsl:value-of select="note"/>
+			</xsl:if>
         </text:p>
     </table:table-cell>
 </table:table-row>