diff --git a/csharp/XenServer.NET.snk b/csharp/XenServer.NET.snk
deleted file mode 100644
index 01f1f39..0000000
Binary files a/csharp/XenServer.NET.snk and /dev/null differ
diff --git a/mk/Makefile b/mk/Makefile
index e4f0d0e..3590963 100644
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -92,10 +92,9 @@ $(MY_OBJ_DIR)/$(XMLRPC_DLL):
 $(MY_OBJ_DIR)/csharp_xmlrpc.tar.gz: $(REPO)/mk/sign.bat omake-phase $(MY_OBJ_DIR)/$(XMLRPC_DLL)
 	mkdir -p $(CSHARP_XMLRPC_TMP)
 	cp -r $(CSHARP_SRC_TMP) $(CSHARP_XMLRPC_TMP)
-	sed -i '/SignAssembly/ i <AssemblyOriginatorKeyFile>XenServer.NET.snk</AssemblyOriginatorKeyFile>' $(CSHARP_XMLRPC_TMP)/XenServer.NET/XenServer.csproj
+	sed -i '/SignAssembly/ i <AssemblyOriginatorKeyFile>xs.net.snk</AssemblyOriginatorKeyFile>' $(CSHARP_XMLRPC_TMP)/XenServer.NET/XenServer.csproj
 	cp $< $(CSHARP_XMLRPC_TMP)
 	cp $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(CSHARP_XMLRPC_TMP)
-	cp $(REPO)/csharp/XenServer.NET.snk $(CSHARP_XMLRPC_TMP)/XenServer.NET
 	tar -C $(CSHARP_XMLRPC_TMP) -zcf $@ .
    
 $(MY_OBJ_DIR)/XenServer.dll: $(MY_OBJ_DIR)/csharp_xmlrpc.tar.gz $(REPO)/mk/csharp.sh
diff --git a/mk/csharp.sh b/mk/csharp.sh
index d5c3f46..7728dbf 100755
--- a/mk/csharp.sh
+++ b/mk/csharp.sh
@@ -34,6 +34,7 @@ FRAMEWORKDIR="${ROOT}/WINDOWS/Microsoft.NET/Framework/v3.5"
 MSBUILD="$FRAMEWORKDIR/MSBuild.exe"
 SDKDIR="${ROOT}/Program Files/Microsoft SDKs/Windows/v6.0A/bin"
 RESGEN="$SDKDIR/ResGen.exe"
+SNK="~/.ssh/xs.net.snk"
 
 # see http://www.interact-sw.co.uk/iangblog/2005/09/12/cmdspawnerror
 SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbem"
@@ -41,6 +42,7 @@ SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbe
 #SKIP_SIGNING=yes
 
 remote_cmd_passwd2 "cd ${TMPDIR}/XenServer.NET/ && \"${RESGEN}\" FriendlyErrorNames.resx /str:cs,XenAPI,FriendlyErrorNames,FriendlyErrorNames.Designer.cs /publicClass"
+remote_cmd_passwd2 "cp ${SNK} ${TMPDIR}/XenServer.NET"
 remote_cmd_passwd2 "cd ${TMPDIR}/XenServer.NET/ && ${MSBUILD} XenServer.csproj /t:Build /p:Configuration=Release"
 remote_cmd_passwd2 "cp ${TMPDIR}/XenServer.NET/bin/Release/XenServer.dll ${TMPDIR}"
 remote_cmd_passwd2 "cp ${TMPDIR}/XenServer.NET/FriendlyErrorNames.Designer.cs ${TMPDIR}"
diff --git a/powershell/src/CommonCmdletFunctions.cs b/powershell/src/CommonCmdletFunctions.cs
index 2be5a5f..b863cab 100644
--- a/powershell/src/CommonCmdletFunctions.cs
+++ b/powershell/src/CommonCmdletFunctions.cs
@@ -44,11 +44,11 @@ class CommonCmdletFunctions
     {
         private const string SessionsVariable = "global:Citrix.XenServer.Sessions";
         private const string DefaultSessionVariable = "global:XenServer_Default_Session";
-        private static string CertificatePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),@"Citrix\XenServerPSSnapIn\XenServer_Known_Certificates.xml");
+        private static string CertificatePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),@"WindowsPowerShell\XenServer_Known_Certificates.xml");
 
         static CommonCmdletFunctions()
         {
-            Session.UserAgent = string.Format("XenServerPSSnapIn/{0}", Assembly.GetExecutingAssembly().GetName().Version);
+            Session.UserAgent = string.Format("XenServerPSModule/{0}", Assembly.GetExecutingAssembly().GetName().Version);
         }
 
         internal static Dictionary<string, Session> GetAllSessions(PSCmdlet cmdlet)