diff --git a/format-master.xml b/format-master.xml
index cd97d37..7e3c749 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -4,9 +4,9 @@
 
 	<template name="PaperCode" match="PaperCode">
 		<common>
-			<xsl:value-of select="$department" />
+			<xsl:value-of select="$subject-code" />
 			<xsl:text> </xsl:text>
-			<xsl:value-of select="$paper" />
+			<xsl:value-of select="$paper-number" />
 		</common>
 	</template>
 
@@ -483,8 +483,8 @@
 			<img>
 				<xsl:attribute name="src">
 					<xsl:text>/</xsl:text>
-					<xsl:value-of select="$department" />
-					<xsl:value-of select="$paper" />
+					<xsl:value-of select="$subject-code" />
+					<xsl:value-of select="$paper-number" />
 					<xsl:text>/Handbook/join-operator-web.png</xsl:text>
 				</xsl:attribute>
 				<xsl:attribute name="alt">
@@ -565,8 +565,8 @@
 			<img>
 				<xsl:attribute name="src">
 					<xsl:text>/</xsl:text>
-					<xsl:value-of select="$department" />
-					<xsl:value-of select="$paper" />
+					<xsl:value-of select="$subject-code" />
+					<xsl:value-of select="$paper-number" />
 					<xsl:text>/Handbook/</xsl:text>
 					<xsl:choose>
 						<xsl:when test="@type">