diff --git a/Granfeldt.PowerShell.ManagementAgent/MA.Export.cs b/Granfeldt.PowerShell.ManagementAgent/MA.Export.cs
index 5d39cd5..f4e6b8d 100644
--- a/Granfeldt.PowerShell.ManagementAgent/MA.Export.cs
+++ b/Granfeldt.PowerShell.ManagementAgent/MA.Export.cs
@@ -64,13 +64,13 @@ PutExportEntriesResults IMAExtensible2CallExport.PutExportEntries(IList<CSEntryC
 			try
 			{
 				Command cmd = new Command(Path.GetFullPath(ExportScript));
-				cmd.Parameters.Add(new CommandParameter("User", Username));
+				cmd.Parameters.Add(new CommandParameter("Username", Username));
 				cmd.Parameters.Add(new CommandParameter("Password", Password));
 				cmd.Parameters.Add(new CommandParameter("Credentials", GetSecureCredentials(Username, SecureStringPassword)));
 				
-				cmd.Parameters.Add(new CommandParameter("UsernameAux", UsernameAux));
-				cmd.Parameters.Add(new CommandParameter("PasswordAux", PasswordAux));
-				cmd.Parameters.Add(new CommandParameter("CredentialsAux", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
+				cmd.Parameters.Add(new CommandParameter("AuxUsername", UsernameAux));
+				cmd.Parameters.Add(new CommandParameter("AuxPassword", PasswordAux));
+				cmd.Parameters.Add(new CommandParameter("AuxCredentials", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
 
 				cmd.Parameters.Add(new CommandParameter("ConfigurationParameter", ConfigurationParameter));
 
diff --git a/Granfeldt.PowerShell.ManagementAgent/MA.Import.cs b/Granfeldt.PowerShell.ManagementAgent/MA.Import.cs
index 976bb6d..1b73438 100644
--- a/Granfeldt.PowerShell.ManagementAgent/MA.Import.cs
+++ b/Granfeldt.PowerShell.ManagementAgent/MA.Import.cs
@@ -161,9 +161,9 @@ public GetImportEntriesResults GetImportEntries(GetImportEntriesRunStep importRu
                     cmd.Parameters.Add(new CommandParameter("Password", Password));
                     cmd.Parameters.Add(new CommandParameter("Credentials", GetSecureCredentials(Username, SecureStringPassword)));
 
-                    cmd.Parameters.Add(new CommandParameter("UsernameAux", UsernameAux));
-                    cmd.Parameters.Add(new CommandParameter("PasswordAux", PasswordAux));
-                    cmd.Parameters.Add(new CommandParameter("CredentialsAux", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
+                    cmd.Parameters.Add(new CommandParameter("AuxUsername", UsernameAux));
+                    cmd.Parameters.Add(new CommandParameter("AuxPassword", PasswordAux));
+                    cmd.Parameters.Add(new CommandParameter("AuxCredentials", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
 
                     cmd.Parameters.Add(new CommandParameter("ConfigurationParameter", ConfigurationParameter));
 
diff --git a/Granfeldt.PowerShell.ManagementAgent/MA.Password.cs b/Granfeldt.PowerShell.ManagementAgent/MA.Password.cs
index c14b117..1c69712 100644
--- a/Granfeldt.PowerShell.ManagementAgent/MA.Password.cs
+++ b/Granfeldt.PowerShell.ManagementAgent/MA.Password.cs
@@ -65,13 +65,13 @@ void CallPasswordScript(PasswordOperation Action, CSEntry csentry, SecureString
 			try
 			{
 				Command cmd = new Command(Path.GetFullPath(PasswordManagementScript));
-				cmd.Parameters.Add(new CommandParameter("User", Username));
+				cmd.Parameters.Add(new CommandParameter("Username", Username));
 				cmd.Parameters.Add(new CommandParameter("Password", Password));
 				cmd.Parameters.Add(new CommandParameter("Credentials", GetSecureCredentials(Username, SecureStringPassword)));
 
-				cmd.Parameters.Add(new CommandParameter("UsernameAux", UsernameAux));
-				cmd.Parameters.Add(new CommandParameter("PasswordAux", PasswordAux));
-				cmd.Parameters.Add(new CommandParameter("CredentialsAux", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
+				cmd.Parameters.Add(new CommandParameter("AuxUsernameAux", UsernameAux));
+				cmd.Parameters.Add(new CommandParameter("AuxPasswordAux", PasswordAux));
+				cmd.Parameters.Add(new CommandParameter("AuxCredentialsAux", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
 
 				cmd.Parameters.Add(new CommandParameter("ConfigurationParameter", ConfigurationParameter));
 
diff --git a/Granfeldt.PowerShell.ManagementAgent/MA.Schema.cs b/Granfeldt.PowerShell.ManagementAgent/MA.Schema.cs
index 4aaf285..7ac9af3 100644
--- a/Granfeldt.PowerShell.ManagementAgent/MA.Schema.cs
+++ b/Granfeldt.PowerShell.ManagementAgent/MA.Schema.cs
@@ -36,9 +36,9 @@ Schema IMAExtensible2GetSchema.GetSchema(KeyedCollection<string, ConfigParameter
 				cmd.Parameters.Add(new CommandParameter("Password", Password));
 				cmd.Parameters.Add(new CommandParameter("Credentials", GetSecureCredentials(Username, SecureStringPassword)));
 
-				cmd.Parameters.Add(new CommandParameter("UsernameAux", UsernameAux));
-				cmd.Parameters.Add(new CommandParameter("PasswordAux", PasswordAux));
-				cmd.Parameters.Add(new CommandParameter("CredentialsAux", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
+				cmd.Parameters.Add(new CommandParameter("AuxUsername", UsernameAux));
+				cmd.Parameters.Add(new CommandParameter("AuxPassword", PasswordAux));
+				cmd.Parameters.Add(new CommandParameter("AuxCredentials", GetSecureCredentials(UsernameAux, SecureStringPasswordAux)));
 
 				cmd.Parameters.Add(new CommandParameter("ConfigurationParameter", ConfigurationParameter));
 
diff --git a/Granfeldt.PowerShell.ManagementAgent/Properties/AssemblyInfo.cs b/Granfeldt.PowerShell.ManagementAgent/Properties/AssemblyInfo.cs
index 9965ec4..308c1d9 100644
--- a/Granfeldt.PowerShell.ManagementAgent/Properties/AssemblyInfo.cs
+++ b/Granfeldt.PowerShell.ManagementAgent/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("5.6")]
-[assembly: AssemblyFileVersion("5.6.3.2021")]
+[assembly: AssemblyFileVersion("5.6.3.2022")]
 [assembly: AssemblyInformationalVersion("5.6")]