=== modified file 'debian/mandos-client.postinst'
--- debian/mandos-client.postinst	2015-07-09 20:32:52 +0000
+++ debian/mandos-client.postinst	2015-07-09 20:36:29 +0000
@@ -64,7 +64,7 @@
 }
 
 create_dh_params(){
-    if [ -r /etc/keys/mandos/client-dhparams.pem ]; then
+    if [ -r /etc/keys/mandos/dhparams.pem ]; then
 	return 0
     fi
     # Create a Diffe-Hellman parameters file
@@ -84,7 +84,7 @@
 	"$DHFILE"
     sed --in-place --expression='1i-----BEGIN DH PARAMETERS-----' \
 	    "$DHFILE"
-    cp --archive "$DHFILE" /etc/keys/mandos/client-dhparams.pem
+    cp --archive "$DHFILE" /etc/keys/mandos/dhparams.pem
     rm -- "$DHFILE"
 }
 

=== modified file 'initramfs-tools-hook'
--- initramfs-tools-hook	2015-07-09 08:57:02 +0000
+++ initramfs-tools-hook	2015-07-09 20:36:29 +0000
@@ -232,9 +232,9 @@
     esac
 done
 # Use Diffie-Hellman parameters file if available
-if [ -e "${DESTDIR}${CONFDIR}"/client-dhparams.pem ]; then
+if [ -e "${DESTDIR}${CONFDIR}"/dhparams.pem ]; then
     sed --in-place \
-	--expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/client-dhparams.pem" \
+	--expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/dhparams.pem" \
 	"${DESTDIR}/${CONFDIR}/plugin-runner.conf"
 fi
 

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2015-07-09 20:32:52 +0000
+++ plugins.d/mandos-client.c	2015-07-09 20:36:29 +0000
@@ -2546,8 +2546,7 @@
 	}
       }
       
-      if(strcmp(dh_params_file, PATHDIR "/client-dhparams.pem" )
-	 == 0){
+      if(strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
 	int dhparams_fd = open(dh_params_file, O_RDONLY);
 	if(dhparams_fd == -1){
 	  perror_plus("open");